diff --git a/.changeset/dull-llamas-find.md b/.changeset/dull-llamas-find.md new file mode 100644 index 000000000..b406283b6 --- /dev/null +++ b/.changeset/dull-llamas-find.md @@ -0,0 +1,5 @@ +--- +'@openzeppelin/wizard-confidential': patch +--- + +Require Node.js 22 diff --git a/.changeset/floppy-berries-work.md b/.changeset/floppy-berries-work.md new file mode 100644 index 000000000..7a3cee4fd --- /dev/null +++ b/.changeset/floppy-berries-work.md @@ -0,0 +1,8 @@ +--- +'@openzeppelin/wizard-confidential': minor +'@openzeppelin/wizard': patch +'@openzeppelin/contracts-mcp': patch +'@openzeppelin/wizard-common': patch +--- + +Add support for Confidential Contracts Wizard diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5dafaefed..fa3d55563 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,6 +6,8 @@ /packages/core/cairo_alpha @OpenZeppelin/cairo @OpenZeppelin/wizard /packages/ui/src/cairo @OpenZeppelin/cairo @OpenZeppelin/wizard /packages/ui/src/cairo_alpha @OpenZeppelin/cairo @OpenZeppelin/wizard +/packages/core/confidential @OpenZeppelin/contracts @OpenZeppelin/wizard +/packages/ui/src/confidential @OpenZeppelin/contracts @OpenZeppelin/wizard /packages/core/stylus @OpenZeppelin/stylus @OpenZeppelin/wizard /packages/ui/src/stylus @OpenZeppelin/stylus @OpenZeppelin/wizard /packages/core/stellar @OpenZeppelin/stellar @OpenZeppelin/wizard diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 88e3ccaff..639a15aa1 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -5,7 +5,7 @@ runs: steps: - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0 with: - node-version: 20.x + node-version: 22.x cache: yarn - name: Install dependencies diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f0eef407..847ee3f0c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,6 +58,7 @@ jobs: package: - solidity - cairo + - confidential - stellar - stylus - uniswap-hooks @@ -70,6 +71,8 @@ jobs: variant: compile - package: cairo variant: compile + - package: confidential + variant: compile - package: stylus variant: compile - package: uniswap-hooks diff --git a/.gitignore b/.gitignore index baf29d25e..8c478a614 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ node_modules .env .env.local .vscode/settings.json + +fhevmTemp diff --git a/.nvmrc b/.nvmrc index 2edeafb09..8fdd954df 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20 \ No newline at end of file +22 \ No newline at end of file diff --git a/package.json b/package.json index d56c8a63a..55e517cd8 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "workspaces": { "packages": [ "packages/common", + "packages/core/solidity", "packages/core/*", "packages/mcp", "packages/ui" diff --git a/packages/common/src/ai/descriptions/confidential.ts b/packages/common/src/ai/descriptions/confidential.ts new file mode 100644 index 000000000..929e72c32 --- /dev/null +++ b/packages/common/src/ai/descriptions/confidential.ts @@ -0,0 +1,17 @@ +// IMPORTANT: This file must not have any imports since it is used in both Node and Deno environments, +// which have different requirements for file extensions in import statements. + +export const confidentialPrompts = { + ERC7984: + 'Make a confidential fungible token in Solidity according to the ERC-7984 standard, similar to ERC-20 but with confidentiality.', +}; + +export const confidentialERC7984Descriptions = { + contractURI: + 'The metadata URI for the token. Should follow the schema defined in [ERC-7572](https://eips.ethereum.org/EIPS/eip-7572).', + premint: 'The number of tokens to premint for the deployer.', + networkConfig: 'Specify the provider and network configuration to use for FHEVM contracts.', + wrappable: 'Whether to allow wrapping an ERC20 token into a confidential fungible token.', + votes: + 'Whether to keep track of historical balances for voting in on-chain governance. Voting durations must be expressed as block numbers or timestamps.', +}; diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 730e23bd4..b4ebb6fda 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,5 +1,6 @@ export * from './ai/descriptions/common'; export * from './ai/descriptions/cairo'; +export * from './ai/descriptions/confidential'; export * from './ai/descriptions/solidity'; export * from './ai/descriptions/stellar'; export * from './ai/descriptions/stylus'; diff --git a/packages/core/confidential/.gitignore b/packages/core/confidential/.gitignore new file mode 100644 index 000000000..a76977564 --- /dev/null +++ b/packages/core/confidential/.gitignore @@ -0,0 +1,4 @@ +/cache +/artifacts +/contracts/generated +/contract-version-pins.json diff --git a/packages/core/confidential/CHANGELOG.md b/packages/core/confidential/CHANGELOG.md new file mode 100644 index 000000000..4dc68c6ff --- /dev/null +++ b/packages/core/confidential/CHANGELOG.md @@ -0,0 +1,2 @@ +# Changelog + diff --git a/packages/core/confidential/LICENSE b/packages/core/confidential/LICENSE new file mode 100644 index 000000000..be3f7b28e --- /dev/null +++ b/packages/core/confidential/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/packages/core/confidential/NOTICE b/packages/core/confidential/NOTICE new file mode 100644 index 000000000..e68e93389 --- /dev/null +++ b/packages/core/confidential/NOTICE @@ -0,0 +1,8 @@ +OpenZeppelin Contracts Wizard +Copyright (C) 2021-2025 Zeppelin Group Ltd + +This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License along with this program. If not, see . \ No newline at end of file diff --git a/packages/core/confidential/README.md b/packages/core/confidential/README.md new file mode 100644 index 000000000..6f02882fe --- /dev/null +++ b/packages/core/confidential/README.md @@ -0,0 +1,59 @@ +# OpenZeppelin Contracts Wizard for Confidential Contracts + +[![NPM Package](https://img.shields.io/npm/v/@openzeppelin/wizard-confidential?color=%234e5de4)](https://www.npmjs.com/package/@openzeppelin/wizard-confidential) + +Interactively build a contract out of components from OpenZeppelin Confidential Contracts. Provide parameters and desired features for the kind of contract that you want, and the Wizard will generate all of the code necessary. The resulting code is ready to be compiled and deployed, or it can serve as a starting point and customized further with application specific logic. + +This package provides a programmatic API. For a web interface, see https://wizard.openzeppelin.com + +### Installation + +`npm install @openzeppelin/wizard-confidential` + +### Contract types + +The following contract types are supported: +- `erc7984` + +Each contract type has functions/constants as defined below. + +### Functions + +#### `print` +```js +function print(opts?: ERC7984Options): string +``` + +Returns a string representation of a contract generated using the provided options. If `opts` is not provided, uses [`defaults`](#defaults). + +#### `defaults` +```js +const defaults: Required +``` + +The default options that are used for [`print`](#print). + +### Examples + +Import the contract type(s) that you want to use from the `@openzeppelin/wizard-confidential` package: + +```js +import { erc7984 } from '@openzeppelin/wizard-confidential'; +``` + +To generate the source code for a confidential fungible contract with all of the default settings: +```js +const contract = erc7984.print(); +``` + +To generate the source code for a confidential fungible contract with a custom name, symbol, URI, and network configuration, along with some custom settings: +```js +const contract = erc7984.print({ + name: 'ExampleToken', + symbol: 'ETK', + contractURI: 'https://example.com', + networkConfig: 'zama-ethereum', + premint: '1000000', + wrappable: true, +}); +``` diff --git a/packages/core/confidential/ava.config.js b/packages/core/confidential/ava.config.js new file mode 100644 index 000000000..e39146f7a --- /dev/null +++ b/packages/core/confidential/ava.config.js @@ -0,0 +1,9 @@ +module.exports = { + extensions: ['ts'], + require: ['ts-node/register'], + watchmode: { + ignoreChanges: ['contracts', 'artifacts', 'cache'], + }, + timeout: '10m', + workerThreads: false, +}; diff --git a/packages/core/confidential/contract-version-pins.d.ts b/packages/core/confidential/contract-version-pins.d.ts new file mode 100644 index 000000000..6b2b77fea --- /dev/null +++ b/packages/core/confidential/contract-version-pins.d.ts @@ -0,0 +1,8 @@ +export interface ContractVersionPins { + fhevmSolidityVersion: string; + confidentialContractsVersion: string; +} + +declare const contractVersionPins: ContractVersionPins; + +export default contractVersionPins; diff --git a/packages/core/confidential/hardhat.config.js b/packages/core/confidential/hardhat.config.js new file mode 100644 index 000000000..5d8653225 --- /dev/null +++ b/packages/core/confidential/hardhat.config.js @@ -0,0 +1,19 @@ +const SOLIDITY_VERSION = require('@openzeppelin/wizard/src/solidity-version.json'); + +require('@fhevm/hardhat-plugin'); + +/** + * @type import('hardhat/config').HardhatUserConfig + */ +module.exports = { + solidity: { + version: SOLIDITY_VERSION, + settings: { + evmVersion: 'cancun', + optimizer: { + enabled: true, + runs: 200, + }, + }, + }, +}; diff --git a/packages/core/confidential/package.json b/packages/core/confidential/package.json new file mode 100644 index 000000000..007671837 --- /dev/null +++ b/packages/core/confidential/package.json @@ -0,0 +1,44 @@ +{ + "name": "@openzeppelin/wizard-confidential", + "version": "0.0.1-alpha.0", + "description": "A boilerplate generator to get started with OpenZeppelin Confidential Contracts", + "license": "AGPL-3.0-only", + "repository": "https://github.com/OpenZeppelin/contracts-wizard", + "main": "dist/index.js", + "ts:main": "src/index.ts", + "files": [ + "LICENSE", + "NOTICE", + "/dist", + "/src", + "!**/*.test.*" + ], + "scripts": { + "prepare": "tsc && node dist/scripts/prepare.js", + "prepublish": "rimraf dist *.tsbuildinfo && hardhat clean", + "test": "ava", + "test:update-snapshots": "ava --update-snapshots", + "test:watch": "ava --watch", + "update-env": "rm ./src/environments/hardhat/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat" + }, + "dependencies": { + "@openzeppelin/wizard": "^0.10.3" + }, + "devDependencies": { + "@fhevm/hardhat-plugin": "^0.3.0-1", + "@fhevm/mock-utils": "^0.1.0", + "@fhevm/solidity": "^0.9.1", + "@nomicfoundation/hardhat-ethers": "^3.1.0", + "@openzeppelin/confidential-contracts": "^0.3.0", + "@openzeppelin/contracts": "^5.4.0", + "@types/node": "^20.0.0", + "@types/semver": "^7.5.7", + "@zama-fhe/relayer-sdk": "0.3.0-5", + "ava": "^6.0.0", + "hardhat": "^2.22.11", + "jszip": "^3.6.0", + "rimraf": "^5.0.0", + "semver": "^7.6.0", + "ts-node": "^10.4.0" + } +} \ No newline at end of file diff --git a/packages/core/confidential/print-versioned.js b/packages/core/confidential/print-versioned.js new file mode 100644 index 000000000..2bc0b8aa3 --- /dev/null +++ b/packages/core/confidential/print-versioned.js @@ -0,0 +1 @@ +module.exports = require('./dist/print-versioned'); diff --git a/packages/core/confidential/print-versioned.ts b/packages/core/confidential/print-versioned.ts new file mode 100644 index 000000000..95629a774 --- /dev/null +++ b/packages/core/confidential/print-versioned.ts @@ -0,0 +1 @@ +export * from './src/print-versioned'; diff --git a/packages/core/confidential/src/api.ts b/packages/core/confidential/src/api.ts new file mode 100644 index 000000000..14309f8a2 --- /dev/null +++ b/packages/core/confidential/src/api.ts @@ -0,0 +1,22 @@ +import type { CommonOptions } from './common-options'; +import type { ERC7984Options } from './erc7984'; +import { printERC7984, defaults as erc7984Defaults } from './erc7984'; + +export interface WizardContractAPI { + /** + * Returns a string representation of a contract generated using the provided options. If opts is not provided, uses `defaults`. + */ + print: (opts?: Options) => string; + + /** + * The default options that are used for `print`. + */ + defaults: Required; +} + +export type ERC7984 = WizardContractAPI; + +export const erc7984: ERC7984 = { + print: printERC7984, + defaults: erc7984Defaults, +}; diff --git a/packages/core/confidential/src/build-generic.ts b/packages/core/confidential/src/build-generic.ts new file mode 100644 index 000000000..7fa4b8633 --- /dev/null +++ b/packages/core/confidential/src/build-generic.ts @@ -0,0 +1,23 @@ +import type { ERC7984Options } from './erc7984'; +import { buildERC7984 } from './erc7984'; +import type { Contract } from '@openzeppelin/wizard'; + +export interface KindedOptions { + ERC7984: { kind: 'ERC7984' } & ERC7984Options; +} + +export type GenericOptions = KindedOptions[keyof KindedOptions]; + +export function buildGeneric(opts: GenericOptions): Contract { + switch (opts.kind) { + case 'ERC7984': + return buildERC7984(opts); + + default: { + // TODO: When other contract kinds are available, change the below to: + // const _: never = opts; + const _: never = opts.kind; + throw new Error('Unknown contract kind'); + } + } +} diff --git a/packages/core/confidential/src/common-options.ts b/packages/core/confidential/src/common-options.ts new file mode 100644 index 000000000..b6484d846 --- /dev/null +++ b/packages/core/confidential/src/common-options.ts @@ -0,0 +1,16 @@ +import type { Info } from '@openzeppelin/wizard'; +import { infoDefaults } from '@openzeppelin/wizard'; + +export const defaults: Required = { + info: infoDefaults, +} as const; + +export interface CommonOptions { + info?: Info; +} + +export function withCommonDefaults(opts: CommonOptions): Required { + return { + info: { ...defaults.info, ...(opts.info ?? {}) }, + }; +} diff --git a/packages/core/confidential/src/environments/hardhat/package-lock.json b/packages/core/confidential/src/environments/hardhat/package-lock.json new file mode 100644 index 000000000..323ab3ef5 --- /dev/null +++ b/packages/core/confidential/src/environments/hardhat/package-lock.json @@ -0,0 +1,8142 @@ +{ + "name": "hardhat-sample", + "version": "0.0.1", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "hardhat-sample", + "version": "0.0.1", + "license": "ISC", + "devDependencies": { + "@fhevm/hardhat-plugin": "^0.3.0-1", + "@fhevm/solidity": "^0.9.1", + "@nomicfoundation/hardhat-toolbox": "^6.1.0", + "@openzeppelin/confidential-contracts": "^0.3.0", + "@openzeppelin/contracts": "^5.4.0", + "@zama-fhe/relayer-sdk": "0.3.0-5", + "hardhat": "^2.16.1" + } + }, + "node_modules/@adraffy/ens-normalize": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz", + "integrity": "sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@colors/colors": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", + "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@ethereumjs/rlp": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-5.0.2.tgz", + "integrity": "sha512-DziebCdg4JpGlEqEdGgXmjqcFoJi+JGulUXwEjsZGAscAQ7MyD/7LE/GVCP29vEQxKc7AAwjT3A2ywHp2xfoCA==", + "dev": true, + "license": "MPL-2.0", + "bin": { + "rlp": "bin/rlp.cjs" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@ethereumjs/util": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-9.1.0.tgz", + "integrity": "sha512-XBEKsYqLGXLah9PNJbgdkigthkG7TAGvlD/sH12beMXEyHDyigfcbdvHhmLyDWgDyOJn4QwiQUaF7yeuhnjdog==", + "dev": true, + "license": "MPL-2.0", + "dependencies": { + "@ethereumjs/rlp": "^5.0.2", + "ethereum-cryptography": "^2.2.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@ethereumjs/util/node_modules/@noble/curves": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", + "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "1.4.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/util/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/util/node_modules/@scure/base": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", + "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/util/node_modules/@scure/bip32": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", + "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/curves": "~1.4.0", + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/util/node_modules/@scure/bip39": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", + "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@ethereumjs/util/node_modules/ethereum-cryptography": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", + "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/curves": "1.4.2", + "@noble/hashes": "1.4.0", + "@scure/bip32": "1.4.0", + "@scure/bip39": "1.3.0" + } + }, + "node_modules/@ethersproject/abi": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.8.0.tgz", + "integrity": "sha512-b9YS/43ObplgyV6SlyQsG53/vkSal0MNA1fskSC4mbnCMi8R+NkcH8K9FPYNESf6jUefBUniE4SOKms0E/KK1Q==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/address": "^5.8.0", + "@ethersproject/bignumber": "^5.8.0", + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/constants": "^5.8.0", + "@ethersproject/hash": "^5.8.0", + "@ethersproject/keccak256": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "@ethersproject/properties": "^5.8.0", + "@ethersproject/strings": "^5.8.0" + } + }, + "node_modules/@ethersproject/abstract-provider": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-provider/-/abstract-provider-5.8.0.tgz", + "integrity": "sha512-wC9SFcmh4UK0oKuLJQItoQdzS/qZ51EJegK6EmAWlh+OptpQ/npECOR3QqECd8iGHC0RJb4WKbVdSfif4ammrg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bignumber": "^5.8.0", + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "@ethersproject/networks": "^5.8.0", + "@ethersproject/properties": "^5.8.0", + "@ethersproject/transactions": "^5.8.0", + "@ethersproject/web": "^5.8.0" + } + }, + "node_modules/@ethersproject/abstract-signer": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/abstract-signer/-/abstract-signer-5.8.0.tgz", + "integrity": "sha512-N0XhZTswXcmIZQdYtUnd79VJzvEwXQw6PK0dTl9VoYrEBxxCPXqS0Eod7q5TNKRxe1/5WUMuR0u0nqTF/avdCA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abstract-provider": "^5.8.0", + "@ethersproject/bignumber": "^5.8.0", + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "@ethersproject/properties": "^5.8.0" + } + }, + "node_modules/@ethersproject/address": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.8.0.tgz", + "integrity": "sha512-GhH/abcC46LJwshoN+uBNoKVFPxUuZm6dA257z0vZkKmU1+t8xTn8oK7B9qrj8W2rFRMch4gbJl6PmVxjxBEBA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bignumber": "^5.8.0", + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/keccak256": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "@ethersproject/rlp": "^5.8.0" + } + }, + "node_modules/@ethersproject/base64": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/base64/-/base64-5.8.0.tgz", + "integrity": "sha512-lN0oIwfkYj9LbPx4xEkie6rAMJtySbpOAFXSDVQaBnAzYfB4X2Qr+FXJGxMoc3Bxp2Sm8OwvzMrywxyw0gLjIQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.8.0" + } + }, + "node_modules/@ethersproject/bignumber": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/bignumber/-/bignumber-5.8.0.tgz", + "integrity": "sha512-ZyaT24bHaSeJon2tGPKIiHszWjD/54Sz8t57Toch475lCLljC6MgPmxk7Gtzz+ddNN5LuHea9qhAe0x3D+uYPA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "bn.js": "^5.2.1" + } + }, + "node_modules/@ethersproject/bytes": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/bytes/-/bytes-5.8.0.tgz", + "integrity": "sha512-vTkeohgJVCPVHu5c25XWaWQOZ4v+DkGoC42/TS2ond+PARCxTJvgTFUNDZovyQ/uAQ4EcpqqowKydcdmRKjg7A==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/logger": "^5.8.0" + } + }, + "node_modules/@ethersproject/constants": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/constants/-/constants-5.8.0.tgz", + "integrity": "sha512-wigX4lrf5Vu+axVTIvNsuL6YrV4O5AXl5ubcURKMEME5TnWBouUh0CDTWxZ2GpnRn1kcCgE7l8O5+VbV9QTTcg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bignumber": "^5.8.0" + } + }, + "node_modules/@ethersproject/hash": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/hash/-/hash-5.8.0.tgz", + "integrity": "sha512-ac/lBcTbEWW/VGJij0CNSw/wPcw9bSRgCB0AIBz8CvED/jfvDoV9hsIIiWfvWmFEi8RcXtlNwp2jv6ozWOsooA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/abstract-signer": "^5.8.0", + "@ethersproject/address": "^5.8.0", + "@ethersproject/base64": "^5.8.0", + "@ethersproject/bignumber": "^5.8.0", + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/keccak256": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "@ethersproject/properties": "^5.8.0", + "@ethersproject/strings": "^5.8.0" + } + }, + "node_modules/@ethersproject/keccak256": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/keccak256/-/keccak256-5.8.0.tgz", + "integrity": "sha512-A1pkKLZSz8pDaQ1ftutZoaN46I6+jvuqugx5KYNeQOPqq+JZ0Txm7dlWesCHB5cndJSu5vP2VKptKf7cksERng==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.8.0", + "js-sha3": "0.8.0" + } + }, + "node_modules/@ethersproject/logger": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/logger/-/logger-5.8.0.tgz", + "integrity": "sha512-Qe6knGmY+zPPWTC+wQrpitodgBfH7XoceCGL5bJVejmH+yCS3R8jJm8iiWuvWbG76RUmyEG53oqv6GMVWqunjA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT" + }, + "node_modules/@ethersproject/networks": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/networks/-/networks-5.8.0.tgz", + "integrity": "sha512-egPJh3aPVAzbHwq8DD7Po53J4OUSsA1MjQp8Vf/OZPav5rlmWUaFLiq8cvQiGK0Z5K6LYzm29+VA/p4RL1FzNg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/logger": "^5.8.0" + } + }, + "node_modules/@ethersproject/properties": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/properties/-/properties-5.8.0.tgz", + "integrity": "sha512-PYuiEoQ+FMaZZNGrStmN7+lWjlsoufGIHdww7454FIaGdbe/p5rnaCXTr5MtBYl3NkeoVhHZuyzChPeGeKIpQw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/logger": "^5.8.0" + } + }, + "node_modules/@ethersproject/rlp": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/rlp/-/rlp-5.8.0.tgz", + "integrity": "sha512-LqZgAznqDbiEunaUvykH2JAoXTT9NV0Atqk8rQN9nx9SEgThA/WMx5DnW8a9FOufo//6FZOCHZ+XiClzgbqV9Q==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/logger": "^5.8.0" + } + }, + "node_modules/@ethersproject/signing-key": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/signing-key/-/signing-key-5.8.0.tgz", + "integrity": "sha512-LrPW2ZxoigFi6U6aVkFN/fa9Yx/+4AtIUe4/HACTvKJdhm0eeb107EVCIQcrLZkxaSIgc/eCrX8Q1GtbH+9n3w==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "@ethersproject/properties": "^5.8.0", + "bn.js": "^5.2.1", + "elliptic": "6.6.1", + "hash.js": "1.1.7" + } + }, + "node_modules/@ethersproject/strings": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/strings/-/strings-5.8.0.tgz", + "integrity": "sha512-qWEAk0MAvl0LszjdfnZ2uC8xbR2wdv4cDabyHiBh3Cldq/T8dPH3V4BbBsAYJUeonwD+8afVXld274Ls+Y1xXg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/constants": "^5.8.0", + "@ethersproject/logger": "^5.8.0" + } + }, + "node_modules/@ethersproject/transactions": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/transactions/-/transactions-5.8.0.tgz", + "integrity": "sha512-UglxSDjByHG0TuU17bDfCemZ3AnKO2vYrL5/2n2oXvKzvb7Cz+W9gOWXKARjp2URVwcWlQlPOEQyAviKwT4AHg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/address": "^5.8.0", + "@ethersproject/bignumber": "^5.8.0", + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/constants": "^5.8.0", + "@ethersproject/keccak256": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "@ethersproject/properties": "^5.8.0", + "@ethersproject/rlp": "^5.8.0", + "@ethersproject/signing-key": "^5.8.0" + } + }, + "node_modules/@ethersproject/units": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/units/-/units-5.8.0.tgz", + "integrity": "sha512-lxq0CAnc5kMGIiWW4Mr041VT8IhNM+Pn5T3haO74XZWFulk7wH1Gv64HqE96hT4a7iiNMdOCFEBgaxWuk8ETKQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "@ethersproject/bignumber": "^5.8.0", + "@ethersproject/constants": "^5.8.0", + "@ethersproject/logger": "^5.8.0" + } + }, + "node_modules/@ethersproject/web": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.8.0.tgz", + "integrity": "sha512-j7+Ksi/9KfGviws6Qtf9Q7KCqRhpwrYKQPs+JBA/rKVFF/yaWLHJEH3zfVP2plVu+eys0d2DlFmhoQJayFewcw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@ethersproject/base64": "^5.8.0", + "@ethersproject/bytes": "^5.8.0", + "@ethersproject/logger": "^5.8.0", + "@ethersproject/properties": "^5.8.0", + "@ethersproject/strings": "^5.8.0" + } + }, + "node_modules/@fastify/busboy": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14" + } + }, + "node_modules/@fhevm/hardhat-plugin": { + "version": "0.3.0-1", + "resolved": "https://registry.npmjs.org/@fhevm/hardhat-plugin/-/hardhat-plugin-0.3.0-1.tgz", + "integrity": "sha512-SnxtynkDehpkvoq0CRi1x09J01/K1rP2Q99fMNUv6PxXowwvjhZYhq0vw8qi6mZLI62AVMh94KbzN/Gb3L4e/w==", + "dev": true, + "license": "BSD-3-Clause-Clear", + "dependencies": { + "@fhevm/host-contracts": "0.9.0", + "debug": "^4.1.1", + "dotenv": "^16.5.0", + "picocolors": "^1.1.1", + "resolve": "^1.22.10" + }, + "engines": { + "node": ">=20", + "npm": ">=7.0.0" + }, + "peerDependencies": { + "@fhevm/mock-utils": "0.3.0-1", + "@fhevm/solidity": "^0.9.1", + "@nomicfoundation/hardhat-ethers": "^3.0.8", + "@zama-fhe/relayer-sdk": "^0.3.0-5", + "encrypted-types": "^0.0.4", + "ethers": "^6.1.0", + "hardhat": "^2.0.0" + } + }, + "node_modules/@fhevm/host-contracts": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@fhevm/host-contracts/-/host-contracts-0.9.0.tgz", + "integrity": "sha512-N/DRfpXVCzHbg+9NE5sLHzTH3X7Wt3xRSN/7Jyoo+mKgjI7u40heJz8z/dUqvcq0h8wXjXcZcQHgP4pjMNjLKw==", + "dev": true, + "license": "BSD-3-Clause-Clear", + "dependencies": { + "encrypted-types": "^0.0.4" + }, + "optionalDependencies": { + "solidity-comments-darwin-arm64": "0.1.1", + "solidity-comments-linux-x64-gnu": "0.1.1" + } + }, + "node_modules/@fhevm/mock-utils": { + "version": "0.3.0-1", + "resolved": "https://registry.npmjs.org/@fhevm/mock-utils/-/mock-utils-0.3.0-1.tgz", + "integrity": "sha512-1mfzU66Y1r3qc8QUlqnOtENPKchmNx2l1WxFWlcI6CzdskUoywvLRz+w0wnmze8GUpWpFgoclpK2okw1LlzgBQ==", + "dev": true, + "license": "BSD-3-Clause-Clear", + "peer": true, + "peerDependencies": { + "@zama-fhe/relayer-sdk": "^0.3.0-5", + "ethers": "^6.1.0", + "typescript": ">=5.0.4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@fhevm/solidity": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/@fhevm/solidity/-/solidity-0.9.1.tgz", + "integrity": "sha512-QxP+R+6v3aHA/rzgH9cDsiYOwRBB6zLAL3qNI4YfRewKA6ZB01cdkYvrB80FkJyddzxRNsT1jHIvJvSRS8XZ+Q==", + "dev": true, + "license": "BSD-3-Clause-Clear", + "dependencies": { + "encrypted-types": "^0.0.4" + }, + "engines": { + "node": ">=20.0.0" + }, + "optionalDependencies": { + "solidity-comments-darwin-arm64": "0.1.1", + "solidity-comments-linux-x64-gnu": "0.1.1" + } + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", + "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@noble/ciphers": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz", + "integrity": "sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@noble/curves": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz", + "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "1.3.2" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@noble/hashes": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz", + "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@noble/secp256k1": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz", + "integrity": "sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "license": "MIT" + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nomicfoundation/edr": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.11.3.tgz", + "integrity": "sha512-kqILRkAd455Sd6v8mfP3C1/0tCOynJWY+Ir+k/9Boocu2kObCrsFgG+ZWB7fSBVdd9cPVSNrnhWS+V+PEo637g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nomicfoundation/edr-darwin-arm64": "0.11.3", + "@nomicfoundation/edr-darwin-x64": "0.11.3", + "@nomicfoundation/edr-linux-arm64-gnu": "0.11.3", + "@nomicfoundation/edr-linux-arm64-musl": "0.11.3", + "@nomicfoundation/edr-linux-x64-gnu": "0.11.3", + "@nomicfoundation/edr-linux-x64-musl": "0.11.3", + "@nomicfoundation/edr-win32-x64-msvc": "0.11.3" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/@nomicfoundation/edr-darwin-arm64": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.11.3.tgz", + "integrity": "sha512-w0tksbdtSxz9nuzHKsfx4c2mwaD0+l5qKL2R290QdnN9gi9AV62p9DHkOgfBdyg6/a6ZlnQqnISi7C9avk/6VA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, + "node_modules/@nomicfoundation/edr-darwin-x64": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.11.3.tgz", + "integrity": "sha512-QR4jAFrPbOcrO7O2z2ESg+eUeIZPe2bPIlQYgiJ04ltbSGW27FblOzdd5+S3RoOD/dsZGKAvvy6dadBEl0NgoA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, + "node_modules/@nomicfoundation/edr-linux-arm64-gnu": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.11.3.tgz", + "integrity": "sha512-Ktjv89RZZiUmOFPspuSBVJ61mBZQ2+HuLmV67InNlh9TSUec/iDjGIwAn59dx0bF/LOSrM7qg5od3KKac4LJDQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, + "node_modules/@nomicfoundation/edr-linux-arm64-musl": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.11.3.tgz", + "integrity": "sha512-B3sLJx1rL2E9pfdD4mApiwOZSrX0a/KQSBWdlq1uAhFKqkl00yZaY4LejgZndsJAa4iKGQJlGnw4HCGeVt0+jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, + "node_modules/@nomicfoundation/edr-linux-x64-gnu": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.11.3.tgz", + "integrity": "sha512-D/4cFKDXH6UYyKPu6J3Y8TzW11UzeQI0+wS9QcJzjlrrfKj0ENW7g9VihD1O2FvXkdkTjcCZYb6ai8MMTCsaVw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, + "node_modules/@nomicfoundation/edr-linux-x64-musl": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.11.3.tgz", + "integrity": "sha512-ergXuIb4nIvmf+TqyiDX5tsE49311DrBky6+jNLgsGDTBaN1GS3OFwFS8I6Ri/GGn6xOaT8sKu3q7/m+WdlFzg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, + "node_modules/@nomicfoundation/edr-win32-x64-msvc": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.11.3.tgz", + "integrity": "sha512-snvEf+WB3OV0wj2A7kQ+ZQqBquMcrozSLXcdnMdEl7Tmn+KDCbmFKBt3Tk0X3qOU4RKQpLPnTxdM07TJNVtung==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 18" + } + }, + "node_modules/@nomicfoundation/hardhat-chai-matchers": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-chai-matchers/-/hardhat-chai-matchers-2.1.0.tgz", + "integrity": "sha512-GPhBNafh1fCnVD9Y7BYvoLnblnvfcq3j8YDbO1gGe/1nOFWzGmV7gFu5DkwFXF+IpYsS+t96o9qc/mPu3V3Vfw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/chai-as-promised": "^7.1.3", + "chai-as-promised": "^7.1.1", + "deep-eql": "^4.0.1", + "ordinal": "^1.0.3" + }, + "peerDependencies": { + "@nomicfoundation/hardhat-ethers": "^3.1.0", + "chai": "^4.2.0", + "ethers": "^6.14.0", + "hardhat": "^2.26.0" + } + }, + "node_modules/@nomicfoundation/hardhat-ethers": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ethers/-/hardhat-ethers-3.1.0.tgz", + "integrity": "sha512-jx6fw3Ms7QBwFGT2MU6ICG292z0P81u6g54JjSV105+FbTZOF4FJqPksLfDybxkkOeq28eDxbqq7vpxRYyIlxA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "debug": "^4.1.1", + "lodash.isequal": "^4.5.0" + }, + "peerDependencies": { + "ethers": "^6.14.0", + "hardhat": "^2.26.0" + } + }, + "node_modules/@nomicfoundation/hardhat-ignition": { + "version": "0.15.13", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ignition/-/hardhat-ignition-0.15.13.tgz", + "integrity": "sha512-G4XGPWvxs9DJhZ6PE1wdvKjHkjErWbsETf4c7YxO6GUz+MJGlw+PtgbnCwhL3tQzSq3oD4MB0LGi+sK0polpUA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@nomicfoundation/ignition-core": "^0.15.13", + "@nomicfoundation/ignition-ui": "^0.15.12", + "chalk": "^4.0.0", + "debug": "^4.3.2", + "fs-extra": "^10.0.0", + "json5": "^2.2.3", + "prompts": "^2.4.2" + }, + "peerDependencies": { + "@nomicfoundation/hardhat-verify": "^2.1.0", + "hardhat": "^2.26.0" + } + }, + "node_modules/@nomicfoundation/hardhat-ignition-ethers": { + "version": "0.15.14", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-ignition-ethers/-/hardhat-ignition-ethers-0.15.14.tgz", + "integrity": "sha512-eq+5n+c1DW18/Xp8/QrHBBvG5QaKUxYF/byol4f1jrnZ1zAy0OrqEa/oaNFWchhpLalX7d7suk/2EL0PbT0CDQ==", + "dev": true, + "license": "MIT", + "peer": true, + "peerDependencies": { + "@nomicfoundation/hardhat-ethers": "^3.1.0", + "@nomicfoundation/hardhat-ignition": "^0.15.13", + "@nomicfoundation/ignition-core": "^0.15.13", + "ethers": "^6.14.0", + "hardhat": "^2.26.0" + } + }, + "node_modules/@nomicfoundation/hardhat-network-helpers": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-network-helpers/-/hardhat-network-helpers-1.1.0.tgz", + "integrity": "sha512-ZS+NulZuR99NUHt2VwcgZvgeD6Y63qrbORNRuKO+lTowJxNVsrJ0zbRx1j5De6G3dOno5pVGvuYSq2QVG0qCYg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ethereumjs-util": "^7.1.4" + }, + "peerDependencies": { + "hardhat": "^2.26.0" + } + }, + "node_modules/@nomicfoundation/hardhat-toolbox": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-toolbox/-/hardhat-toolbox-6.1.0.tgz", + "integrity": "sha512-iAIl6pIK3F4R3JXeq+b6tiShXUrp1sQRiPfqoCMUE7QLUzoFifzGV97IDRL6e73pWsMKpUQBsHBvTCsqn+ZdpA==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@nomicfoundation/hardhat-chai-matchers": "^2.1.0", + "@nomicfoundation/hardhat-ethers": "^3.1.0", + "@nomicfoundation/hardhat-ignition-ethers": "^0.15.14", + "@nomicfoundation/hardhat-network-helpers": "^1.1.0", + "@nomicfoundation/hardhat-verify": "^2.1.0", + "@typechain/ethers-v6": "^0.5.0", + "@typechain/hardhat": "^9.0.0", + "@types/chai": "^4.2.0", + "@types/mocha": ">=9.1.0", + "@types/node": ">=20.0.0", + "chai": "^4.2.0", + "ethers": "^6.14.0", + "hardhat": "^2.26.0", + "hardhat-gas-reporter": "^2.3.0", + "solidity-coverage": "^0.8.1", + "ts-node": ">=8.0.0", + "typechain": "^8.3.0", + "typescript": ">=4.5.0" + } + }, + "node_modules/@nomicfoundation/hardhat-verify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-verify/-/hardhat-verify-2.1.1.tgz", + "integrity": "sha512-K1plXIS42xSHDJZRkrE2TZikqxp9T4y6jUMUNI/imLgN5uCcEQokmfU0DlyP9zzHncYK92HlT5IWP35UVCLrPw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@ethersproject/abi": "^5.1.2", + "@ethersproject/address": "^5.0.2", + "cbor": "^8.1.0", + "debug": "^4.1.1", + "lodash.clonedeep": "^4.5.0", + "picocolors": "^1.1.0", + "semver": "^6.3.0", + "table": "^6.8.0", + "undici": "^5.14.0" + }, + "peerDependencies": { + "hardhat": "^2.26.0" + } + }, + "node_modules/@nomicfoundation/ignition-core": { + "version": "0.15.13", + "resolved": "https://registry.npmjs.org/@nomicfoundation/ignition-core/-/ignition-core-0.15.13.tgz", + "integrity": "sha512-Z4T1WIbw0EqdsN9RxtnHeQXBi7P/piAmCu8bZmReIdDo/2h06qgKWxjDoNfc9VBFZJ0+Dx79tkgQR3ewxMDcpA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@ethersproject/address": "5.6.1", + "@nomicfoundation/solidity-analyzer": "^0.1.1", + "cbor": "^9.0.0", + "debug": "^4.3.2", + "ethers": "^6.14.0", + "fs-extra": "^10.0.0", + "immer": "10.0.2", + "lodash": "4.17.21", + "ndjson": "2.0.0" + } + }, + "node_modules/@nomicfoundation/ignition-core/node_modules/@ethersproject/address": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@ethersproject/address/-/address-5.6.1.tgz", + "integrity": "sha512-uOgF0kS5MJv9ZvCz7x6T2EXJSzotiybApn4XlOgoTX0xdtyVIJ7pF+6cGPxiEq/dpBiTfMiw7Yc81JcwhSYA0Q==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "@ethersproject/bignumber": "^5.6.2", + "@ethersproject/bytes": "^5.6.1", + "@ethersproject/keccak256": "^5.6.1", + "@ethersproject/logger": "^5.6.0", + "@ethersproject/rlp": "^5.6.1" + } + }, + "node_modules/@nomicfoundation/ignition-core/node_modules/cbor": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/cbor/-/cbor-9.0.2.tgz", + "integrity": "sha512-JPypkxsB10s9QOWwa6zwPzqE1Md3vqpPc+cai4sAecuCsRyAtAl/pMyhPlMbT/xtPnm2dznJZYRLui57qiRhaQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "nofilter": "^3.1.0" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/@nomicfoundation/ignition-ui": { + "version": "0.15.12", + "resolved": "https://registry.npmjs.org/@nomicfoundation/ignition-ui/-/ignition-ui-0.15.12.tgz", + "integrity": "sha512-nQl8tusvmt1ANoyIj5RQl9tVSEmG0FnNbtwnWbTim+F8JLm4YLHWS0yEgYUZC+BEO3oS0D8r6V8a02JGZJgqiQ==", + "dev": true, + "peer": true + }, + "node_modules/@nomicfoundation/solidity-analyzer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer/-/solidity-analyzer-0.1.2.tgz", + "integrity": "sha512-q4n32/FNKIhQ3zQGGw5CvPF6GTvDCpYwIf7bEY/dZTZbgfDsHyjJwURxUJf3VQuuJj+fDIFl4+KkBVbw4Ef6jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 12" + }, + "optionalDependencies": { + "@nomicfoundation/solidity-analyzer-darwin-arm64": "0.1.2", + "@nomicfoundation/solidity-analyzer-darwin-x64": "0.1.2", + "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": "0.1.2", + "@nomicfoundation/solidity-analyzer-linux-arm64-musl": "0.1.2", + "@nomicfoundation/solidity-analyzer-linux-x64-gnu": "0.1.2", + "@nomicfoundation/solidity-analyzer-linux-x64-musl": "0.1.2", + "@nomicfoundation/solidity-analyzer-win32-x64-msvc": "0.1.2" + } + }, + "node_modules/@nomicfoundation/solidity-analyzer-darwin-arm64": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-darwin-arm64/-/solidity-analyzer-darwin-arm64-0.1.2.tgz", + "integrity": "sha512-JaqcWPDZENCvm++lFFGjrDd8mxtf+CtLd2MiXvMNTBD33dContTZ9TWETwNFwg7JTJT5Q9HEecH7FA+HTSsIUw==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@nomicfoundation/solidity-analyzer-darwin-x64": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-darwin-x64/-/solidity-analyzer-darwin-x64-0.1.2.tgz", + "integrity": "sha512-fZNmVztrSXC03e9RONBT+CiksSeYcxI1wlzqyr0L7hsQlK1fzV+f04g2JtQ1c/Fe74ZwdV6aQBdd6Uwl1052sw==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@nomicfoundation/solidity-analyzer-linux-arm64-gnu": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-arm64-gnu/-/solidity-analyzer-linux-arm64-gnu-0.1.2.tgz", + "integrity": "sha512-3d54oc+9ZVBuB6nbp8wHylk4xh0N0Gc+bk+/uJae+rUgbOBwQSfuGIbAZt1wBXs5REkSmynEGcqx6DutoK0tPA==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@nomicfoundation/solidity-analyzer-linux-arm64-musl": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-arm64-musl/-/solidity-analyzer-linux-arm64-musl-0.1.2.tgz", + "integrity": "sha512-iDJfR2qf55vgsg7BtJa7iPiFAsYf2d0Tv/0B+vhtnI16+wfQeTbP7teookbGvAo0eJo7aLLm0xfS/GTkvHIucA==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@nomicfoundation/solidity-analyzer-linux-x64-gnu": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-x64-gnu/-/solidity-analyzer-linux-x64-gnu-0.1.2.tgz", + "integrity": "sha512-9dlHMAt5/2cpWyuJ9fQNOUXFB/vgSFORg1jpjX1Mh9hJ/MfZXlDdHQ+DpFCs32Zk5pxRBb07yGvSHk9/fezL+g==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@nomicfoundation/solidity-analyzer-linux-x64-musl": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-linux-x64-musl/-/solidity-analyzer-linux-x64-musl-0.1.2.tgz", + "integrity": "sha512-GzzVeeJob3lfrSlDKQw2bRJ8rBf6mEYaWY+gW0JnTDHINA0s2gPR4km5RLIj1xeZZOYz4zRw+AEeYgLRqB2NXg==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@nomicfoundation/solidity-analyzer-win32-x64-msvc": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@nomicfoundation/solidity-analyzer-win32-x64-msvc/-/solidity-analyzer-win32-x64-msvc-0.1.2.tgz", + "integrity": "sha512-Fdjli4DCcFHb4Zgsz0uEJXZ2K7VEO+w5KVv7HmT7WO10iODdU9csC2az4jrhEsRtiR9Gfd74FlG0NYlw1BMdyA==", + "dev": true, + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@openzeppelin/confidential-contracts": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/confidential-contracts/-/confidential-contracts-0.3.0.tgz", + "integrity": "sha512-SccPGH4RgmKNtNBhv6gU85Ek/MT99fuI09o14xN4gd6PBrjEetUoAS01dlevP1lpqbAoyM8oiXshOEJ86M5tyw==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "@fhevm/solidity": "0.9.1", + "@openzeppelin/contracts": "^5.4.0", + "@openzeppelin/contracts-upgradeable": "^5.4.0" + } + }, + "node_modules/@openzeppelin/contracts": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.4.0.tgz", + "integrity": "sha512-eCYgWnLg6WO+X52I16TZt8uEjbtdkgLC0SUX/xnAksjjrQI4Xfn4iBRoI5j55dmlOhDv1Y7BoR3cU7e3WWhC6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/@openzeppelin/contracts-upgradeable": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.4.0.tgz", + "integrity": "sha512-STJKyDzUcYuB35Zub1JpWW58JxvrFFVgQ+Ykdr8A9PGXgtq/obF5uoh07k2XmFyPxfnZdPdBdhkJ/n2YxJ87HQ==", + "dev": true, + "license": "MIT", + "peer": true, + "peerDependencies": { + "@openzeppelin/contracts": "5.4.0" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@scure/base": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.2.6.tgz", + "integrity": "sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip32": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.7.0.tgz", + "integrity": "sha512-E4FFX/N3f4B80AKWp5dP6ow+flD1LQZo/w8UnLGYZO674jS6YnYeepycOOksv+vLPSpgN35wgKgy+ybfTb2SMw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/curves": "~1.9.0", + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip32/node_modules/@noble/curves": { + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.7.tgz", + "integrity": "sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "1.8.0" + }, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip32/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip39": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.6.0.tgz", + "integrity": "sha512-+lF0BbLiJNwVlev4eKelw1WWLaiKXw7sSl8T6FvBlWkdX+94aGJ4o8XjUdlyhTCjd8c+B3KT3JfS8P0bLRNU6A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "~1.8.0", + "@scure/base": "~1.2.5" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@scure/bip39/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/@sentry/core": { + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz", + "integrity": "sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sentry/hub": "5.30.0", + "@sentry/minimal": "5.30.0", + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@sentry/core/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/@sentry/hub": { + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz", + "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@sentry/hub/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/@sentry/minimal": { + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz", + "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sentry/hub": "5.30.0", + "@sentry/types": "5.30.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@sentry/minimal/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/@sentry/node": { + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.30.0.tgz", + "integrity": "sha512-Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sentry/core": "5.30.0", + "@sentry/hub": "5.30.0", + "@sentry/tracing": "5.30.0", + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", + "cookie": "^0.4.1", + "https-proxy-agent": "^5.0.0", + "lru_map": "^0.3.3", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@sentry/node/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/@sentry/tracing": { + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-5.30.0.tgz", + "integrity": "sha512-dUFowCr0AIMwiLD7Fs314Mdzcug+gBVo/+NCMyDw8tFxJkwWAKl7Qa2OZxLQ0ZHjakcj1hNKfCQJ9rhyfOl4Aw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@sentry/hub": "5.30.0", + "@sentry/minimal": "5.30.0", + "@sentry/types": "5.30.0", + "@sentry/utils": "5.30.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@sentry/tracing/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/@sentry/types": { + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz", + "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=6" + } + }, + "node_modules/@sentry/utils": { + "version": "5.30.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz", + "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "@sentry/types": "5.30.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@sentry/utils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, + "node_modules/@solidity-parser/parser": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.20.2.tgz", + "integrity": "sha512-rbu0bzwNvMcwAjH86hiEAcOeRI2EeK8zCkHDrFykh/Al8mvJeFmjy3UrE7GYQjNwOgbGUUtCn5/k8CB8zIu7QA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz", + "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@typechain/ethers-v6": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@typechain/ethers-v6/-/ethers-v6-0.5.1.tgz", + "integrity": "sha512-F+GklO8jBWlsaVV+9oHaPh5NJdd6rAKN4tklGfInX1Q7h0xPgVLP39Jl3eCulPB5qexI71ZFHwbljx4ZXNfouA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "lodash": "^4.17.15", + "ts-essentials": "^7.0.1" + }, + "peerDependencies": { + "ethers": "6.x", + "typechain": "^8.3.2", + "typescript": ">=4.7.0" + } + }, + "node_modules/@typechain/hardhat": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@typechain/hardhat/-/hardhat-9.1.0.tgz", + "integrity": "sha512-mtaUlzLlkqTlfPwB3FORdejqBskSnh+Jl8AIJGjXNAQfRQ4ofHADPl1+oU7Z3pAJzmZbUXII8MhOLQltcHgKnA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "fs-extra": "^9.1.0" + }, + "peerDependencies": { + "@typechain/ethers-v6": "^0.5.1", + "ethers": "^6.1.0", + "hardhat": "^2.9.9", + "typechain": "^8.3.2" + } + }, + "node_modules/@typechain/hardhat/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@types/bn.js": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.2.0.tgz", + "integrity": "sha512-DLbJ1BPqxvQhIGbeu8VbUC1DiAiahHtAYvA0ZEAa4P31F7IaArc8z3C3BRQdWX4mtLQuABG4yzp76ZrS02Ui1Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/chai": { + "version": "4.3.20", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.20.tgz", + "integrity": "sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@types/chai-as-promised": { + "version": "7.1.8", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.8.tgz", + "integrity": "sha512-ThlRVIJhr69FLlh6IctTXFkmhtP3NpMZ2QGq69StYLyKZFp/HOp1VdKZj7RvfNWYYcJ1xlbLGLLWj1UvP5u/Gw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/chai": "*" + } + }, + "node_modules/@types/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "node_modules/@types/minimatch": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", + "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@types/mocha": { + "version": "10.0.10", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", + "integrity": "sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@types/node": { + "version": "24.5.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.1.tgz", + "integrity": "sha512-/SQdmUP2xa+1rdx7VwB9yPq8PaKej8TD5cQ+XfKDPWWC+VDJU4rvVVagXqKUzhKjtFoNA8rXDJAkCxQPAe00+Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "undici-types": "~7.12.0" + } + }, + "node_modules/@types/pbkdf2": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.2.tgz", + "integrity": "sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/prettier": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", + "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/@types/secp256k1": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.6.tgz", + "integrity": "sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@zama-fhe/relayer-sdk": { + "version": "0.3.0-5", + "resolved": "https://registry.npmjs.org/@zama-fhe/relayer-sdk/-/relayer-sdk-0.3.0-5.tgz", + "integrity": "sha512-DIPlN9z5tfSCXqUlhQN2MEv57HmAUHSGV9LPtGs6LWmM7POj6WsMd1hU7Qci4AWPsor7k3IqMfqGGthIvot/DQ==", + "dev": true, + "license": "BSD-3-Clause-Clear", + "dependencies": { + "commander": "^14.0.0", + "ethers": "^6.15.0", + "fetch-retry": "^6.0.0", + "keccak": "^3.0.4", + "node-tfhe": "1.4.0-alpha.3", + "node-tkms": "^0.12.0", + "tfhe": "1.4.0-alpha.3", + "tkms": "^0.12.0", + "wasm-feature-detect": "^1.8.0" + }, + "bin": { + "relayer": "bin/relayer.js" + }, + "engines": { + "node": ">=22" + } + }, + "node_modules/abbrev": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha512-LEyx4aLEC3x6T0UguF6YILf+ntvmOaWsVfENmIW0E9H09vKlLDGelMjjSm0jkDHALj8A8quZ/HapKNigzwge+Q==", + "dev": true, + "license": "ISC", + "peer": true + }, + "node_modules/abitype": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/abitype/-/abitype-1.1.0.tgz", + "integrity": "sha512-6Vh4HcRxNMLA0puzPjM5GBgT4aAcFGKZzSgAXvuZ27shJP6NEpielTuqbBmZILR5/xd0PizkBGy5hReKz9jl5A==", + "dev": true, + "license": "MIT", + "peer": true, + "funding": { + "url": "https://github.com/sponsors/wevm" + }, + "peerDependencies": { + "typescript": ">=5.0.4", + "zod": "^3.22.0 || ^4.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + }, + "zod": { + "optional": true + } + } + }, + "node_modules/acorn": { + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "acorn": "^8.11.0" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/adm-zip": { + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz", + "integrity": "sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.3.0" + } + }, + "node_modules/aes-js": { + "version": "4.0.0-beta.5", + "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-4.0.0-beta.5.tgz", + "integrity": "sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==", + "dev": true, + "license": "BSD-3-Clause OR MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=0.4.2" + } + }, + "node_modules/ansi-align": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", + "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.1.0" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, + "node_modules/array-back": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz", + "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "*" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true, + "license": "ISC", + "peer": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/axios": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz", + "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.4", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/base-x": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.11.tgz", + "integrity": "sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/blakejs": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz", + "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/bn.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.2.tgz", + "integrity": "sha512-v2YAxEmKaBLahNwE1mjp4WON6huMNeuDvagFZW+ASCuA/ku0bXR9hSMw0XpiqMoA3+rmnyck/tPRSFQkoC9Cuw==", + "dev": true, + "license": "MIT" + }, + "node_modules/boxen": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", + "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-align": "^3.0.0", + "camelcase": "^6.2.0", + "chalk": "^4.1.0", + "cli-boxes": "^2.2.1", + "string-width": "^4.2.2", + "type-fest": "^0.20.2", + "widest-line": "^3.1.0", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/boxen/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", + "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", + "dev": true, + "license": "MIT" + }, + "node_modules/brotli-wasm": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brotli-wasm/-/brotli-wasm-2.0.1.tgz", + "integrity": "sha512-+3USgYsC7bzb5yU0/p2HnnynZl0ak0E6uoIm4UW4Aby/8s8HFCq6NCfrrf1E9c3O8OCSzq3oYO1tUVqIi61Nww==", + "dev": true, + "license": "Apache-2.0", + "peer": true + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true, + "license": "ISC" + }, + "node_modules/browserify-aes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/bs58": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz", + "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "base-x": "^3.0.2" + } + }, + "node_modules/bs58check": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz", + "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "bs58": "^4.0.0", + "create-hash": "^1.1.0", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cbor": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/cbor/-/cbor-8.1.0.tgz", + "integrity": "sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "nofilter": "^3.1.0" + }, + "engines": { + "node": ">=12.19" + } + }, + "node_modules/chai": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", + "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", + "pathval": "^1.1.1", + "type-detect": "^4.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chai-as-promised": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.2.tgz", + "integrity": "sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw==", + "dev": true, + "license": "WTFPL", + "peer": true, + "dependencies": { + "check-error": "^1.0.2" + }, + "peerDependencies": { + "chai": ">= 2.1.2 < 6" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "engines": { + "node": "*" + } + }, + "node_modules/check-error": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "get-func-name": "^2.0.2" + }, + "engines": { + "node": "*" + } + }, + "node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/cipher-base": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.6.tgz", + "integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-boxes": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", + "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cli-table3": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz", + "integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "string-width": "^4.2.0" + }, + "engines": { + "node": "10.* || >= 12.*" + }, + "optionalDependencies": { + "@colors/colors": "1.5.0" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/command-exists": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz", + "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==", + "dev": true, + "license": "MIT" + }, + "node_modules/command-line-args": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz", + "integrity": "sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "array-back": "^3.1.0", + "find-replace": "^3.0.0", + "lodash.camelcase": "^4.3.0", + "typical": "^4.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/command-line-usage": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.3.tgz", + "integrity": "sha512-sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "array-back": "^4.0.2", + "chalk": "^2.4.2", + "table-layout": "^1.0.2", + "typical": "^5.2.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/command-line-usage/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/command-line-usage/node_modules/array-back": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", + "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/command-line-usage/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/command-line-usage/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/command-line-usage/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/command-line-usage/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/command-line-usage/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/command-line-usage/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/command-line-usage/node_modules/typical": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", + "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/commander": { + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz", + "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/cookie": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", + "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/create-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "node_modules/create-hmac": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "engines": { + "node": "*" + } + }, + "node_modules/death": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/death/-/death-1.1.0.tgz", + "integrity": "sha512-vsV6S4KVHvTGxbEcij7hkWRv0It+sGGWVOM67dQde/o5Xjnr+KmLjxWJii2uEObIrt1CcM9w0Yaovx+iOlIL+w==", + "dev": true, + "peer": true + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/deep-eql": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.4.tgz", + "integrity": "sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/difflib": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz", + "integrity": "sha512-9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w==", + "dev": true, + "peer": true, + "dependencies": { + "heap": ">= 0.2.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dotenv": { + "version": "16.6.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz", + "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/elliptic": { + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz", + "integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/elliptic/node_modules/bn.js": { + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz", + "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==", + "dev": true, + "license": "MIT" + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/encrypted-types": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/encrypted-types/-/encrypted-types-0.0.4.tgz", + "integrity": "sha512-f55ccBBUwvqWqr3ymAVOLZ6bzjsSQZlDN0GcKFmzkvTpml4Vm3Y6BCaHhCuW/ctrabTJJ3DFnUsjtFOpokJUaQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/enquirer": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/env-paths": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", + "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha512-yhi5S+mNTOuRvyW4gWlg5W1byMaQGWWSYHXsuFZ7GBo7tpyOwi2EdzMP/QWxh9hwkD2m+wDVHJsxhRIj+v/b/A==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=0.12.0" + }, + "optionalDependencies": { + "source-map": "~0.2.0" + } + }, + "node_modules/esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==", + "dev": true, + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ethereum-bloom-filters": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.2.0.tgz", + "integrity": "sha512-28hyiE7HVsWubqhpVLVmZXFd4ITeHi+BUu05o9isf0GUpMtzBUi+8/gFrGaGYzvGAJQmJ3JKj77Mk9G98T84rA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "^1.4.0" + } + }, + "node_modules/ethereum-bloom-filters/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/ethereum-cryptography": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz", + "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/pbkdf2": "^3.0.0", + "@types/secp256k1": "^4.0.1", + "blakejs": "^1.1.0", + "browserify-aes": "^1.2.0", + "bs58check": "^2.1.2", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "hash.js": "^1.1.7", + "keccak": "^3.0.0", + "pbkdf2": "^3.0.17", + "randombytes": "^2.1.0", + "safe-buffer": "^5.1.2", + "scrypt-js": "^3.0.0", + "secp256k1": "^4.0.1", + "setimmediate": "^1.0.5" + } + }, + "node_modules/ethereumjs-util": { + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz", + "integrity": "sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg==", + "dev": true, + "license": "MPL-2.0", + "peer": true, + "dependencies": { + "@types/bn.js": "^5.1.0", + "bn.js": "^5.1.2", + "create-hash": "^1.1.2", + "ethereum-cryptography": "^0.1.3", + "rlp": "^2.2.4" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/ethers": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.15.0.tgz", + "integrity": "sha512-Kf/3ZW54L4UT0pZtsY/rf+EkBU7Qi5nnhonjUb8yTXcxH3cdcWrV2cRyk0Xk/4jK6OoHhxxZHriyhje20If2hQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/ethers-io/" + }, + { + "type": "individual", + "url": "https://www.buymeacoffee.com/ricmoo" + } + ], + "license": "MIT", + "dependencies": { + "@adraffy/ens-normalize": "1.10.1", + "@noble/curves": "1.2.0", + "@noble/hashes": "1.3.2", + "@types/node": "22.7.5", + "aes-js": "4.0.0-beta.5", + "tslib": "2.7.0", + "ws": "8.17.1" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/ethers/node_modules/@types/node": { + "version": "22.7.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz", + "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.19.2" + } + }, + "node_modules/ethers/node_modules/undici-types": { + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/ethjs-unit": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", + "integrity": "sha512-/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "bn.js": "4.11.6", + "number-to-bn": "1.7.0" + }, + "engines": { + "node": ">=6.5.0", + "npm": ">=3" + } + }, + "node_modules/ethjs-unit/node_modules/bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/fast-glob": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.8" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/fast-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", + "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause", + "peer": true + }, + "node_modules/fastq": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", + "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fetch-retry": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-6.0.0.tgz", + "integrity": "sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag==", + "dev": true, + "license": "MIT" + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "license": "MIT", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-replace": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz", + "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "array-back": "^3.0.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.11", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", + "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/foreground-child": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", + "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "cross-spawn": "^7.0.6", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/form-data": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fp-ts": { + "version": "1.19.3", + "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-1.19.3.tgz", + "integrity": "sha512-H5KQDspykdHuztLTg+ajGN0Z2qUjcEf3Ybxc6hLt0k7/zPkn29XnKnxlBPyW2XIddWrGaJBzBl4VLYOtk39yZg==", + "dev": true, + "license": "MIT" + }, + "node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-func-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ghost-testrpc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/ghost-testrpc/-/ghost-testrpc-0.0.2.tgz", + "integrity": "sha512-i08dAEgJ2g8z5buJIrCTduwPIhih3DP+hOCTyyryikfV8T0bNvHnGXO67i0DD1H4GBDETTclPy9njZbfluQYrQ==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "chalk": "^2.4.2", + "node-emoji": "^1.10.0" + }, + "bin": { + "testrpc-sc": "index.js" + } + }, + "node_modules/ghost-testrpc/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/ghost-testrpc/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/ghost-testrpc/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/ghost-testrpc/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/ghost-testrpc/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/ghost-testrpc/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/ghost-testrpc/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/global-modules": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "global-prefix": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/global-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/global-prefix/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/globby": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", + "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/globby/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/globby/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/globby/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/handlebars": { + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.2", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, + "node_modules/handlebars/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/hardhat": { + "version": "2.26.3", + "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.26.3.tgz", + "integrity": "sha512-gBfjbxCCEaRgMCRgTpjo1CEoJwqNPhyGMMVHYZJxoQ3LLftp2erSVf8ZF6hTQC0r2wst4NcqNmLWqMnHg1quTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ethereumjs/util": "^9.1.0", + "@ethersproject/abi": "^5.1.2", + "@nomicfoundation/edr": "^0.11.3", + "@nomicfoundation/solidity-analyzer": "^0.1.0", + "@sentry/node": "^5.18.1", + "adm-zip": "^0.4.16", + "aggregate-error": "^3.0.0", + "ansi-escapes": "^4.3.0", + "boxen": "^5.1.2", + "chokidar": "^4.0.0", + "ci-info": "^2.0.0", + "debug": "^4.1.1", + "enquirer": "^2.3.0", + "env-paths": "^2.2.0", + "ethereum-cryptography": "^1.0.3", + "find-up": "^5.0.0", + "fp-ts": "1.19.3", + "fs-extra": "^7.0.1", + "immutable": "^4.0.0-rc.12", + "io-ts": "1.10.4", + "json-stream-stringify": "^3.1.4", + "keccak": "^3.0.2", + "lodash": "^4.17.11", + "micro-eth-signer": "^0.14.0", + "mnemonist": "^0.38.0", + "mocha": "^10.0.0", + "p-map": "^4.0.0", + "picocolors": "^1.1.0", + "raw-body": "^2.4.1", + "resolve": "1.17.0", + "semver": "^6.3.0", + "solc": "0.8.26", + "source-map-support": "^0.5.13", + "stacktrace-parser": "^0.1.10", + "tinyglobby": "^0.2.6", + "tsort": "0.0.1", + "undici": "^5.14.0", + "uuid": "^8.3.2", + "ws": "^7.4.6" + }, + "bin": { + "hardhat": "internal/cli/bootstrap.js" + }, + "peerDependencies": { + "ts-node": "*", + "typescript": "*" + }, + "peerDependenciesMeta": { + "ts-node": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, + "node_modules/hardhat-gas-reporter": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/hardhat-gas-reporter/-/hardhat-gas-reporter-2.3.0.tgz", + "integrity": "sha512-ySdA+044xMQv1BlJu5CYXToHzMexKFfIWxlQTBNNoerx1x96+d15IMdN01iQZ/TJ7NH2V5sU73bz77LoS/PEVw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@ethersproject/abi": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/units": "^5.7.0", + "@solidity-parser/parser": "^0.20.1", + "axios": "^1.6.7", + "brotli-wasm": "^2.0.1", + "chalk": "4.1.2", + "cli-table3": "^0.6.3", + "ethereum-cryptography": "^2.1.3", + "glob": "^10.3.10", + "jsonschema": "^1.4.1", + "lodash": "^4.17.21", + "markdown-table": "2.0.0", + "sha1": "^1.1.1", + "viem": "^2.27.0" + }, + "peerDependencies": { + "hardhat": "^2.16.0" + } + }, + "node_modules/hardhat-gas-reporter/node_modules/@noble/curves": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", + "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "1.4.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/hardhat-gas-reporter/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/hardhat-gas-reporter/node_modules/@scure/base": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", + "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "dev": true, + "license": "MIT", + "peer": true, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/hardhat-gas-reporter/node_modules/@scure/bip32": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", + "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/curves": "~1.4.0", + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/hardhat-gas-reporter/node_modules/@scure/bip39": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", + "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/hardhat-gas-reporter/node_modules/ethereum-cryptography": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", + "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/curves": "1.4.2", + "@noble/hashes": "1.4.0", + "@scure/bip32": "1.4.0", + "@scure/bip39": "1.3.0" + } + }, + "node_modules/hardhat/node_modules/@noble/hashes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.2.0.tgz", + "integrity": "sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "license": "MIT" + }, + "node_modules/hardhat/node_modules/@scure/base": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", + "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/hardhat/node_modules/@scure/bip32": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.1.5.tgz", + "integrity": "sha512-XyNh1rB0SkEqd3tXcXMi+Xe1fvg+kUIcoRIEujP1Jgv7DqW2r9lg3Ah0NkFaCs9sTkQAQA8kw7xiRXzENi9Rtw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "license": "MIT", + "dependencies": { + "@noble/hashes": "~1.2.0", + "@noble/secp256k1": "~1.7.0", + "@scure/base": "~1.1.0" + } + }, + "node_modules/hardhat/node_modules/@scure/bip39": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.1.tgz", + "integrity": "sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "license": "MIT", + "dependencies": { + "@noble/hashes": "~1.2.0", + "@scure/base": "~1.1.0" + } + }, + "node_modules/hardhat/node_modules/ethereum-cryptography": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz", + "integrity": "sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "1.2.0", + "@noble/secp256k1": "1.7.1", + "@scure/bip32": "1.1.5", + "@scure/bip39": "1.1.1" + } + }, + "node_modules/hardhat/node_modules/fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/hardhat/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "license": "MIT", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/hardhat/node_modules/resolve": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-parse": "^1.0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hardhat/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/hardhat/node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hash-base": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "license": "MIT", + "bin": { + "he": "bin/he" + } + }, + "node_modules/heap": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz", + "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "dev": true, + "license": "MIT", + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dev": true, + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/immer": { + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/immer/-/immer-10.0.2.tgz", + "integrity": "sha512-Rx3CqeqQ19sxUtYV9CU911Vhy8/721wRFnJv3REVGWUmoAcIwzifTsdmJte/MV+0/XpM35LZdQMBGkRIoLPwQA==", + "dev": true, + "license": "MIT", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/immer" + } + }, + "node_modules/immutable": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "dev": true, + "license": "MIT" + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", + "dev": true, + "license": "ISC", + "peer": true + }, + "node_modules/interpret": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/io-ts": { + "version": "1.10.4", + "resolved": "https://registry.npmjs.org/io-ts/-/io-ts-1.10.4.tgz", + "integrity": "sha512-b23PteSnYXSONJ6JQXRAlvJhuw8KOtkqa87W4wDtvMrud/DTJd5X+NpOOI+O/zZwVq6v0VLAaJ+1EDViKEuN9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fp-ts": "^1.0.0" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "dev": true, + "license": "MIT", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-hex-prefixed": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", + "integrity": "sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.5.0", + "npm": ">=3" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC", + "peer": true + }, + "node_modules/isows": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/isows/-/isows-1.0.7.tgz", + "integrity": "sha512-I1fSfDCZL5P0v33sVqeTDSpcstAg/N+wF5HS033mogOVIp4B+oHC7oOCsA3axAbBSGTJ8QubbNmnIRN/h8U7hg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/wevm" + } + ], + "license": "MIT", + "peer": true, + "peerDependencies": { + "ws": "*" + } + }, + "node_modules/jackspeak": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", + "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", + "dev": true, + "license": "BlueOak-1.0.0", + "peer": true, + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/js-sha3": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", + "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/json-stream-stringify": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/json-stream-stringify/-/json-stream-stringify-3.1.6.tgz", + "integrity": "sha512-x7fpwxOkbhFCaJDJ8vb1fBY3DdSa4AlITaz+HHILQJzdPMnHEFjxPwVUi1ALIbcIxDE0PNe/0i7frnY8QnBQog==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=7.10.1" + } + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "dev": true, + "license": "ISC", + "peer": true + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonfile": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz", + "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonschema": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.5.0.tgz", + "integrity": "sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "*" + } + }, + "node_modules/keccak": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.4.tgz", + "integrity": "sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "node-addon-api": "^2.0.0", + "node-gyp-build": "^4.2.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true, + "license": "MIT" + }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==", + "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/loupe": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "get-func-name": "^2.0.1" + } + }, + "node_modules/lru_map": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", + "integrity": "sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", + "dev": true, + "license": "ISC", + "peer": true + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true, + "license": "ISC", + "peer": true + }, + "node_modules/markdown-table": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz", + "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "repeat-string": "^1.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/md5.js": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/memorystream": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", + "integrity": "sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==", + "dev": true, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micro-eth-signer": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/micro-eth-signer/-/micro-eth-signer-0.14.0.tgz", + "integrity": "sha512-5PLLzHiVYPWClEvZIXXFu5yutzpadb73rnQCpUqIHu3No3coFuWQNfE5tkBQJ7djuLYl6aRLaS0MgWJYGoqiBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/curves": "~1.8.1", + "@noble/hashes": "~1.7.1", + "micro-packed": "~0.7.2" + } + }, + "node_modules/micro-eth-signer/node_modules/@noble/curves": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.8.2.tgz", + "integrity": "sha512-vnI7V6lFNe0tLAuJMu+2sX+FcL14TaCWy1qiczg1VwRmPrpQCdq5ESXQMqUc2tluRNf6irBXrWbl1mGN8uaU/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@noble/hashes": "1.7.2" + }, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/micro-eth-signer/node_modules/@noble/hashes": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.2.tgz", + "integrity": "sha512-biZ0NUSxyjLLqo6KxEJ1b+C2NAx0wtDoFvCaXHGgUkeHzf3Xc1xKumFKREuT7f7DARNZ/slvYUwFG6B0f2b6hQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/micro-ftch": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz", + "integrity": "sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/micro-packed": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.7.3.tgz", + "integrity": "sha512-2Milxs+WNC00TRlem41oRswvw31146GiSaoCT7s3Xi2gMUglW5QBeqlQaZeHr5tJx9nm3i57LNXPqxOOaWtTYg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@scure/base": "~1.2.5" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true, + "license": "ISC" + }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", + "dev": true, + "license": "MIT" + }, + "node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "peer": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "dev": true, + "license": "ISC", + "peer": true, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mnemonist": { + "version": "0.38.5", + "resolved": "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.5.tgz", + "integrity": "sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==", + "dev": true, + "license": "MIT", + "dependencies": { + "obliterator": "^2.0.0" + } + }, + "node_modules/mocha": { + "version": "10.8.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", + "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.3", + "browser-stdout": "^1.3.1", + "chokidar": "^3.5.3", + "debug": "^4.3.5", + "diff": "^5.2.0", + "escape-string-regexp": "^4.0.0", + "find-up": "^5.0.0", + "glob": "^8.1.0", + "he": "^1.2.0", + "js-yaml": "^4.1.0", + "log-symbols": "^4.1.0", + "minimatch": "^5.1.6", + "ms": "^2.1.3", + "serialize-javascript": "^6.0.2", + "strip-json-comments": "^3.1.1", + "supports-color": "^8.1.1", + "workerpool": "^6.5.1", + "yargs": "^16.2.0", + "yargs-parser": "^20.2.9", + "yargs-unparser": "^2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + } + }, + "node_modules/mocha/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/ndjson": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ndjson/-/ndjson-2.0.0.tgz", + "integrity": "sha512-nGl7LRGrzugTtaFcJMhLbpzJM6XdivmbkdlaGcrk/LXg2KL/YBC6z1g70xh0/al+oFuVFP8N8kiWRucmeEH/qQ==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "json-stringify-safe": "^5.0.1", + "minimist": "^1.2.5", + "readable-stream": "^3.6.0", + "split2": "^3.0.0", + "through2": "^4.0.0" + }, + "bin": { + "ndjson": "cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/node-addon-api": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.2.tgz", + "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==", + "dev": true, + "license": "MIT" + }, + "node_modules/node-emoji": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", + "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "lodash": "^4.17.21" + } + }, + "node_modules/node-gyp-build": { + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", + "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", + "dev": true, + "license": "MIT", + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "node_modules/node-tfhe": { + "version": "1.4.0-alpha.3", + "resolved": "https://registry.npmjs.org/node-tfhe/-/node-tfhe-1.4.0-alpha.3.tgz", + "integrity": "sha512-oTcWL0OFA6t6BhScmDiGQ3VA8tU8T3EXCzIzpNxQxcuJDgQtiUF5CV6dgJLOrpWck4KCp1Bo/xLhv07uwn3q6Q==", + "dev": true, + "license": "BSD-3-Clause-Clear" + }, + "node_modules/node-tkms": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/node-tkms/-/node-tkms-0.12.5.tgz", + "integrity": "sha512-1GZf8DtZGSqNKT/K4swcNytwhChYXUkKXg/rJTc66FbJ3VwjPbDDheHlp5kEBw0tFQO+dJ0lWsm+NRtafucFYg==", + "dev": true, + "license": "BSD-3-Clause-Clear" + }, + "node_modules/nofilter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-3.1.0.tgz", + "integrity": "sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12.19" + } + }, + "node_modules/nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/number-to-bn": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", + "integrity": "sha512-wsJ9gfSz1/s4ZsJN01lyonwuxA1tml6X1yBDnfpMglypcBRFZZkus26EdPSlqS5GJfYddVZa22p3VNb3z5m5Ig==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "bn.js": "4.11.6", + "strip-hex-prefix": "1.0.0" + }, + "engines": { + "node": ">=6.5.0", + "npm": ">=3" + } + }, + "node_modules/number-to-bn/node_modules/bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/obliterator": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/obliterator/-/obliterator-2.0.5.tgz", + "integrity": "sha512-42CPE9AhahZRsMNslczq0ctAEtqk8Eka26QofnqC346BZdHDySk3LWka23LI7ULIw11NmltpiLagIq8gBozxTw==", + "dev": true, + "license": "MIT" + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/ordinal": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ordinal/-/ordinal-1.0.3.tgz", + "integrity": "sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ox": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/ox/-/ox-0.9.3.tgz", + "integrity": "sha512-KzyJP+fPV4uhuuqrTZyok4DC7vFzi7HLUFiUNEmpbyh59htKWkOC98IONC1zgXJPbHAhQgqs6B0Z6StCGhmQvg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/wevm" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "@adraffy/ens-normalize": "^1.11.0", + "@noble/ciphers": "^1.3.0", + "@noble/curves": "1.9.1", + "@noble/hashes": "^1.8.0", + "@scure/bip32": "^1.7.0", + "@scure/bip39": "^1.6.0", + "abitype": "^1.0.9", + "eventemitter3": "5.0.1" + }, + "peerDependencies": { + "typescript": ">=5.4.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/ox/node_modules/@adraffy/ens-normalize": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@adraffy/ens-normalize/-/ens-normalize-1.11.0.tgz", + "integrity": "sha512-/3DDPKHqqIqxUULp8yP4zODUY1i+2xvVWsv8A79xGWdCAG+8sb0hRh0Rk2QyOJUnnbyPUAZYcpBuRe3nS2OIUg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/ox/node_modules/@noble/curves": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.1.tgz", + "integrity": "sha512-k11yZxZg+t+gWvBbIswW0yoJlu8cHOC7dhunwOzoWH/mXGBiYyR4YY6hAEK/3EUs4UpB8la1RfdRpeGsFHkWsA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "1.8.0" + }, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/ox/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/package-json-from-dist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", + "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "dev": true, + "license": "BlueOak-1.0.0", + "peer": true + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dev": true, + "license": "BlueOak-1.0.0", + "peer": true, + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "*" + } + }, + "node_modules/pbkdf2": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.3.tgz", + "integrity": "sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "create-hash": "~1.1.3", + "create-hmac": "^1.1.7", + "ripemd160": "=2.0.1", + "safe-buffer": "^5.2.1", + "sha.js": "^2.4.11", + "to-buffer": "^1.2.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/pbkdf2/node_modules/create-hash": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "integrity": "sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "sha.js": "^2.4.0" + } + }, + "node_modules/pbkdf2/node_modules/hash-base": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "integrity": "sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "inherits": "^2.0.1" + } + }, + "node_modules/pbkdf2/node_modules/ripemd160": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "integrity": "sha512-J7f4wutN8mdbV08MJnXibYpCOPHR+yzy+iQ/AsjMv2j8cLavQ8VGagDFUwwTAdF8FmRKVeNpbTTEwNHCW1g94w==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "hash-base": "^2.0.0", + "inherits": "^2.0.1" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "peer": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peer": true + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/raw-body": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "dev": true, + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", + "dev": true, + "peer": true, + "dependencies": { + "resolve": "^1.1.6" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/recursive-readdir": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", + "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/recursive-readdir/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/recursive-readdir/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/reduce-flatten": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz", + "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve": { + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-core-module": "^2.16.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/reusify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "node_modules/rlp": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.7.tgz", + "integrity": "sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==", + "dev": true, + "license": "MPL-2.0", + "peer": true, + "dependencies": { + "bn.js": "^5.2.0" + }, + "bin": { + "rlp": "bin/rlp" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true, + "license": "MIT" + }, + "node_modules/sc-istanbul": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/sc-istanbul/-/sc-istanbul-0.4.6.tgz", + "integrity": "sha512-qJFF/8tW/zJsbyfh/iT/ZM5QNHE3CXxtLJbZsL+CzdJLBsPD7SedJZoUA4d8iAcN2IoMp/Dx80shOOd2x96X/g==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "abbrev": "1.0.x", + "async": "1.x", + "escodegen": "1.8.x", + "esprima": "2.7.x", + "glob": "^5.0.15", + "handlebars": "^4.0.1", + "js-yaml": "3.x", + "mkdirp": "0.5.x", + "nopt": "3.x", + "once": "1.x", + "resolve": "1.1.x", + "supports-color": "^3.1.0", + "which": "^1.1.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "istanbul": "lib/cli.js" + } + }, + "node_modules/sc-istanbul/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/sc-istanbul/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/sc-istanbul/node_modules/glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/sc-istanbul/node_modules/has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sc-istanbul/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/sc-istanbul/node_modules/js-yaml/node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/sc-istanbul/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/sc-istanbul/node_modules/resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/sc-istanbul/node_modules/supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "has-flag": "^1.0.0" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/sc-istanbul/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/scrypt-js": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz", + "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/secp256k1": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.4.tgz", + "integrity": "sha512-6JfvwvjUOn8F/jUoBY2Q1v5WY5XS+rj8qSe0v8Y4ezH4InLgTEeOOPQsRll9OV429Pvo6BCHGavIyJfr3TAhsw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "peer": true, + "dependencies": { + "elliptic": "^6.5.7", + "node-addon-api": "^5.0.0", + "node-gyp-build": "^4.2.0" + }, + "engines": { + "node": ">=18.0.0" + } + }, + "node_modules/secp256k1/node_modules/node-addon-api": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz", + "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true, + "license": "ISC" + }, + "node_modules/sha.js": { + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz", + "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==", + "dev": true, + "license": "(MIT AND BSD-3-Clause)", + "peer": true, + "dependencies": { + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" + }, + "bin": { + "sha.js": "bin.js" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/sha1": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/sha1/-/sha1-1.1.1.tgz", + "integrity": "sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "charenc": ">= 0.0.1", + "crypt": ">= 0.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/shelljs": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", + "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + }, + "bin": { + "shjs": "bin/shjs" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/shelljs/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/shelljs/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/shelljs/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "license": "ISC", + "peer": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/solc": { + "version": "0.8.26", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.26.tgz", + "integrity": "sha512-yiPQNVf5rBFHwN6SIf3TUUvVAFKcQqmSUFeq+fb6pNRCo0ZCgpYOZDi3BVoezCPIAcKrVYd/qXlBLUP9wVrZ9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "command-exists": "^1.2.8", + "commander": "^8.1.0", + "follow-redirects": "^1.12.1", + "js-sha3": "0.8.0", + "memorystream": "^0.3.1", + "semver": "^5.5.0", + "tmp": "0.0.33" + }, + "bin": { + "solcjs": "solc.js" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/solc/node_modules/commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, + "node_modules/solc/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/solidity-comments-darwin-arm64": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/solidity-comments-darwin-arm64/-/solidity-comments-darwin-arm64-0.1.1.tgz", + "integrity": "sha512-ze1+YboHm8tRJXCoFEsxtU1gpvQ3rCH55xMtBH6dtyh1/gz4qrKCOUBaAP+IHplbzCacZBn+Pz3UmMDOoGshRw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/solidity-comments-linux-x64-gnu": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/solidity-comments-linux-x64-gnu/-/solidity-comments-linux-x64-gnu-0.1.1.tgz", + "integrity": "sha512-oiU4yhh1Q9SeGXQ+/sogfTNoOkU8I8IvlIeotBQziTOonUHrxQk4E63kNiYGPDn5ZbB3BhKFmGHNRNrkufsxcQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/solidity-coverage": { + "version": "0.8.16", + "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.8.16.tgz", + "integrity": "sha512-qKqgm8TPpcnCK0HCDLJrjbOA2tQNEJY4dHX/LSSQ9iwYFS973MwjtgYn2Iv3vfCEQJTj5xtm4cuUMzlJsJSMbg==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "@ethersproject/abi": "^5.0.9", + "@solidity-parser/parser": "^0.20.1", + "chalk": "^2.4.2", + "death": "^1.1.0", + "difflib": "^0.2.4", + "fs-extra": "^8.1.0", + "ghost-testrpc": "^0.0.2", + "global-modules": "^2.0.0", + "globby": "^10.0.1", + "jsonschema": "^1.2.4", + "lodash": "^4.17.21", + "mocha": "^10.2.0", + "node-emoji": "^1.10.0", + "pify": "^4.0.1", + "recursive-readdir": "^2.2.2", + "sc-istanbul": "^0.4.5", + "semver": "^7.3.4", + "shelljs": "^0.8.3", + "web3-utils": "^1.3.6" + }, + "bin": { + "solidity-coverage": "plugins/bin.js" + }, + "peerDependencies": { + "hardhat": "^2.11.0" + } + }, + "node_modules/solidity-coverage/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/solidity-coverage/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/solidity-coverage/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/solidity-coverage/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/solidity-coverage/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/solidity-coverage/node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/solidity-coverage/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/solidity-coverage/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "license": "MIT", + "peer": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/solidity-coverage/node_modules/semver": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "dev": true, + "license": "ISC", + "peer": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/solidity-coverage/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/solidity-coverage/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha512-CBdZ2oa/BHhS4xj5DlhjWNHcan57/5YuvfdLf17iVmIpd9KRm+DFLmC6nBNj+6Ua7Kt3TmOjDpQT1aTYOQtoUA==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "amdefine": ">=0.0.4" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/split2": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", + "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "readable-stream": "^3.0.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true + }, + "node_modules/stacktrace-parser": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/stacktrace-parser/-/stacktrace-parser-0.1.11.tgz", + "integrity": "sha512-WjlahMgHmCJpqzU8bIBy4qtsZdU9lRlcZE3Lvyej6t4tuOuv1vk57OW3MBrj6hXBFx/nNoC9MPMTcr5YA7NQbg==", + "dev": true, + "license": "MIT", + "dependencies": { + "type-fest": "^0.7.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/stacktrace-parser/node_modules/type-fest": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.7.1.tgz", + "integrity": "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-format": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/string-format/-/string-format-2.0.0.tgz", + "integrity": "sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==", + "dev": true, + "license": "WTFPL OR MIT", + "peer": true + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-hex-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", + "integrity": "sha512-q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "is-hex-prefixed": "1.0.0" + }, + "engines": { + "node": ">=6.5.0", + "npm": ">=3" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/table": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz", + "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "ajv": "^8.0.1", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/table-layout": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz", + "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "array-back": "^4.0.1", + "deep-extend": "~0.6.0", + "typical": "^5.2.0", + "wordwrapjs": "^4.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/table-layout/node_modules/array-back": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", + "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/table-layout/node_modules/typical": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", + "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/tfhe": { + "version": "1.4.0-alpha.3", + "resolved": "https://registry.npmjs.org/tfhe/-/tfhe-1.4.0-alpha.3.tgz", + "integrity": "sha512-xdla7hi2WzLFIdAx2/ihRZ/bKlKcgDDabTJGtoqp1E5oqhLM1PzTXsJE0p7tW8+ebrvxiMGfbgMAWnU3f2ZAIQ==", + "dev": true, + "license": "BSD-3-Clause-Clear" + }, + "node_modules/through2": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "readable-stream": "3" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", + "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.3" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tinyglobby/node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", + "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/tkms": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/tkms/-/tkms-0.12.5.tgz", + "integrity": "sha512-FuZYwBGEmdDAQ8S4mmq0o9SBhNQWczqOTX8L+lHLmPcLT7KCLlof6jYyXlp2/8IIFLnZ4gwEzLeWBYaW05q3AA==", + "dev": true, + "license": "BSD-3-Clause-Clear" + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "license": "MIT", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/to-buffer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.1.tgz", + "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "isarray": "^2.0.5", + "safe-buffer": "^5.2.1", + "typed-array-buffer": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/ts-command-line-args": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/ts-command-line-args/-/ts-command-line-args-2.5.1.tgz", + "integrity": "sha512-H69ZwTw3rFHb5WYpQya40YAX2/w7Ut75uUECbgBIsLmM+BNuYnxsltfyyLMxy6sEeKxgijLTnQtLd0nKd6+IYw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "chalk": "^4.1.0", + "command-line-args": "^5.1.1", + "command-line-usage": "^6.1.0", + "string-format": "^2.0.0" + }, + "bin": { + "write-markdown": "dist/write-markdown.js" + } + }, + "node_modules/ts-essentials": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-7.0.3.tgz", + "integrity": "sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==", + "dev": true, + "license": "MIT", + "peer": true, + "peerDependencies": { + "typescript": ">=3.7.0" + } + }, + "node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/ts-node/node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/tslib": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", + "dev": true, + "license": "0BSD" + }, + "node_modules/tsort": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tsort/-/tsort-0.0.1.tgz", + "integrity": "sha512-Tyrf5mxF8Ofs1tNoxA13lFeZ2Zrbd6cKbuH3V+MQ5sb6DtBj5FjrXVsRWT8YvNAQTqNoz66dz1WsbigI22aEnw==", + "dev": true, + "license": "MIT" + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typechain": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/typechain/-/typechain-8.3.2.tgz", + "integrity": "sha512-x/sQYr5w9K7yv3es7jo4KTX05CLxOf7TRWwoHlrjRh8H82G64g+k7VuWPJlgMo6qrjfCulOdfBjiaDtmhFYD/Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/prettier": "^2.1.1", + "debug": "^4.3.1", + "fs-extra": "^7.0.0", + "glob": "7.1.7", + "js-sha3": "^0.8.0", + "lodash": "^4.17.15", + "mkdirp": "^1.0.4", + "prettier": "^2.3.1", + "ts-command-line-args": "^2.2.0", + "ts-essentials": "^7.0.1" + }, + "bin": { + "typechain": "dist/cli/cli.js" + }, + "peerDependencies": { + "typescript": ">=4.3.0" + } + }, + "node_modules/typechain/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/typechain/node_modules/fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/typechain/node_modules/glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/typechain/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "license": "MIT", + "peer": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/typechain/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/typechain/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/typechain/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typescript": { + "version": "5.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", + "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/typical": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz", + "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", + "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", + "dev": true, + "license": "BSD-2-Clause", + "optional": true, + "peer": true, + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/undici": { + "version": "5.29.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz", + "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@fastify/busboy": "^2.0.0" + }, + "engines": { + "node": ">=14.0" + } + }, + "node_modules/undici-types": { + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz", + "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/utf8": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz", + "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/viem": { + "version": "2.37.6", + "resolved": "https://registry.npmjs.org/viem/-/viem-2.37.6.tgz", + "integrity": "sha512-b+1IozQ8TciVQNdQUkOH5xtFR0z7ZxR8pyloENi/a+RA408lv4LoX12ofwoiT3ip0VRhO5ni1em//X0jn/eW0g==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/wevm" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/curves": "1.9.1", + "@noble/hashes": "1.8.0", + "@scure/bip32": "1.7.0", + "@scure/bip39": "1.6.0", + "abitype": "1.1.0", + "isows": "1.0.7", + "ox": "0.9.3", + "ws": "8.18.3" + }, + "peerDependencies": { + "typescript": ">=5.0.4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/viem/node_modules/@noble/curves": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.9.1.tgz", + "integrity": "sha512-k11yZxZg+t+gWvBbIswW0yoJlu8cHOC7dhunwOzoWH/mXGBiYyR4YY6hAEK/3EUs4UpB8la1RfdRpeGsFHkWsA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "1.8.0" + }, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/viem/node_modules/@noble/hashes": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", + "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/viem/node_modules/ws": { + "version": "8.18.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", + "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/wasm-feature-detect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.8.0.tgz", + "integrity": "sha512-zksaLKM2fVlnB5jQQDqKXXwYHLQUVH9es+5TOOHwGOVJOCeRBCiPjwSg+3tN2AdTCzjgli4jijCH290kXb/zWQ==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/web3-utils": { + "version": "1.10.4", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.4.tgz", + "integrity": "sha512-tsu8FiKJLk2PzhDl9fXbGUWTkkVXYhtTA+SmEFkKft+9BgwLxfCRpU96sWv7ICC8zixBNd3JURVoiR3dUXgP8A==", + "dev": true, + "license": "LGPL-3.0", + "peer": true, + "dependencies": { + "@ethereumjs/util": "^8.1.0", + "bn.js": "^5.2.1", + "ethereum-bloom-filters": "^1.0.6", + "ethereum-cryptography": "^2.1.2", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randombytes": "^2.1.0", + "utf8": "3.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/web3-utils/node_modules/@ethereumjs/rlp": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz", + "integrity": "sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==", + "dev": true, + "license": "MPL-2.0", + "peer": true, + "bin": { + "rlp": "bin/rlp" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/web3-utils/node_modules/@ethereumjs/util": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz", + "integrity": "sha512-zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==", + "dev": true, + "license": "MPL-2.0", + "peer": true, + "dependencies": { + "@ethereumjs/rlp": "^4.0.1", + "ethereum-cryptography": "^2.0.0", + "micro-ftch": "^0.3.1" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/web3-utils/node_modules/@noble/curves": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz", + "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "1.4.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/web3-utils/node_modules/@noble/hashes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz", + "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/web3-utils/node_modules/@scure/base": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz", + "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==", + "dev": true, + "license": "MIT", + "peer": true, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/web3-utils/node_modules/@scure/bip32": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz", + "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/curves": "~1.4.0", + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/web3-utils/node_modules/@scure/bip39": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz", + "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/hashes": "~1.4.0", + "@scure/base": "~1.1.6" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/web3-utils/node_modules/ethereum-cryptography": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz", + "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@noble/curves": "1.4.2", + "@noble/hashes": "1.4.0", + "@scure/bip32": "1.4.0", + "@scure/bip39": "1.3.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/widest-line": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", + "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", + "dev": true, + "license": "MIT", + "dependencies": { + "string-width": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/wordwrapjs": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz", + "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "reduce-flatten": "^2.0.0", + "typical": "^5.2.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/wordwrapjs/node_modules/typical": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", + "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/workerpool": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", + "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", + "dev": true, + "license": "Apache-2.0" + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/ws": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "license": "MIT", + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/packages/core/confidential/src/environments/hardhat/package.json b/packages/core/confidential/src/environments/hardhat/package.json new file mode 100644 index 000000000..4818c8fef --- /dev/null +++ b/packages/core/confidential/src/environments/hardhat/package.json @@ -0,0 +1,20 @@ +{ + "name": "hardhat-sample", + "version": "0.0.1", + "description": "", + "main": "index.js", + "scripts": { + "test": "hardhat test" + }, + "author": "", + "license": "ISC", + "devDependencies": { + "@openzeppelin/contracts": "^5.4.0", + "@openzeppelin/confidential-contracts": "^0.3.0", + "@fhevm/hardhat-plugin": "^0.3.0-1", + "@fhevm/solidity": "^0.9.1", + "@zama-fhe/relayer-sdk": "0.3.0-5", + "@nomicfoundation/hardhat-toolbox": "^6.1.0", + "hardhat": "^2.16.1" + } +} \ No newline at end of file diff --git a/packages/core/confidential/src/erc7984.test.ts b/packages/core/confidential/src/erc7984.test.ts new file mode 100644 index 000000000..d6bf37bb2 --- /dev/null +++ b/packages/core/confidential/src/erc7984.test.ts @@ -0,0 +1,142 @@ +import test from 'ava'; +import type { OptionsError } from '.'; +import { erc7984 } from '.'; + +import type { ERC7984Options } from './erc7984'; +import { buildERC7984 } from './erc7984'; +import { printContract } from './print'; + +function testERC7984(title: string, opts: Partial) { + test(title, t => { + const c = buildERC7984({ + name: 'MyToken', + symbol: 'MTK', + contractURI: 'https://example.com/token', + networkConfig: 'zama-ethereum', + ...opts, + }); + t.snapshot(printContract(c)); + }); +} + +/** + * Tests external API for equivalence with internal API + */ +function testAPIEquivalence(title: string, opts?: ERC7984Options) { + test(title, t => { + t.is( + erc7984.print(opts), + printContract( + buildERC7984({ + name: 'MyToken', + symbol: 'MTK', + contractURI: '', + networkConfig: 'zama-ethereum', + ...opts, + }), + ), + ); + }); +} + +testERC7984('basic erc7984', {}); + +testERC7984('erc7984 name is unicodeSafe', { name: 'MyTokeć' }); + +testERC7984('erc7984 preminted', { + premint: '1000', +}); + +testERC7984('erc7984 premint of 0', { + premint: '0', +}); + +function testPremint(scenario: string, premint: string, expectedError?: string) { + test(`erc7984 premint - ${scenario} - ${expectedError ? 'invalid' : 'valid'}`, async t => { + if (expectedError) { + const error = t.throws(() => + buildERC7984({ + name: 'MyToken', + symbol: 'MTK', + contractURI: 'https://example.com/token', + networkConfig: 'zama-ethereum', + premint, + }), + ); + t.is((error as OptionsError).messages.premint, expectedError); + } else { + const c = buildERC7984({ + name: 'MyToken', + symbol: 'MTK', + contractURI: 'https://example.com/token', + networkConfig: 'zama-ethereum', + premint, + }); + t.snapshot(printContract(c)); + } + }); +} + +testPremint('max literal', '18446744073709.551615'); // 2^64 - 1, shifted by 6 decimals +testPremint('max literal + 1', '18446744073709.551616', 'Value is greater than uint64 max value'); +testPremint('no arithmetic overflow', '18446744073709'); // 2^64 - 1, truncated by 6 decimals +testPremint( + 'arithmetic overflow', + '18446744073710', + 'Amount would overflow uint64 after applying decimals, assuming 6 decimals', +); +testPremint('e notation', '1e13'); +testPremint( + 'e notation arithmetic overflow', + '1e14', + 'Amount would overflow uint64 after applying decimals, assuming 6 decimals', +); + +testERC7984('erc7984 wrappable', { + wrappable: true, +}); + +testERC7984('erc7984 votes + blocknumber', { + votes: 'blocknumber', +}); + +testERC7984('erc7984 votes + timestamp', { + votes: 'timestamp', +}); + +testERC7984('erc7984 full zama-ethereum', { + premint: '2000', + wrappable: true, + votes: 'blocknumber', + networkConfig: 'zama-ethereum', +}); + +testERC7984('erc7984 full with timestamp votes', { + premint: '2000', + wrappable: true, + votes: 'timestamp', + networkConfig: 'zama-ethereum', +}); + +testAPIEquivalence('erc7984 API default'); + +testAPIEquivalence('erc7984 API basic', { + name: 'CustomToken', + symbol: 'CTK', + contractURI: 'https://custom.example.com/token', + networkConfig: 'zama-ethereum', +}); + +testAPIEquivalence('erc7984 API full', { + name: 'CustomToken', + symbol: 'CTK', + contractURI: 'https://custom.example.com/token', + networkConfig: 'zama-ethereum', + premint: '2000', + wrappable: true, + votes: 'blocknumber', +}); + +test('erc7984 API assert defaults', async t => { + t.is(erc7984.print(erc7984.defaults), erc7984.print()); +}); diff --git a/packages/core/confidential/src/erc7984.test.ts.md b/packages/core/confidential/src/erc7984.test.ts.md new file mode 100644 index 000000000..e951bcea2 --- /dev/null +++ b/packages/core/confidential/src/erc7984.test.ts.md @@ -0,0 +1,475 @@ +# Snapshot report for `src/erc7984.test.ts` + +The actual snapshot is saved in `erc7984.test.ts.snap`. + +Generated by [AVA](https://avajs.dev). + +## basic erc7984 + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig {␊ + constructor() ERC7984("MyToken", "MTK", "https://example.com/token") {}␊ + }␊ + ` + +## erc7984 name is unicodeSafe + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + ␊ + contract MyTokec is ERC7984, ZamaEthereumConfig {␊ + constructor() ERC7984(unicode"MyTokeć", "MTK", "https://example.com/token") {}␊ + }␊ + ` + +## erc7984 preminted + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {FHE, euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig {␊ + constructor(address recipient)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + {␊ + _mint(recipient, FHE.asEuint64(SafeCast.toUint64(1000 * 10 ** decimals())));␊ + }␊ + }␊ + ` + +## erc7984 premint of 0 + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig {␊ + constructor() ERC7984("MyToken", "MTK", "https://example.com/token") {}␊ + }␊ + ` + +## erc7984 premint - max literal - valid + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {FHE, euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig {␊ + constructor(address recipient)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + {␊ + _mint(recipient, FHE.asEuint64(SafeCast.toUint64(18446744073709551615 * 10 ** (decimals() - 6))));␊ + }␊ + }␊ + ` + +## erc7984 premint - no arithmetic overflow - valid + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {FHE, euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig {␊ + constructor(address recipient)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + {␊ + _mint(recipient, FHE.asEuint64(SafeCast.toUint64(18446744073709 * 10 ** decimals())));␊ + }␊ + }␊ + ` + +## erc7984 premint - e notation - valid + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {FHE, euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig {␊ + constructor(address recipient)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + {␊ + _mint(recipient, FHE.asEuint64(SafeCast.toUint64(10000000000000 * 10 ** decimals())));␊ + }␊ + }␊ + ` + +## erc7984 wrappable + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {ERC7984ERC20Wrapper} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984ERC20Wrapper.sol";␊ + import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig, ERC7984ERC20Wrapper {␊ + constructor(IERC20 underlying)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + ERC7984ERC20Wrapper(underlying)␊ + {}␊ + ␊ + // The following functions are overrides required by Solidity.␊ + ␊ + function decimals()␊ + public␊ + view␊ + override(ERC7984, ERC7984ERC20Wrapper)␊ + returns (uint8)␊ + {␊ + return super.decimals();␊ + }␊ + }␊ + ` + +## erc7984 votes + blocknumber + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {ERC7984Votes} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984Votes.sol";␊ + import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig, EIP712, ERC7984Votes, AccessControl {␊ + bytes32 public constant HANDLE_VIEWER_ROLE = keccak256("HANDLE_VIEWER_ROLE");␊ + ␊ + constructor(address defaultAdmin, address handleViewer)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + EIP712("MyToken", "1")␊ + {␊ + _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊ + _grantRole(HANDLE_VIEWER_ROLE, handleViewer);␊ + }␊ + ␊ + function _validateHandleAllowance(bytes32 handle)␊ + internal␊ + view␊ + override␊ + onlyRole(HANDLE_VIEWER_ROLE)␊ + {}␊ + ␊ + // The following functions are overrides required by Solidity.␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC7984, AccessControl)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ + ␊ + function _update(address from, address to, euint64 amount)␊ + internal␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64 transferred)␊ + {␊ + return super._update(from, to, amount);␊ + }␊ + ␊ + function confidentialTotalSupply()␊ + public␊ + view␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64)␊ + {␊ + return super.confidentialTotalSupply();␊ + }␊ + }␊ + ` + +## erc7984 votes + timestamp + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {ERC7984Votes} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984Votes.sol";␊ + import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig, EIP712, ERC7984Votes, AccessControl {␊ + bytes32 public constant HANDLE_VIEWER_ROLE = keccak256("HANDLE_VIEWER_ROLE");␊ + ␊ + constructor(address defaultAdmin, address handleViewer)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + EIP712("MyToken", "1")␊ + {␊ + _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊ + _grantRole(HANDLE_VIEWER_ROLE, handleViewer);␊ + }␊ + ␊ + function clock() public view override returns (uint48) {␊ + return uint48(block.timestamp);␊ + }␊ + ␊ + // solhint-disable-next-line func-name-mixedcase␊ + function CLOCK_MODE() public pure override returns (string memory) {␊ + return "mode=timestamp";␊ + }␊ + ␊ + function _validateHandleAllowance(bytes32 handle)␊ + internal␊ + view␊ + override␊ + onlyRole(HANDLE_VIEWER_ROLE)␊ + {}␊ + ␊ + // The following functions are overrides required by Solidity.␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC7984, AccessControl)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ + ␊ + function _update(address from, address to, euint64 amount)␊ + internal␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64 transferred)␊ + {␊ + return super._update(from, to, amount);␊ + }␊ + ␊ + function confidentialTotalSupply()␊ + public␊ + view␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64)␊ + {␊ + return super.confidentialTotalSupply();␊ + }␊ + }␊ + ` + +## erc7984 full zama-ethereum + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {FHE, euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {ERC7984ERC20Wrapper} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984ERC20Wrapper.sol";␊ + import {ERC7984Votes} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984Votes.sol";␊ + import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ + import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig, ERC7984ERC20Wrapper, EIP712, ERC7984Votes, AccessControl {␊ + bytes32 public constant HANDLE_VIEWER_ROLE = keccak256("HANDLE_VIEWER_ROLE");␊ + ␊ + constructor(address recipient, IERC20 underlying, address defaultAdmin, address handleViewer)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + ERC7984ERC20Wrapper(underlying)␊ + EIP712("MyToken", "1")␊ + {␊ + _mint(recipient, FHE.asEuint64(SafeCast.toUint64(2000 * 10 ** decimals())));␊ + _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊ + _grantRole(HANDLE_VIEWER_ROLE, handleViewer);␊ + }␊ + ␊ + function _validateHandleAllowance(bytes32 handle)␊ + internal␊ + view␊ + override␊ + onlyRole(HANDLE_VIEWER_ROLE)␊ + {}␊ + ␊ + // The following functions are overrides required by Solidity.␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC7984, AccessControl)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ + ␊ + function _update(address from, address to, euint64 amount)␊ + internal␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64 transferred)␊ + {␊ + return super._update(from, to, amount);␊ + }␊ + ␊ + function confidentialTotalSupply()␊ + public␊ + view␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64)␊ + {␊ + return super.confidentialTotalSupply();␊ + }␊ + ␊ + function decimals()␊ + public␊ + view␊ + override(ERC7984, ERC7984ERC20Wrapper)␊ + returns (uint8)␊ + {␊ + return super.decimals();␊ + }␊ + }␊ + ` + +## erc7984 full with timestamp votes + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {FHE, euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {ERC7984ERC20Wrapper} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984ERC20Wrapper.sol";␊ + import {ERC7984Votes} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984Votes.sol";␊ + import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ + import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig, ERC7984ERC20Wrapper, EIP712, ERC7984Votes, AccessControl {␊ + bytes32 public constant HANDLE_VIEWER_ROLE = keccak256("HANDLE_VIEWER_ROLE");␊ + ␊ + constructor(address recipient, IERC20 underlying, address defaultAdmin, address handleViewer)␊ + ERC7984("MyToken", "MTK", "https://example.com/token")␊ + ERC7984ERC20Wrapper(underlying)␊ + EIP712("MyToken", "1")␊ + {␊ + _mint(recipient, FHE.asEuint64(SafeCast.toUint64(2000 * 10 ** decimals())));␊ + _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊ + _grantRole(HANDLE_VIEWER_ROLE, handleViewer);␊ + }␊ + ␊ + function clock() public view override returns (uint48) {␊ + return uint48(block.timestamp);␊ + }␊ + ␊ + // solhint-disable-next-line func-name-mixedcase␊ + function CLOCK_MODE() public pure override returns (string memory) {␊ + return "mode=timestamp";␊ + }␊ + ␊ + function _validateHandleAllowance(bytes32 handle)␊ + internal␊ + view␊ + override␊ + onlyRole(HANDLE_VIEWER_ROLE)␊ + {}␊ + ␊ + // The following functions are overrides required by Solidity.␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC7984, AccessControl)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ + ␊ + function _update(address from, address to, euint64 amount)␊ + internal␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64 transferred)␊ + {␊ + return super._update(from, to, amount);␊ + }␊ + ␊ + function confidentialTotalSupply()␊ + public␊ + view␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64)␊ + {␊ + return super.confidentialTotalSupply();␊ + }␊ + ␊ + function decimals()␊ + public␊ + view␊ + override(ERC7984, ERC7984ERC20Wrapper)␊ + returns (uint8)␊ + {␊ + return super.decimals();␊ + }␊ + }␊ + ` diff --git a/packages/core/confidential/src/erc7984.test.ts.snap b/packages/core/confidential/src/erc7984.test.ts.snap new file mode 100644 index 000000000..80d8e6e40 Binary files /dev/null and b/packages/core/confidential/src/erc7984.test.ts.snap differ diff --git a/packages/core/confidential/src/erc7984.ts b/packages/core/confidential/src/erc7984.ts new file mode 100644 index 000000000..208dd4751 --- /dev/null +++ b/packages/core/confidential/src/erc7984.ts @@ -0,0 +1,245 @@ +import { + ContractBuilder, + defineFunctions, + withCommonDefaults, + commonDefaults, + setInfo, + setClockMode, + OptionsError, + toBigInt, + requireAccessControl, + calculateERC20Premint, + scaleByPowerOfTen, + type ClockMode, + supportsInterface, +} from '@openzeppelin/wizard'; +import type { CommonOptions } from './common-options'; +import { printContract } from './print'; + +export const networkConfigOptions = ['zama-ethereum'] as const; +export type NetworkConfig = (typeof networkConfigOptions)[number]; + +export interface ERC7984Options extends CommonOptions { + name: string; + symbol: string; + contractURI: string; + networkConfig: NetworkConfig; + premint?: string; + wrappable?: boolean; + /** + * Whether to keep track of historical balances for voting in on-chain governance, and optionally specify the clock mode. + * Setting a clock mode implies voting is enabled. + */ + votes?: false | ClockMode; +} + +export const defaults: Required = { + name: 'MyToken', + symbol: 'MTK', + contractURI: '', + networkConfig: 'zama-ethereum', + premint: '0', + wrappable: false, + votes: false, + info: commonDefaults.info, +} as const; + +export function withDefaults(opts: ERC7984Options): Required { + return { + ...opts, + ...withCommonDefaults(opts), + premint: opts.premint || defaults.premint, + wrappable: opts.wrappable ?? defaults.wrappable, + votes: opts.votes ?? defaults.votes, + }; +} + +export function printERC7984(opts: ERC7984Options = defaults): string { + return printContract(buildERC7984(opts)); +} + +export function buildERC7984(opts: ERC7984Options): ContractBuilder { + const allOpts = withDefaults(opts); + + const c = new ContractBuilder(allOpts.name); + + const { info } = allOpts; + + addBase(c, allOpts.name, allOpts.symbol, allOpts.contractURI); + addNetworkConfig(c, allOpts.networkConfig); + + if (allOpts.premint) { + addPremint(c, allOpts.premint); + } + + if (allOpts.wrappable) { + addWrappable(c); + } + + if (allOpts.votes) { + addVotes(c, allOpts.name, allOpts.votes); + } + + setInfo(c, info); + + return c; +} + +function addBase(c: ContractBuilder, name: string, symbol: string, contractURI: string) { + const ERC7984 = { + name: 'ERC7984', + path: '@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol', + }; + c.addParent(ERC7984, [name, symbol, contractURI]); + c.addOverride(ERC7984, supportsInterface); + + c.addImportOnly({ + name: 'euint64', + path: '@fhevm/solidity/lib/FHE.sol', + }); + c.addOverride(ERC7984, functions._update); + c.addOverride(ERC7984, functions.confidentialTotalSupply); + c.addOverride(ERC7984, functions.decimals); +} + +function addNetworkConfig(c: ContractBuilder, network: NetworkConfig) { + switch (network) { + case 'zama-ethereum': + c.addParent({ + name: 'ZamaEthereumConfig', + path: '@fhevm/solidity/config/ZamaConfig.sol', + }); + break; + default: { + const _: never = network; + throw new Error(`Unknown network config: ${network}`); + } + } +} + +export const premintPattern = /^(\d*)(?:\.(\d+))?(?:e(\d+))?$/; + +const UINT64_MAX = BigInt(2) ** BigInt(64) - BigInt(1); + +export function validateUint64(numValue: bigint, field: string): bigint { + if (numValue > UINT64_MAX) { + throw new OptionsError({ + [field]: 'Value is greater than uint64 max value', + }); + } + return numValue; +} + +function addPremint(c: ContractBuilder, amount: string) { + const premintCalculation = calculateERC20Premint(amount); + if (premintCalculation === undefined) { + return; + } + + const { units, exp, decimalPlace } = premintCalculation; + + const validatedBaseUnits = validateUint64(toBigInt(units, 'premint'), 'premint'); + checkPotentialPremintOverflow(validatedBaseUnits, decimalPlace); + + c.addConstructorArgument({ type: 'address', name: 'recipient' }); + + c.addImportOnly({ + name: 'SafeCast', + path: '@openzeppelin/contracts/utils/math/SafeCast.sol', + }); + c.addImportOnly({ + name: 'FHE', + path: '@fhevm/solidity/lib/FHE.sol', + }); + const mintLine = `_mint(recipient, FHE.asEuint64(SafeCast.toUint64(${units} * 10 ** ${exp})));`; + + c.addConstructorCode(mintLine); +} + +/** + * Check for potential premint overflow assuming the user's contract has decimals() = 6 + * + * @param baseUnits The base units of the token, before applying power of 10 + * @param decimalPlace If positive, the number of assumed decimal places in the least significant digits of `validatedBaseUnits`. Ignored if <= 0. + * @throws OptionsError if the calculated value would overflow uint64 + */ +function checkPotentialPremintOverflow(baseUnits: bigint, decimalPlace: number) { + const assumedExp = decimalPlace <= 0 ? 6 : 6 - decimalPlace; + const calculatedValue = scaleByPowerOfTen(baseUnits, assumedExp); + + if (calculatedValue > UINT64_MAX) { + throw new OptionsError({ + premint: 'Amount would overflow uint64 after applying decimals, assuming 6 decimals', + }); + } +} + +function addWrappable(c: ContractBuilder) { + const underlyingArg = 'underlying'; + + c.addImportOnly({ + name: 'IERC20', + path: '@openzeppelin/contracts/interfaces/IERC20.sol', + }); + c.addConstructorArgument({ + type: 'IERC20', + name: underlyingArg, + }); + + const ERC7984ERC20Wrapper = { + name: 'ERC7984ERC20Wrapper', + path: '@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984ERC20Wrapper.sol', + }; + c.addParent(ERC7984ERC20Wrapper, [{ lit: underlyingArg }]); + c.addOverride(ERC7984ERC20Wrapper, functions.decimals); +} + +function addVotes(c: ContractBuilder, name: string, clockMode: ClockMode) { + const EIP712 = { + name: 'EIP712', + path: '@openzeppelin/contracts/utils/cryptography/EIP712.sol', + }; + c.addParent(EIP712, [name, '1']); + + const ERC7984Votes = { + name: 'ERC7984Votes', + path: '@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984Votes.sol', + }; + c.addParent(ERC7984Votes); + c.addOverride(ERC7984Votes, functions._update); + c.addOverride(ERC7984Votes, functions.confidentialTotalSupply); + + c.addModifier('override', functions._validateHandleAllowance); + requireAccessControl(c, functions._validateHandleAllowance, 'roles', 'HANDLE_VIEWER', 'handleViewer'); + + setClockMode(c, ERC7984Votes, clockMode); +} + +export const functions = defineFunctions({ + _update: { + kind: 'internal' as const, + args: [ + { name: 'from', type: 'address' }, + { name: 'to', type: 'address' }, + { name: 'amount', type: 'euint64' }, + ], + returns: ['euint64 transferred'], + }, + confidentialTotalSupply: { + kind: 'public' as const, + mutability: 'view', + args: [], + returns: ['euint64'], + }, + _validateHandleAllowance: { + kind: 'internal' as const, + mutability: 'view' as const, + args: [{ name: 'handle', type: 'bytes32' }], + }, + decimals: { + kind: 'public' as const, + mutability: 'view', + args: [], + returns: ['uint8'], + }, +}); diff --git a/packages/core/confidential/src/error.ts b/packages/core/confidential/src/error.ts new file mode 100644 index 000000000..a26433319 --- /dev/null +++ b/packages/core/confidential/src/error.ts @@ -0,0 +1,7 @@ +export type OptionsErrorMessages = { [prop in string]?: string }; + +export class OptionsError extends Error { + constructor(readonly messages: OptionsErrorMessages) { + super('Invalid options'); + } +} diff --git a/packages/core/confidential/src/generate/erc7984.ts b/packages/core/confidential/src/generate/erc7984.ts new file mode 100644 index 000000000..96c8e94f9 --- /dev/null +++ b/packages/core/confidential/src/generate/erc7984.ts @@ -0,0 +1,19 @@ +import { type ERC7984Options } from '../erc7984'; +import { clockModeOptions, infoOptions, generateAlternatives } from '@openzeppelin/wizard'; + +const booleans = [true, false]; + +const blueprint = { + name: ['MyToken'], + symbol: ['MTK'], + contractURI: ['http://example.com'], + votes: [false, ...clockModeOptions] as const, + premint: ['1'], + info: infoOptions, + networkConfig: ['zama-ethereum'] as const, + wrappable: booleans, +}; + +export function* generateERC7984Options(): Generator> { + yield* generateAlternatives(blueprint); +} diff --git a/packages/core/confidential/src/generate/sources.ts b/packages/core/confidential/src/generate/sources.ts new file mode 100644 index 000000000..167be208f --- /dev/null +++ b/packages/core/confidential/src/generate/sources.ts @@ -0,0 +1,73 @@ +import { promises as fs } from 'fs'; +import path from 'path'; +import crypto from 'crypto'; + +import { generateERC7984Options } from './erc7984'; +import type { GenericOptions, KindedOptions } from '../build-generic'; +import { buildGeneric } from '../build-generic'; +import { printContract } from '../print'; +import { OptionsError } from '../error'; +import { findCover, type Contract } from '@openzeppelin/wizard'; + +type Subset = 'all' | 'minimal-cover'; + +type Kind = keyof KindedOptions; + +export function* generateOptions(kind?: Kind): Generator { + if (!kind || kind === 'ERC7984') { + for (const kindOpts of generateERC7984Options()) { + yield { kind: 'ERC7984', ...kindOpts }; + } + } +} + +interface GeneratedContract { + id: string; + options: GenericOptions; + contract: Contract; +} + +interface GeneratedSource extends GeneratedContract { + source: string; +} + +function generateContractSubset(subset: Subset, kind?: Kind): GeneratedContract[] { + const contracts = []; + + for (const options of generateOptions(kind)) { + const id = crypto.createHash('sha1').update(JSON.stringify(options)).digest().toString('hex'); + + try { + const contract = buildGeneric(options); + contracts.push({ id, options, contract }); + } catch (e: unknown) { + if (e instanceof OptionsError) { + continue; + } else { + throw e; + } + } + } + + if (subset === 'all') { + return contracts; + } else { + const getParents = (c: GeneratedContract) => c.contract.parents.map(p => p.contract.path); + return findCover(contracts, getParents); + } +} + +export function* generateSources(subset: Subset, kind?: Kind): Generator { + for (const c of generateContractSubset(subset, kind)) { + const source = printContract(c.contract); + yield { ...c, source }; + } +} + +export async function writeGeneratedSources(dir: string, subset: Subset, kind?: Kind): Promise { + await fs.mkdir(dir, { recursive: true }); + + for (const { id, source } of generateSources(subset, kind)) { + await fs.writeFile(path.format({ dir, name: id, ext: '.sol' }), source); + } +} diff --git a/packages/core/confidential/src/index.ts b/packages/core/confidential/src/index.ts new file mode 100644 index 000000000..8a625a8af --- /dev/null +++ b/packages/core/confidential/src/index.ts @@ -0,0 +1,18 @@ +export type { GenericOptions, KindedOptions } from './build-generic'; +export { buildGeneric } from './build-generic'; + +export { printContract } from './print'; + +export { premintPattern } from './erc7984'; + +export type { OptionsErrorMessages } from './error'; +export { OptionsError } from './error'; + +export type { Kind } from './kind'; +export { sanitizeKind } from './kind'; + +export { erc7984 } from './api'; + +export { compatibleConfidentialContractsSemver } from './utils/version'; + +export type { ERC7984Options } from './erc7984'; diff --git a/packages/core/confidential/src/kind.ts b/packages/core/confidential/src/kind.ts new file mode 100644 index 000000000..4026a69ca --- /dev/null +++ b/packages/core/confidential/src/kind.ts @@ -0,0 +1,26 @@ +import type { GenericOptions } from './build-generic'; + +export type Kind = GenericOptions['kind']; + +export function sanitizeKind(kind: unknown): Kind { + if (typeof kind === 'string') { + const sanitized = kind.replace(/^(ERC|.)/i, c => c.toUpperCase()).replace(/^(RealWorldAsset)$/i, 'RealWorldAsset'); + if (isKind(sanitized)) { + return sanitized; + } + } + return 'ERC7984'; +} + +function isKind(value: Kind | T): value is Kind { + switch (value) { + case 'ERC7984': + return true; + + default: { + // Static assert that we've checked all kinds. + const _: T = value; + return false; + } + } +} diff --git a/packages/core/confidential/src/package.test.ts b/packages/core/confidential/src/package.test.ts new file mode 100644 index 000000000..8b137bf9e --- /dev/null +++ b/packages/core/confidential/src/package.test.ts @@ -0,0 +1,57 @@ +import test from 'ava'; +import { exec } from 'child_process'; +import { promisify } from 'util'; +import { mkdtemp, rm, writeFile } from 'fs/promises'; +import { tmpdir } from 'os'; +import { join } from 'path'; + +const execAsync = promisify(exec); + +async function packPackage(packageRoot: string): Promise { + const { stdout: packOutput } = await execAsync('npm pack', { cwd: packageRoot }); + // npm pack outputs the filename as the last line + const lines = packOutput.trim().split('\n'); + const packedFile = lines[lines.length - 1]?.trim(); + if (!packedFile) { + throw new Error('Failed to get packed filename from npm pack output'); + } + return join(packageRoot, packedFile); +} + +test('packed package can be installed and imported', async t => { + const solidityPackageRoot = join(__dirname, '../../solidity'); + const hooksPackageRoot = join(__dirname, '..'); + const tempDir = await mkdtemp(join(tmpdir(), 'wizard-package-test-')); + + try { + // Pack both packages (this package and dependency on solidity package) + const solidityPackedPath = await packPackage(solidityPackageRoot); + const packedPath = await packPackage(hooksPackageRoot); + + try { + // Create a test project in temp directory + await execAsync('npm init -y', { cwd: tempDir }); + + // Install both packages + await execAsync(`npm install "${solidityPackedPath}" "${packedPath}"`, { cwd: tempDir }); + + // Test that the package can be imported + const testScript = `const { erc7984 } = require('@openzeppelin/wizard-confidential'); +console.log('SUCCESS'); +`; + + const testScriptPath = join(tempDir, 'test.js'); + await writeFile(testScriptPath, testScript); + const { stdout } = await execAsync('node test.js', { cwd: tempDir }); + + t.true(stdout.includes('SUCCESS')); + } finally { + // Clean up the packed files + await rm(solidityPackedPath, { force: true }); + await rm(packedPath, { force: true }); + } + } finally { + // Clean up temp directory + await rm(tempDir, { recursive: true, force: true }); + } +}); diff --git a/packages/core/confidential/src/print-versioned.test.ts b/packages/core/confidential/src/print-versioned.test.ts new file mode 100644 index 000000000..e30cb0150 --- /dev/null +++ b/packages/core/confidential/src/print-versioned.test.ts @@ -0,0 +1,78 @@ +import test from 'ava'; + +import { ContractBuilder } from '@openzeppelin/wizard'; +import { printContractVersioned } from './print-versioned'; + +const toParentContract = (name: string, path: string) => { + return { + name: name, + path: path, + }; +}; + +test('contract with versioned imports', t => { + const TestContract = new ContractBuilder('TestContract'); + + // Add imports that should match replacement patterns + TestContract.addParent(toParentContract('ConfidentialContract', '@openzeppelin/confidential-contracts/Foo1.sol')); + TestContract.addParent(toParentContract('FhevmContract', '@fhevm/solidity/Foo2.sol')); + TestContract.addParent(toParentContract('StandardContract', '@openzeppelin/contracts/Foo3.sol')); + TestContract.addParent(toParentContract('UpgradeableContract', '@openzeppelin/contracts-upgradeable/Foo4.sol')); + + // Add imports that should NOT match replacement patterns + TestContract.addParent(toParentContract('CustomContract', './FooCustom.sol')); + TestContract.addParent(toParentContract('ThirdPartyLib', '@third-party/library/FooThirdParty.sol')); + TestContract.addParent(toParentContract('LocalImport', '../utils/FooLocal.sol')); + + // Add import-only references to test those as well + TestContract.addImportOnly({ + name: 'FhevmType', + path: '@fhevm/solidity/Types.sol', + }); + TestContract.addImportOnly({ + name: 'IFoo', + path: '@openzeppelin/contracts/IFoo.sol', + }); + TestContract.addImportOnly({ + name: 'FooUpgradeable', + path: '@openzeppelin/contracts-upgradeable/FooUpgradeable.sol', + }); + TestContract.addImportOnly({ + name: 'FooUnrelated', + path: '@unrelated/package/FooUnrelated.sol', + }); + + const result = printContractVersioned(TestContract); + + // Verify that versioned imports are added correctly + t.true(result.includes('@openzeppelin/confidential-contracts@')); + t.true(result.includes('@fhevm/solidity@')); + t.true(result.includes('@openzeppelin/contracts@')); + t.true(result.includes('@openzeppelin/contracts-upgradeable@')); + + // Verify that non-matching imports are not modified + t.true(result.includes('./FooCustom.sol')); + t.true(result.includes('@third-party/library/FooThirdParty.sol')); + t.true(result.includes('../utils/FooLocal.sol')); + t.true(result.includes('@unrelated/package/FooUnrelated.sol')); + + // Verify the contract is properly generated + t.true(result.includes('contract TestContract')); + + t.snapshot(result); +}); + +test('contract with basic structure', t => { + const BasicContract = new ContractBuilder('BasicContract'); + + // Add a simple parent with versioned import + BasicContract.addParent(toParentContract('ConfidentialContract', '@openzeppelin/confidential-contracts/Foo1.sol')); + + const result = printContractVersioned(BasicContract); + + // Verify basic structure and versioning + t.true(result.includes('contract BasicContract')); + t.true(result.includes('@openzeppelin/confidential-contracts@')); + + t.snapshot(result); +}); diff --git a/packages/core/confidential/src/print-versioned.test.ts.md b/packages/core/confidential/src/print-versioned.test.ts.md new file mode 100644 index 000000000..c261bbf88 --- /dev/null +++ b/packages/core/confidential/src/print-versioned.test.ts.md @@ -0,0 +1,43 @@ +# Snapshot report for `src/print-versioned.test.ts` + +The actual snapshot is saved in `print-versioned.test.ts.snap`. + +Generated by [AVA](https://avajs.dev). + +## contract with versioned imports + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {LocalImport} from "../utils/FooLocal.sol";␊ + import {CustomContract} from "./FooCustom.sol";␊ + import {FhevmContract} from "@fhevm/solidity@0.9.1/Foo2.sol";␊ + import {FhevmType} from "@fhevm/solidity@0.9.1/Types.sol";␊ + import {ConfidentialContract} from "@openzeppelin/confidential-contracts@0.3.0/Foo1.sol";␊ + import {UpgradeableContract} from "@openzeppelin/contracts-upgradeable@5.5.0/Foo4.sol";␊ + import {FooUpgradeable} from "@openzeppelin/contracts-upgradeable@5.5.0/FooUpgradeable.sol";␊ + import {StandardContract} from "@openzeppelin/contracts@5.5.0/Foo3.sol";␊ + import {IFoo} from "@openzeppelin/contracts@5.5.0/IFoo.sol";␊ + import {ThirdPartyLib} from "@third-party/library/FooThirdParty.sol";␊ + import {FooUnrelated} from "@unrelated/package/FooUnrelated.sol";␊ + ␊ + contract TestContract is ConfidentialContract, FhevmContract, StandardContract, UpgradeableContract, CustomContract, ThirdPartyLib, LocalImport {␊ + }␊ + ` + +## contract with basic structure + +> Snapshot 1 + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ConfidentialContract} from "@openzeppelin/confidential-contracts@0.3.0/Foo1.sol";␊ + ␊ + contract BasicContract is ConfidentialContract {␊ + }␊ + ` diff --git a/packages/core/confidential/src/print-versioned.test.ts.snap b/packages/core/confidential/src/print-versioned.test.ts.snap new file mode 100644 index 000000000..db61d9664 Binary files /dev/null and b/packages/core/confidential/src/print-versioned.test.ts.snap differ diff --git a/packages/core/confidential/src/print-versioned.ts b/packages/core/confidential/src/print-versioned.ts new file mode 100644 index 000000000..ee3af0e41 --- /dev/null +++ b/packages/core/confidential/src/print-versioned.ts @@ -0,0 +1,18 @@ +import openzeppelinContracts from '../../solidity/openzeppelin-contracts'; +import contractVersionPins from '../contract-version-pins'; +import type { Contract } from '@openzeppelin/wizard'; +import { printContract } from './print'; + +export function printContractVersioned(contract: Contract): string { + return printContract(contract, { + transformImport: p => { + return { + ...p, + path: p.path + .replace(/^@openzeppelin\/contracts(-upgradeable)?/, `$&@${openzeppelinContracts.version}`) + .replace(/^@openzeppelin\/confidential-contracts/, `$&@${contractVersionPins.confidentialContractsVersion}`) + .replace(/^@fhevm\/solidity/, `$&@${contractVersionPins.fhevmSolidityVersion}`), + }; + }, + }); +} diff --git a/packages/core/confidential/src/print.ts b/packages/core/confidential/src/print.ts new file mode 100644 index 000000000..16ff53ab5 --- /dev/null +++ b/packages/core/confidential/src/print.ts @@ -0,0 +1,16 @@ +import { printContract as printSolidityContract, type Options, type Contract } from '@openzeppelin/wizard'; +import { compatibleConfidentialContractsSemver } from './utils/version'; + +export function printContract(contract: Contract, opts?: Options): string { + return printSolidityContract(contract, { + ...opts, + additionalCompatibleLibraries: [ + ...(opts?.additionalCompatibleLibraries ?? []), + { + name: 'OpenZeppelin Confidential Contracts', + path: '@openzeppelin/confidential-contracts', + version: compatibleConfidentialContractsSemver, + }, + ], + }); +} diff --git a/packages/core/confidential/src/scripts/prepare.ts b/packages/core/confidential/src/scripts/prepare.ts new file mode 100644 index 000000000..f8cc4fdaf --- /dev/null +++ b/packages/core/confidential/src/scripts/prepare.ts @@ -0,0 +1,20 @@ +import { promises as fs } from 'fs'; + +import { version as confidentialContractsVersion } from '@openzeppelin/confidential-contracts/package.json'; +import { version as fhevmSolidityVersion } from '@fhevm/solidity/package.json'; + +import type { ContractVersionPins } from '../../contract-version-pins'; + +async function main() { + const contractVersionPins: ContractVersionPins = { + fhevmSolidityVersion, + confidentialContractsVersion, + }; + + await fs.writeFile('contract-version-pins.json', JSON.stringify(contractVersionPins, null, 2)); +} + +main().catch(e => { + console.error(e); + process.exit(1); +}); diff --git a/packages/core/confidential/src/test.ts b/packages/core/confidential/src/test.ts new file mode 100644 index 000000000..8ab83c5b8 --- /dev/null +++ b/packages/core/confidential/src/test.ts @@ -0,0 +1,34 @@ +import { promises as fs } from 'fs'; +import type { TestFn, ExecutionContext } from 'ava'; +import _test from 'ava'; +import hre from 'hardhat'; +import path from 'path'; + +import { writeGeneratedSources } from './generate/sources'; +import type { KindedOptions } from './build-generic'; + +interface Context { + generatedSourcesPath: string; +} + +const test = _test as TestFn; + +test.serial('erc7984 result compiles', async t => { + await testCompile(t, 'ERC7984'); +}); + +async function testCompile(t: ExecutionContext, kind: keyof KindedOptions) { + const generatedSourcesPath = path.join(hre.config.paths.sources, `generated`); + await fs.rm(generatedSourcesPath, { force: true, recursive: true }); + await writeGeneratedSources(generatedSourcesPath, 'all', kind); + + // We only want to check that contracts compile and we don't care about any + // of the outputs. Setting empty outputSelection causes compilation to go a + // lot faster and not run out of memory. + for (const { settings } of hre.config.solidity.compilers) { + settings.outputSelection = {}; + } + + await hre.run('compile'); + t.pass(); +} diff --git a/packages/core/confidential/src/utils/version.test.ts b/packages/core/confidential/src/utils/version.test.ts new file mode 100644 index 000000000..bcc92bfb7 --- /dev/null +++ b/packages/core/confidential/src/utils/version.test.ts @@ -0,0 +1,24 @@ +import test from 'ava'; + +import semver from 'semver'; + +import { compatibleConfidentialContractsSemver, compatibleFHEVMSolidityContractsSemver } from './version'; +import contractVersionPins from '../../contract-version-pins'; + +const { fhevmSolidityVersion, confidentialContractsVersion } = contractVersionPins; + +test('installed @fhevm/solidity satisfies compatible range', t => { + t.true( + semver.satisfies(fhevmSolidityVersion, compatibleFHEVMSolidityContractsSemver), + `Installed @fhevm/solidity version ${fhevmSolidityVersion} does not satisfy compatible range ${compatibleFHEVMSolidityContractsSemver}. +Check whether the compatible range is up to date.`, + ); +}); + +test('installed @openzeppelin/confidential-contracts satisfies compatible range', t => { + t.true( + semver.satisfies(confidentialContractsVersion, compatibleConfidentialContractsSemver), + `Installed @openzeppelin/confidential-contracts version ${confidentialContractsVersion} does not satisfy compatible range ${compatibleConfidentialContractsSemver}. +Check whether the compatible range is up to date.`, + ); +}); diff --git a/packages/core/confidential/src/utils/version.ts b/packages/core/confidential/src/utils/version.ts new file mode 100644 index 000000000..821aa625e --- /dev/null +++ b/packages/core/confidential/src/utils/version.ts @@ -0,0 +1,9 @@ +/** + * Semantic version string representing the minimum compatible version of FHEVM Solidity contracts to display in output. + */ +export const compatibleFHEVMSolidityContractsSemver = '^0.9.1'; + +/** + * Semantic version string representing the minimum compatible version of Confidential Contracts to display in output. + */ +export const compatibleConfidentialContractsSemver = '^0.3.0'; diff --git a/packages/core/confidential/src/zip-hardhat.test.ts b/packages/core/confidential/src/zip-hardhat.test.ts new file mode 100644 index 000000000..1a26a736f --- /dev/null +++ b/packages/core/confidential/src/zip-hardhat.test.ts @@ -0,0 +1,150 @@ +import type { TestFn, ExecutionContext } from 'ava'; +import _test from 'ava'; + +import { zipHardhat } from './zip-hardhat'; + +import type { ERC7984Options } from './erc7984'; +import { buildERC7984 } from './erc7984'; +import { promises as fs } from 'fs'; +import path from 'path'; +import os from 'os'; +import util from 'util'; +import child from 'child_process'; +import type { Contract } from '@openzeppelin/wizard'; +import { rimraf } from 'rimraf'; +import type { JSZipObject } from 'jszip'; +import type JSZip from 'jszip'; +import type { GenericOptions } from './build-generic'; + +interface Context { + tempFolder: string; +} + +const test = _test as TestFn; + +test.beforeEach(async t => { + t.context.tempFolder = await fs.mkdtemp(path.join(os.tmpdir(), 'openzeppelin-wizard-')); +}); + +test.afterEach.always(async t => { + await rimraf(t.context.tempFolder); +}); + +test.serial('erc7984 basic', async t => { + const opts: GenericOptions = { + kind: 'ERC7984', + name: 'My Token', + contractURI: 'https://example.com', + networkConfig: 'zama-ethereum', + symbol: 'MTK', + }; + const c = buildERC7984(opts); + await runIgnitionTest(c, t); +}); + +test.serial('erc7984 full', async t => { + const fullOptions: Required = { + name: 'My Token', + contractURI: 'https://example.com', + networkConfig: 'zama-ethereum', + symbol: 'MTK', + premint: '2000', + wrappable: true, + votes: 'timestamp', + info: { + license: 'AGPL-3.0-only', + }, + }; + const opts: GenericOptions = { + kind: 'ERC7984', + ...fullOptions, + }; + const c = buildERC7984(opts); + await runIgnitionTest(c, t); +}); + +async function runIgnitionTest(c: Contract, t: ExecutionContext) { + const zip = await zipHardhat(c); + + assertIgnitionLayout(zip, c, t); + await extractAndRunIgnitionPackage(zip, c, t); + await assertIgnitionContents(zip, c, t); +} + +function assertIgnitionLayout(zip: JSZip, c: Contract, t: ExecutionContext) { + const sorted = Object.values(zip.files) + .map(f => f.name) + .sort(); + t.deepEqual(sorted, [ + '.gitignore', + 'README.md', + 'contracts/', + `contracts/${c.name}.sol`, + 'hardhat.config.ts', + 'ignition/', + 'ignition/modules/', + `ignition/modules/${c.name}.ts`, + 'package-lock.json', + 'package.json', + 'test/', + 'test/test.ts', + 'tsconfig.json', + ]); +} + +function extractAndRun(makeDeployCommand: (c: Contract) => string | null) { + return async (zip: JSZip, c: Contract, t: ExecutionContext) => { + const files = Object.values(zip.files); + + const tempFolder = t.context.tempFolder; + + const items = Object.values(files); + for (const item of items) { + if (item.dir) { + await fs.mkdir(path.join(tempFolder, item.name)); + } else { + await fs.writeFile(path.join(tempFolder, item.name), await asString(item)); + } + } + + let command = `cd "${tempFolder}" && npm ci && npm test`; + if (c.constructorArgs === undefined) { + // only test deploying the contract if there are no constructor args needed + command += ` && ${makeDeployCommand(c)}`; + } + + const exec = util.promisify(child.exec); + const result = await exec(command); + + t.regex(result.stdout, /1 passing/); + if (c.constructorArgs === undefined) { + t.regex(result.stdout, /deployed to/); + } + }; +} + +const extractAndRunIgnitionPackage = extractAndRun(c => `npx hardhat ignition deploy ignition/modules/${c.name}.ts`); + +async function assertIgnitionContents(zip: JSZip, c: Contract, t: ExecutionContext) { + const contentComparison = [ + await getItemString(zip, `contracts/${c.name}.sol`), + await getItemString(zip, 'hardhat.config.ts'), + await getItemString(zip, 'package.json'), + await getItemString(zip, `ignition/modules/${c.name}.ts`), + await getItemString(zip, 'test/test.ts'), + ]; + + t.snapshot(contentComparison); +} + +async function getItemString(zip: JSZip, key: string) { + const obj = zip.files[key]; + if (obj === undefined) { + throw Error(`Item ${key} not found in zip`); + } + return await asString(obj); +} + +async function asString(item: JSZipObject) { + return Buffer.from(await item.async('arraybuffer')).toString(); +} diff --git a/packages/core/confidential/src/zip-hardhat.test.ts.md b/packages/core/confidential/src/zip-hardhat.test.ts.md new file mode 100644 index 000000000..ea90b97da --- /dev/null +++ b/packages/core/confidential/src/zip-hardhat.test.ts.md @@ -0,0 +1,241 @@ +# Snapshot report for `src/zip-hardhat.test.ts` + +The actual snapshot is saved in `zip-hardhat.test.ts.snap`. + +Generated by [AVA](https://avajs.dev). + +## erc7984 basic + +> Snapshot 1 + + [ + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig {␊ + constructor() ERC7984("My Token", "MTK", "https://example.com") {}␊ + }␊ + `, + `import { HardhatUserConfig } from "hardhat/config";␊ + import "@nomicfoundation/hardhat-toolbox";␊ + import "@fhevm/hardhat-plugin";␊ + ␊ + ␊ + const config: HardhatUserConfig = {␊ + solidity: {␊ + version: "0.8.27",␊ + settings: {␊ + evmVersion: 'cancun',␊ + optimizer: {␊ + enabled: true,␊ + },␊ + },␊ + },␊ + };␊ + ␊ + export default config;␊ + `, + `{␊ + "name": "hardhat-sample",␊ + "version": "0.0.1",␊ + "description": "",␊ + "main": "index.js",␊ + "scripts": {␊ + "test": "hardhat test"␊ + },␊ + "author": "",␊ + "license": "MIT",␊ + "devDependencies": {␊ + "@openzeppelin/contracts": "^5.4.0",␊ + "@openzeppelin/confidential-contracts": "^0.3.0",␊ + "@fhevm/hardhat-plugin": "^0.3.0-1",␊ + "@fhevm/solidity": "^0.9.1",␊ + "@zama-fhe/relayer-sdk": "0.3.0-5",␊ + "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊ + "hardhat": "^2.16.1"␊ + }␊ + }`, + `import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";␊ + ␊ + export default buildModule("MyTokenModule", (m) => {␊ + ␊ + ␊ + const myToken = m.contract("MyToken", []);␊ + ␊ + return { myToken };␊ + });␊ + `, + `import { expect } from "chai";␊ + import { ethers, fhevm } from "hardhat";␊ + ␊ + describe("MyToken", function () {␊ + it("Test contract", async function () {␊ + const ContractFactory = await ethers.getContractFactory("MyToken");␊ + ␊ + const instance = await ContractFactory.deploy();␊ + await instance.waitForDeployment();␊ + });␊ + });␊ + `, + ] + +## erc7984 full + +> Snapshot 1 + + [ + `// SPDX-License-Identifier: AGPL-3.0-only␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊ + pragma solidity ^0.8.27;␊ + ␊ + import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊ + import {FHE, euint64} from "@fhevm/solidity/lib/FHE.sol";␊ + import {ERC7984} from "@openzeppelin/confidential-contracts/token/ERC7984/ERC7984.sol";␊ + import {ERC7984ERC20Wrapper} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984ERC20Wrapper.sol";␊ + import {ERC7984Votes} from "@openzeppelin/confidential-contracts/token/ERC7984/extensions/ERC7984Votes.sol";␊ + import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ + import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + ␊ + contract MyToken is ERC7984, ZamaEthereumConfig, ERC7984ERC20Wrapper, EIP712, ERC7984Votes, AccessControl {␊ + bytes32 public constant HANDLE_VIEWER_ROLE = keccak256("HANDLE_VIEWER_ROLE");␊ + ␊ + constructor(address recipient, IERC20 underlying, address defaultAdmin, address handleViewer)␊ + ERC7984("My Token", "MTK", "https://example.com")␊ + ERC7984ERC20Wrapper(underlying)␊ + EIP712("My Token", "1")␊ + {␊ + _mint(recipient, FHE.asEuint64(SafeCast.toUint64(2000 * 10 ** decimals())));␊ + _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊ + _grantRole(HANDLE_VIEWER_ROLE, handleViewer);␊ + }␊ + ␊ + function clock() public view override returns (uint48) {␊ + return uint48(block.timestamp);␊ + }␊ + ␊ + // solhint-disable-next-line func-name-mixedcase␊ + function CLOCK_MODE() public pure override returns (string memory) {␊ + return "mode=timestamp";␊ + }␊ + ␊ + function _validateHandleAllowance(bytes32 handle)␊ + internal␊ + view␊ + override␊ + onlyRole(HANDLE_VIEWER_ROLE)␊ + {}␊ + ␊ + // The following functions are overrides required by Solidity.␊ + ␊ + function supportsInterface(bytes4 interfaceId)␊ + public␊ + view␊ + override(ERC7984, AccessControl)␊ + returns (bool)␊ + {␊ + return super.supportsInterface(interfaceId);␊ + }␊ + ␊ + function _update(address from, address to, euint64 amount)␊ + internal␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64 transferred)␊ + {␊ + return super._update(from, to, amount);␊ + }␊ + ␊ + function confidentialTotalSupply()␊ + public␊ + view␊ + override(ERC7984, ERC7984Votes)␊ + returns (euint64)␊ + {␊ + return super.confidentialTotalSupply();␊ + }␊ + ␊ + function decimals()␊ + public␊ + view␊ + override(ERC7984, ERC7984ERC20Wrapper)␊ + returns (uint8)␊ + {␊ + return super.decimals();␊ + }␊ + }␊ + `, + `import { HardhatUserConfig } from "hardhat/config";␊ + import "@nomicfoundation/hardhat-toolbox";␊ + import "@fhevm/hardhat-plugin";␊ + ␊ + ␊ + const config: HardhatUserConfig = {␊ + solidity: {␊ + version: "0.8.27",␊ + settings: {␊ + evmVersion: 'cancun',␊ + optimizer: {␊ + enabled: true,␊ + },␊ + },␊ + },␊ + };␊ + ␊ + export default config;␊ + `, + `{␊ + "name": "hardhat-sample",␊ + "version": "0.0.1",␊ + "description": "",␊ + "main": "index.js",␊ + "scripts": {␊ + "test": "hardhat test"␊ + },␊ + "author": "",␊ + "license": "AGPL-3.0-only",␊ + "devDependencies": {␊ + "@openzeppelin/contracts": "^5.4.0",␊ + "@openzeppelin/confidential-contracts": "^0.3.0",␊ + "@fhevm/hardhat-plugin": "^0.3.0-1",␊ + "@fhevm/solidity": "^0.9.1",␊ + "@zama-fhe/relayer-sdk": "0.3.0-5",␊ + "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊ + "hardhat": "^2.16.1"␊ + }␊ + }`, + `import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";␊ + ␊ + export default buildModule("MyTokenModule", (m) => {␊ + ␊ + // TODO: Set values for the constructor arguments below␊ + const myToken = m.contract("MyToken", [recipient, underlying, defaultAdmin, handleViewer]);␊ + ␊ + return { myToken };␊ + });␊ + `, + `import { expect } from "chai";␊ + import { ethers, fhevm } from "hardhat";␊ + ␊ + describe("MyToken", function () {␊ + it("Test contract", async function () {␊ + const ContractFactory = await ethers.getContractFactory("MyToken");␊ + ␊ + const recipient = (await ethers.getSigners())[0].address;␊ + // TODO: Set the following constructor argument␊ + // const underlying = ...;␊ + const defaultAdmin = (await ethers.getSigners())[2].address;␊ + const handleViewer = (await ethers.getSigners())[3].address;␊ + ␊ + // TODO: Uncomment the below when the missing constructor arguments are set above␊ + // const instance = await ContractFactory.deploy(recipient, underlying, defaultAdmin, handleViewer);␊ + // await instance.waitForDeployment();␊ + });␊ + });␊ + `, + ] diff --git a/packages/core/confidential/src/zip-hardhat.test.ts.snap b/packages/core/confidential/src/zip-hardhat.test.ts.snap new file mode 100644 index 000000000..9d0c22342 Binary files /dev/null and b/packages/core/confidential/src/zip-hardhat.test.ts.snap differ diff --git a/packages/core/confidential/src/zip-hardhat.ts b/packages/core/confidential/src/zip-hardhat.ts new file mode 100644 index 000000000..1e4dd1341 --- /dev/null +++ b/packages/core/confidential/src/zip-hardhat.ts @@ -0,0 +1,34 @@ +import type JSZip from 'jszip'; +import type { Contract } from '@openzeppelin/wizard'; +import { HardhatZipGenerator } from '@openzeppelin/wizard/zip-env-hardhat'; +import { printContract } from './print'; + +class ConfidentialHardhatZipGenerator extends HardhatZipGenerator { + protected getAdditionalHardhatImports(): string[] { + return ['@fhevm/hardhat-plugin']; + } + + protected async getPackageJson(c: Contract): Promise { + const { default: packageJson } = await import('./environments/hardhat/package.json'); + packageJson.license = c.license; + return packageJson; + } + + protected async getPackageLock(c: Contract): Promise { + const { default: packageLock } = await import('./environments/hardhat/package-lock.json'); + packageLock.packages[''].license = c.license; + return packageLock; + } + + protected getPrintContract(c: Contract): string { + return printContract(c); + } + + public getHardhatPlugins(c: Contract): string[] { + return super.getHardhatPlugins(c).concat(['fhevm']); + } +} + +export async function zipHardhat(c: Contract): Promise { + return new ConfidentialHardhatZipGenerator().zipHardhat(c); +} diff --git a/packages/core/confidential/tsconfig.json b/packages/core/confidential/tsconfig.json new file mode 100644 index 000000000..68fb5fd5e --- /dev/null +++ b/packages/core/confidential/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "incremental": true, + "module": "commonjs", + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "skipLibCheck": true, + "rootDir": "src", + "outDir": "dist" + }, + "include": [ + "src/**/*" + ] +} \ No newline at end of file diff --git a/packages/core/confidential/zip-env-hardhat.js b/packages/core/confidential/zip-env-hardhat.js new file mode 100644 index 000000000..2d13c70df --- /dev/null +++ b/packages/core/confidential/zip-env-hardhat.js @@ -0,0 +1 @@ +module.exports = require('./dist/zip-hardhat'); diff --git a/packages/core/confidential/zip-env-hardhat.ts b/packages/core/confidential/zip-env-hardhat.ts new file mode 100644 index 000000000..8786bfeae --- /dev/null +++ b/packages/core/confidential/zip-env-hardhat.ts @@ -0,0 +1 @@ +export * from './src/zip-hardhat'; diff --git a/packages/core/solidity/src/account.test.ts.md b/packages/core/solidity/src/account.test.ts.md index 3c33b3548..c863e6e49 100644 --- a/packages/core/solidity/src/account.test.ts.md +++ b/packages/core/solidity/src/account.test.ts.md @@ -100,8 +100,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountERC721Holder is Account, EIP712, ERC7739, ERC721Holder {␊ @@ -128,8 +128,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountERC1155Holder is Account, EIP712, ERC7739, ERC1155Holder {␊ @@ -156,9 +156,9 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountERC721HolderERC1155Holder is Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder {␊ @@ -185,9 +185,9 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, ERC7821 {␊ constructor() EIP712("MyAccount", "1") {}␊ @@ -223,9 +223,9 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579 {␊ constructor(uint256 moduleTypeId, address module, bytes calldata initData)␊ @@ -309,9 +309,9 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579 {␊ constructor(uint256 moduleTypeId, address module, bytes calldata initData)␊ @@ -356,9 +356,9 @@ Generated by [AVA](https://avajs.dev). import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked {␊ constructor(uint256 moduleTypeId, address module, bytes calldata initData)␊ @@ -401,10 +401,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccount is Initializable, Account, EIP712, ERC7739, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -485,10 +485,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountERC7739 is Initializable, Account, EIP712, ERC7739, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -523,11 +523,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountERC721Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -562,11 +562,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -601,12 +601,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -641,11 +641,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, ERC7821, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -688,13 +688,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -750,11 +750,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, UUPSUpgradeable {␊ @@ -808,13 +808,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -870,14 +870,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -934,9 +934,9 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract CustomAccount is Initializable, Account, EIP712, ERC7739 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1004,9 +1004,9 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract CustomAccountERC7739 is Initializable, Account, EIP712, ERC7739 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1035,10 +1035,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract CustomAccountERC721Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1067,10 +1067,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract CustomAccountERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1099,11 +1099,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract CustomAccountERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1132,10 +1132,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, ERC7821 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1172,12 +1172,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1227,11 +1227,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1278,12 +1278,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1333,13 +1333,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1391,8 +1391,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSA is Account, EIP712, ERC7739, SignerECDSA {␊ constructor(address signer)␊ @@ -1438,8 +1438,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC7739 is Account, EIP712, ERC7739, SignerECDSA {␊ constructor(address signer)␊ @@ -1458,10 +1458,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC721Holder is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder {␊ constructor(address signer)␊ @@ -1480,10 +1480,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC1155Holder is Account, EIP712, ERC7739, SignerECDSA, ERC1155Holder {␊ constructor(address signer)␊ @@ -1502,11 +1502,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder, ERC1155Holder {␊ constructor(address signer)␊ @@ -1525,10 +1525,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, SignerECDSA, ERC7821 {␊ constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊ @@ -1552,13 +1552,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerECDSA {␊ constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊ @@ -1608,11 +1608,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ ␊ contract MyAccount is Account, IERC1271, AccountERC7579, SignerECDSA {␊ @@ -1660,13 +1660,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerECDSA {␊ constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊ @@ -1716,14 +1716,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerECDSA {␊ constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊ @@ -1773,12 +1773,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1806,10 +1806,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable, UUPSUpgradeable {␊ @@ -1847,12 +1847,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1880,13 +1880,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1914,13 +1914,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1948,14 +1948,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -1985,13 +1985,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC7821, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2028,15 +2028,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2100,14 +2100,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2168,15 +2168,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2240,16 +2240,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2313,11 +2313,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2339,10 +2339,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2373,11 +2373,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2399,12 +2399,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2426,12 +2426,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2453,13 +2453,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2483,12 +2483,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC7821 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2519,14 +2519,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2584,13 +2584,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2645,14 +2645,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2710,15 +2710,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -2778,8 +2778,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerEIP7702 is Account, EIP712, ERC7739, SignerEIP7702 {␊ constructor() EIP712("CustomAccount with SignerEIP7702", "1") {}␊ @@ -2820,8 +2820,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerEIP7702ERC7739 is Account, EIP712, ERC7739, SignerEIP7702 {␊ constructor() EIP712("CustomAccount with SignerEIP7702ERC7739", "1") {}␊ @@ -2837,10 +2837,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerEIP7702ERC721Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC721Holder {␊ constructor() EIP712("CustomAccount with SignerEIP7702ERC721Holder", "1") {}␊ @@ -2856,10 +2856,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerEIP7702ERC1155Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC1155Holder {␊ constructor() EIP712("CustomAccount with SignerEIP7702ERC1155Holder", "1") {}␊ @@ -2875,11 +2875,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerEIP7702ERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC721Holder, ERC1155Holder {␊ constructor()␊ @@ -2897,10 +2897,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, SignerEIP7702, ERC7821 {␊ constructor() EIP712("MyAccount", "1") {}␊ @@ -2924,13 +2924,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerEIP7702 {␊ constructor() EIP712("MyAccount", "1") {}␊ @@ -2980,11 +2980,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ ␊ contract MyAccount is Account, IERC1271, AccountERC7579, SignerEIP7702 {␊ @@ -3030,13 +3030,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerEIP7702 {␊ constructor() EIP712("MyAccount", "1") {}␊ @@ -3086,14 +3086,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerEIP7702 {␊ constructor() EIP712("MyAccount", "1") {}␊ @@ -3145,8 +3145,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisig is Account, EIP712, ERC7739, MultiSignerERC7913 {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3218,8 +3218,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC7739 is Account, EIP712, ERC7739, MultiSignerERC7913 {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3250,10 +3250,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC721Holder is Account, EIP712, ERC7739, MultiSignerERC7913, ERC721Holder {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3284,10 +3284,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC1155Holder is Account, EIP712, ERC7739, MultiSignerERC7913, ERC1155Holder {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3318,11 +3318,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Account, EIP712, ERC7739, MultiSignerERC7913, ERC721Holder, ERC1155Holder {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3353,10 +3353,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, MultiSignerERC7913, ERC7821 {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3395,13 +3395,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, MultiSignerERC7913 {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3466,12 +3466,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ ␊ contract MyAccount is Account, IERC1271, AccountERC7579, MultiSignerERC7913 {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3532,13 +3532,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, MultiSignerERC7913 {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3603,14 +3603,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, MultiSignerERC7913 {␊ constructor(bytes[] memory signers, uint64 threshold)␊ @@ -3675,12 +3675,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisig is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -3723,10 +3723,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊ @@ -3779,12 +3779,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -3827,13 +3827,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -3876,13 +3876,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -3925,14 +3925,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -3977,13 +3977,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC7821, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4035,15 +4035,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4122,14 +4122,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4205,15 +4205,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4292,16 +4292,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4380,11 +4380,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisig is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4421,10 +4421,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4470,11 +4470,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4511,12 +4511,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4553,12 +4553,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4595,13 +4595,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4640,12 +4640,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC7821 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4691,14 +4691,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4771,13 +4771,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4847,14 +4847,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -4927,15 +4927,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -5010,8 +5010,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeighted is Account, EIP712, ERC7739, MultiSignerERC7913Weighted {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5097,8 +5097,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC7739 is Account, EIP712, ERC7739, MultiSignerERC7913Weighted {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5136,10 +5136,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC721Holder is Account, EIP712, ERC7739, MultiSignerERC7913Weighted, ERC721Holder {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5177,10 +5177,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC1155Holder is Account, EIP712, ERC7739, MultiSignerERC7913Weighted, ERC1155Holder {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5218,11 +5218,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Account, EIP712, ERC7739, MultiSignerERC7913Weighted, ERC721Holder, ERC1155Holder {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5260,10 +5260,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, MultiSignerERC7913Weighted, ERC7821 {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5309,14 +5309,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, MultiSignerERC7913Weighted {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5388,13 +5388,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ ␊ contract MyAccount is Account, IERC1271, AccountERC7579, MultiSignerERC7913Weighted {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5462,14 +5462,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, MultiSignerERC7913Weighted {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5541,15 +5541,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊ import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, MultiSignerERC7913Weighted {␊ constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊ @@ -5621,12 +5621,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeighted is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -5676,10 +5676,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊ @@ -5739,12 +5739,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -5796,13 +5796,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -5854,13 +5854,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -5912,14 +5912,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -5971,13 +5971,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC7821, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6036,16 +6036,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6131,15 +6131,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6222,16 +6222,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6317,17 +6317,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6413,11 +6413,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeighted is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6461,10 +6461,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913WeightedUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6517,11 +6517,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6567,12 +6567,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6618,12 +6618,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6669,13 +6669,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6721,12 +6721,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC7821 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6779,15 +6779,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6867,14 +6867,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -6951,15 +6951,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7039,16 +7039,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊ import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913WeightedUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7130,8 +7130,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256 is Account, EIP712, ERC7739, SignerP256 {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7177,8 +7177,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256ERC7739 is Account, EIP712, ERC7739, SignerP256 {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7197,10 +7197,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256ERC721Holder is Account, EIP712, ERC7739, SignerP256, ERC721Holder {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7219,10 +7219,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256ERC1155Holder is Account, EIP712, ERC7739, SignerP256, ERC1155Holder {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7241,11 +7241,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerP256, ERC721Holder, ERC1155Holder {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7264,10 +7264,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, SignerP256, ERC7821 {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7294,13 +7294,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerP256 {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7353,11 +7353,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ ␊ contract MyAccount is Account, IERC1271, AccountERC7579, SignerP256 {␊ @@ -7405,13 +7405,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerP256 {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7464,14 +7464,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerP256 {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -7524,12 +7524,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7557,10 +7557,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerP256ERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable, UUPSUpgradeable {␊ @@ -7598,12 +7598,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256ERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7631,13 +7631,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256ERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7665,13 +7665,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerP256ERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7699,14 +7699,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7736,13 +7736,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC7821, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7779,15 +7779,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7851,14 +7851,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7919,15 +7919,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -7991,16 +7991,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8064,11 +8064,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerP256 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8090,10 +8090,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerP256ERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8124,11 +8124,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerP256ERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8150,12 +8150,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerP256ERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8177,12 +8177,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerP256ERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8204,13 +8204,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8234,12 +8234,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC7821 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8270,14 +8270,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8335,13 +8335,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8396,14 +8396,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8461,15 +8461,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerP256Upgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8529,8 +8529,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSA is Account, EIP712, ERC7739, SignerRSA {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8576,8 +8576,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSAERC7739 is Account, EIP712, ERC7739, SignerRSA {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8596,10 +8596,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSAERC721Holder is Account, EIP712, ERC7739, SignerRSA, ERC721Holder {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8618,10 +8618,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSAERC1155Holder is Account, EIP712, ERC7739, SignerRSA, ERC1155Holder {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8640,11 +8640,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerRSA, ERC721Holder, ERC1155Holder {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8663,10 +8663,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, SignerRSA, ERC7821 {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8693,13 +8693,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerRSA {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8752,11 +8752,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ ␊ contract MyAccount is Account, IERC1271, AccountERC7579, SignerRSA {␊ @@ -8804,13 +8804,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerRSA {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8863,14 +8863,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerRSA {␊ constructor(bytes memory e, bytes memory n)␊ @@ -8923,12 +8923,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSA is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -8956,10 +8956,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerRSAERC1271 is Initializable, Account, IERC1271, SignerRSAUpgradeable, UUPSUpgradeable {␊ @@ -8997,12 +8997,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9030,13 +9030,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9064,13 +9064,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerRSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9098,14 +9098,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9135,13 +9135,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC7821, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9178,15 +9178,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9250,14 +9250,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9318,15 +9318,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9390,16 +9390,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9463,11 +9463,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerRSA is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9489,10 +9489,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerRSAERC1271 is Initializable, Account, IERC1271, SignerRSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9523,11 +9523,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerRSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9549,12 +9549,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerRSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9576,12 +9576,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerRSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9603,13 +9603,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9633,12 +9633,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC7821 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9669,14 +9669,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9734,13 +9734,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerRSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9795,14 +9795,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9860,15 +9860,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ + import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ - import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerRSAUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -9926,12 +9926,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthn is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -9960,9 +9960,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ ␊ @@ -9999,12 +9999,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC7739 is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -10033,13 +10033,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC721Holder is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn, ERC721Holder {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -10068,13 +10068,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC1155Holder is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn, ERC1155Holder {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -10103,14 +10103,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn, ERC721Holder, ERC1155Holder {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -10139,13 +10139,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn, ERC7821 {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -10183,14 +10183,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerP256, SignerWebAuthn {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -10243,11 +10243,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ ␊ @@ -10296,14 +10296,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerP256, SignerWebAuthn {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -10356,15 +10356,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊ import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊ import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerP256, SignerWebAuthn {␊ constructor(bytes32 qx, bytes32 qy)␊ @@ -10417,14 +10417,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthn is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10464,13 +10464,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10519,14 +10519,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10566,15 +10566,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC721Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10614,15 +10614,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10662,16 +10662,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10713,15 +10713,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC7821, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10770,16 +10770,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10844,15 +10844,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10914,16 +10914,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -10988,17 +10988,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11063,13 +11063,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerWebAuthn is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11103,12 +11103,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11151,13 +11151,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11191,14 +11191,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC721Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11232,14 +11232,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11273,15 +11273,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ ␊ contract CustomAccountWithSignerWebAuthnERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC721Holder, ERC1155Holder {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11317,14 +11317,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ + import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ - import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC7821 {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11367,15 +11367,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11434,14 +11434,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ ␊ contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11497,15 +11497,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -11564,16 +11564,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ - import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊ import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊ import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊ + import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ + import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ diff --git a/packages/core/solidity/src/account.test.ts.snap b/packages/core/solidity/src/account.test.ts.snap index c3a0f6d55..f348b23cf 100644 Binary files a/packages/core/solidity/src/account.test.ts.snap and b/packages/core/solidity/src/account.test.ts.snap differ diff --git a/packages/core/solidity/src/common-options.ts b/packages/core/solidity/src/common-options.ts index b001ae5f6..f412f7e10 100644 --- a/packages/core/solidity/src/common-options.ts +++ b/packages/core/solidity/src/common-options.ts @@ -19,6 +19,6 @@ export function withCommonDefaults(opts: CommonOptions): Required return { access: opts.access ?? false, upgradeable: opts.upgradeable ?? false, - info: opts.info ?? {}, + info: { ...defaults.info, ...(opts.info ?? {}) }, }; } diff --git a/packages/core/solidity/src/contract.ts b/packages/core/solidity/src/contract.ts index 3f5ea0ac8..5a7931525 100644 --- a/packages/core/solidity/src/contract.ts +++ b/packages/core/solidity/src/contract.ts @@ -100,9 +100,9 @@ export class ContractBuilder implements Contract { readonly variableOrErrorMap: Map = new Map(); private parentMap: Map = new Map(); + private functionMap: Map = new Map(); private libraryMap: Map = new Map(); - private functionMap: Map = new Map(); - private structMap: Map = new Map(); + private structMap: Map = new Map(); constructor(name: string) { this.name = toIdentifier(name, true); diff --git a/packages/core/solidity/src/custom.test.ts.md b/packages/core/solidity/src/custom.test.ts.md index 2b1cbfabd..99d488ff4 100644 --- a/packages/core/solidity/src/custom.test.ts.md +++ b/packages/core/solidity/src/custom.test.ts.md @@ -78,8 +78,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊ @@ -167,8 +167,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊ diff --git a/packages/core/solidity/src/custom.test.ts.snap b/packages/core/solidity/src/custom.test.ts.snap index 49ad9558e..c6d5ef4b7 100644 Binary files a/packages/core/solidity/src/custom.test.ts.snap and b/packages/core/solidity/src/custom.test.ts.snap differ diff --git a/packages/core/solidity/src/erc1155.test.ts.md b/packages/core/solidity/src/erc1155.test.ts.md index b2a6a9e62..761e35fea 100644 --- a/packages/core/solidity/src/erc1155.test.ts.md +++ b/packages/core/solidity/src/erc1155.test.ts.md @@ -12,8 +12,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ ␊ contract MyToken is ERC1155, Ownable {␊ constructor(address initialOwner)␊ @@ -35,8 +35,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ ␊ contract MyTokec is ERC1155, Ownable {␊ constructor(address initialOwner)␊ @@ -135,9 +135,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {ERC1155Burnable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC1155, Ownable, ERC1155Burnable {␊ constructor(address initialOwner)␊ @@ -159,9 +159,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {ERC1155Pausable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Pausable.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC1155, Ownable, ERC1155Pausable {␊ constructor(address initialOwner)␊ @@ -200,8 +200,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ ␊ contract MyToken is ERC1155, Ownable {␊ constructor(address initialOwner)␊ @@ -327,9 +327,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {ERC1155Supply} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC1155, Ownable, ERC1155Supply {␊ constructor(address initialOwner)␊ diff --git a/packages/core/solidity/src/erc1155.test.ts.snap b/packages/core/solidity/src/erc1155.test.ts.snap index b3d7d8ad0..a5cb3637b 100644 Binary files a/packages/core/solidity/src/erc1155.test.ts.snap and b/packages/core/solidity/src/erc1155.test.ts.snap differ diff --git a/packages/core/solidity/src/erc20.test.ts.md b/packages/core/solidity/src/erc20.test.ts.md index b383936ca..1e2698e86 100644 --- a/packages/core/solidity/src/erc20.test.ts.md +++ b/packages/core/solidity/src/erc20.test.ts.md @@ -61,10 +61,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊ constructor(address initialOwner)␊ @@ -182,11 +182,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊ import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊ constructor(address initialOwner)␊ @@ -322,9 +322,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC20, Ownable, ERC20Permit {␊ constructor(address initialOwner)␊ @@ -376,8 +376,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ ␊ contract MyToken is ERC20, ERC1363, ERC20Permit {␊ @@ -544,8 +544,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊ address public tokenBridge;␊ @@ -573,10 +573,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, Ownable {␊ address public tokenBridge;␊ @@ -605,11 +605,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Burnable, Ownable, ERC20Permit {␊ address public tokenBridge;␊ @@ -644,8 +644,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, AccessControl, ERC20Permit {␊ bytes32 public constant TOKEN_BRIDGE_ROLE = keccak256("TOKEN_BRIDGE_ROLE");␊ @@ -687,8 +687,8 @@ Generated by [AVA](https://avajs.dev). import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ import {AuthorityUtils} from "@openzeppelin/contracts/access/manager/AuthorityUtils.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, AccessManaged, ERC20Permit {␊ error Unauthorized();␊ @@ -715,8 +715,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊ address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊ @@ -743,10 +743,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, Ownable {␊ address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊ @@ -779,8 +779,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, AccessControl {␊ address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊ @@ -825,8 +825,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, AccessManaged {␊ address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊ @@ -858,8 +858,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊ - import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊ + import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20PermitUpgradeable {␊ @@ -908,8 +908,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊ - import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊ + import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20PermitUpgradeable {␊ @@ -968,8 +968,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊ address public tokenBridge;␊ @@ -1001,8 +1001,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ ␊ contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊ address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊ @@ -1037,16 +1037,16 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊ - import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊ import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊ - import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ + import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊ import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊ import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊ import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊ import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, AccessControlUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊ @@ -1145,15 +1145,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊ - import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊ import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊ + import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊ import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊ import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊ import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊ import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ ␊ contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable {␊ bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊ @@ -1233,15 +1233,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊ - import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊ import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊ + import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊ import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊ import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊ import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊ import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊ @@ -1330,15 +1330,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊ - import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊ import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊ + import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊ import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊ import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊ import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊ import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessManagedUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊ diff --git a/packages/core/solidity/src/erc20.test.ts.snap b/packages/core/solidity/src/erc20.test.ts.snap index a99c9f791..bcd9ea77e 100644 Binary files a/packages/core/solidity/src/erc20.test.ts.snap and b/packages/core/solidity/src/erc20.test.ts.snap differ diff --git a/packages/core/solidity/src/erc20.ts b/packages/core/solidity/src/erc20.ts index 173a5c384..48d799e2a 100644 --- a/packages/core/solidity/src/erc20.ts +++ b/packages/core/solidity/src/erc20.ts @@ -173,7 +173,7 @@ export function isValidChainId(str: string): boolean { return chainIdPattern.test(str); } -function scaleByPowerOfTen(base: bigint, exponent: number): bigint { +export function scaleByPowerOfTen(base: bigint, exponent: number): bigint { if (exponent < 0) { return base / BigInt(10) ** BigInt(-exponent); } else { @@ -181,55 +181,74 @@ function scaleByPowerOfTen(base: bigint, exponent: number): bigint { } } +export interface PremintCalculation { + units: string; + exp: string; + decimalPlace: number; +} + +export function calculatePremint(amount: string): PremintCalculation | undefined { + const m = amount.match(premintPattern); + if (!m) { + throw new OptionsError({ + premint: 'Not a valid number', + }); + } + + const integer = m[1]?.replace(/^0+/, '') ?? ''; + const decimals = m[2]?.replace(/0+$/, '') ?? ''; + const exponent = Number(m[3] ?? 0); + + if (Number(integer + decimals) > 0) { + const decimalPlace = decimals.length - exponent; + const zeroes = new Array(Math.max(0, -decimalPlace)).fill('0').join(''); + const units = integer + decimals + zeroes; + const exp = decimalPlace <= 0 ? 'decimals()' : `(decimals() - ${decimalPlace})`; + + return { units, exp, decimalPlace }; + } else { + return undefined; + } +} + function addPremint( c: ContractBuilder, amount: string, premintChainId: string, crossChainBridging: CrossChainBridging, ) { - const m = amount.match(premintPattern); - if (m) { - const integer = m[1]?.replace(/^0+/, '') ?? ''; - const decimals = m[2]?.replace(/0+$/, '') ?? ''; - const exponent = Number(m[3] ?? 0); - - if (Number(integer + decimals) > 0) { - const decimalPlace = decimals.length - exponent; - const zeroes = new Array(Math.max(0, -decimalPlace)).fill('0').join(''); - const units = integer + decimals + zeroes; - const exp = decimalPlace <= 0 ? 'decimals()' : `(decimals() - ${decimalPlace})`; + const premintCalculation = calculatePremint(amount); + if (premintCalculation === undefined) { + return; + } - const validatedBaseUnits = toUint256(units, 'premint'); - checkPotentialPremintOverflow(validatedBaseUnits, decimalPlace); + const { units, exp, decimalPlace } = premintCalculation; - c.addConstructorArgument({ type: 'address', name: 'recipient' }); + const validatedBaseUnits = toUint256(units, 'premint'); + checkPotentialPremintOverflow(validatedBaseUnits, decimalPlace); - const mintLine = `_mint(recipient, ${units} * 10 ** ${exp});`; + c.addConstructorArgument({ type: 'address', name: 'recipient' }); - if (crossChainBridging) { - if (premintChainId === '') { - throw new OptionsError({ - premintChainId: 'Chain ID is required when using Premint with Cross-Chain Bridging', - }); - } + const mintLine = `_mint(recipient, ${units} * 10 ** ${exp});`; - if (!isValidChainId(premintChainId)) { - throw new OptionsError({ - premintChainId: 'Not a valid chain ID', - }); - } + if (crossChainBridging) { + if (premintChainId === '') { + throw new OptionsError({ + premintChainId: 'Chain ID is required when using Premint with Cross-Chain Bridging', + }); + } - c.addConstructorCode(`if (block.chainid == ${premintChainId}) {`); - c.addConstructorCode(` ${mintLine}`); - c.addConstructorCode(`}`); - } else { - c.addConstructorCode(mintLine); - } + if (!isValidChainId(premintChainId)) { + throw new OptionsError({ + premintChainId: 'Not a valid chain ID', + }); } + + c.addConstructorCode(`if (block.chainid == ${premintChainId}) {`); + c.addConstructorCode(` ${mintLine}`); + c.addConstructorCode(`}`); } else { - throw new OptionsError({ - premint: 'Not a valid number', - }); + c.addConstructorCode(mintLine); } } diff --git a/packages/core/solidity/src/erc721.test.ts.md b/packages/core/solidity/src/erc721.test.ts.md index 6d590c069..f00af278b 100644 --- a/packages/core/solidity/src/erc721.test.ts.md +++ b/packages/core/solidity/src/erc721.test.ts.md @@ -139,9 +139,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC721, ERC721URIStorage, Ownable {␊ constructor(address initialOwner)␊ @@ -187,9 +187,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC721, ERC721URIStorage, Ownable {␊ uint256 private _nextTokenId;␊ @@ -293,9 +293,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ import {ERC721Pausable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Pausable.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyToken is ERC721, ERC721Pausable, Ownable {␊ constructor(address initialOwner)␊ @@ -331,8 +331,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ ␊ contract MyToken is ERC721, Ownable {␊ constructor(address initialOwner)␊ @@ -413,8 +413,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ ␊ contract MyToken is ERC721, Ownable {␊ uint256 private _nextTokenId;␊ @@ -440,9 +440,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ ␊ contract MyToken is ERC721, EIP712, ERC721Votes {␊ constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊ @@ -474,9 +474,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ ␊ contract MyToken is ERC721, EIP712, ERC721Votes {␊ constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊ @@ -508,9 +508,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊ import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ ␊ contract MyToken is ERC721, EIP712, ERC721Votes {␊ constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊ @@ -551,11 +551,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊ + import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyNFTToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊ @@ -627,11 +627,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊ + import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ ␊ contract MyNFTToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊ /// @custom:storage-location erc7201:myNftProject.MyNFTToken␊ @@ -696,11 +696,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊ + import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊ /// @custom:storage-location erc7201:MyToken␊ @@ -761,14 +761,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊ import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊ import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊ import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊ + import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow constructor␊ @@ -834,14 +834,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊ import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊ import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊ import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊ + import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊ @@ -915,12 +915,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊ - import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊ import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊ import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊ import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊ + import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ @@ -995,12 +995,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊ - import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊ import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊ import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊ import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊ + import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ @@ -1090,12 +1090,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊ - import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊ import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊ import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊ import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊ + import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ diff --git a/packages/core/solidity/src/erc721.test.ts.snap b/packages/core/solidity/src/erc721.test.ts.snap index 87b359e83..eff0b1b61 100644 Binary files a/packages/core/solidity/src/erc721.test.ts.snap and b/packages/core/solidity/src/erc721.test.ts.snap differ diff --git a/packages/core/solidity/src/governor.test.ts.md b/packages/core/solidity/src/governor.test.ts.md index 8d95bb17e..e8e1532f2 100644 --- a/packages/core/solidity/src/governor.test.ts.md +++ b/packages/core/solidity/src/governor.test.ts.md @@ -13,12 +13,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -103,12 +103,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -189,11 +189,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -281,11 +281,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -373,13 +373,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -462,13 +462,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorStorage} from "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorStorage, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -557,12 +557,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -643,12 +643,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -729,11 +729,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -821,13 +821,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -910,12 +910,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -996,12 +996,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -1086,12 +1086,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -1176,8 +1176,8 @@ Generated by [AVA](https://avajs.dev). import {GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ - import {ICompoundTimelock} from "@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ + import {ICompoundTimelock} from "@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockCompound {␊ constructor(IVotes _token, ICompoundTimelock _timelock)␊ @@ -1258,13 +1258,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -1347,12 +1347,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -1433,13 +1433,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -1522,12 +1522,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊ + import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊ import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊ import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊ import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ - import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊ ␊ contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊ constructor(IVotes _token, TimelockController _timelock)␊ @@ -1608,13 +1608,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";␊ + import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";␊ import {GovernorCountingSimpleUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorCountingSimpleUpgradeable.sol";␊ import {GovernorTimelockControlUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊ - import {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊ import {GovernorVotesQuorumFractionUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";␊ + import {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊ import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyGovernor is Initializable, GovernorUpgradeable, GovernorCountingSimpleUpgradeable, GovernorVotesUpgradeable, GovernorVotesQuorumFractionUpgradeable, GovernorTimelockControlUpgradeable, UUPSUpgradeable {␊ diff --git a/packages/core/solidity/src/governor.test.ts.snap b/packages/core/solidity/src/governor.test.ts.snap index 3bf56f6d2..e9a3ff3b4 100644 Binary files a/packages/core/solidity/src/governor.test.ts.snap and b/packages/core/solidity/src/governor.test.ts.snap differ diff --git a/packages/core/solidity/src/index.ts b/packages/core/solidity/src/index.ts index 11b424ef1..250d5a780 100644 --- a/packages/core/solidity/src/index.ts +++ b/packages/core/solidity/src/index.ts @@ -1,21 +1,37 @@ +// ===== Public API ===== + +export { erc20, erc721, erc1155, stablecoin, realWorldAsset, account, governor, custom } from './api'; +export type { WizardContractAPI, AccessControlAPI } from './api'; + +export type { ERC20Options } from './erc20'; +export type { ERC721Options } from './erc721'; +export type { ERC1155Options } from './erc1155'; +export type { StablecoinOptions } from './stablecoin'; +export type { AccountOptions } from './account'; +export type { GovernorOptions } from './governor'; +export type { CustomOptions } from './custom'; + +// ===== Internal API - Intended for use by other Wizard packages only ===== + export type { GenericOptions, KindedOptions } from './build-generic'; export { buildGeneric } from './build-generic'; export { generateAlternatives } from './generate/alternatives'; -export type { Contract, BaseFunction, Value, ReferencedContract } from './contract'; +export type { Contract, BaseFunction, Value, ReferencedContract, FunctionArgument } from './contract'; export { ContractBuilder } from './contract'; export { printContract } from './print'; export type { Access } from './set-access-control'; +export { accessOptions, setAccessControl, requireAccessControl } from './set-access-control'; +export { addPausable } from './add-pausable'; export type { Upgradeable } from './set-upgradeable'; export type { Info } from './set-info'; export { premintPattern, chainIdPattern } from './erc20'; -export { defaults as infoDefaults, infoOptions, setInfo } from './set-info'; -export { accessOptions, setAccessControl, requireAccessControl } from './set-access-control'; -export { addPausable } from './add-pausable'; +export { defaults as infoDefaults, setInfo, infoOptions } from './set-info'; +export { supportsInterface } from './common-functions'; export type { OptionsErrorMessages } from './error'; export { OptionsError } from './error'; @@ -23,21 +39,17 @@ export { OptionsError } from './error'; export type { Kind } from './kind'; export { sanitizeKind } from './kind'; -export { erc20, erc721, erc1155, stablecoin, realWorldAsset, account, governor, custom } from './api'; -export type { WizardContractAPI, AccessControlAPI } from './api'; - export { compatibleContractsSemver } from './utils/version'; -export { findCover } from './utils/find-cover'; -export { defineFunctions } from './utils/define-functions'; +export { defineFunctions } from './utils/define-functions'; export type { CommonOptions } from './common-options'; export { withCommonDefaults, defaults as commonDefaults } from './common-options'; -export { supportsInterface } from './common-functions'; - -export type { ERC20Options } from './erc20'; -export type { ERC721Options } from './erc721'; -export type { ERC1155Options } from './erc1155'; -export type { StablecoinOptions } from './stablecoin'; -export type { AccountOptions } from './account'; -export type { GovernorOptions } from './governor'; -export type { CustomOptions } from './custom'; +export type { ClockMode } from './set-clock-mode'; +export { clockModeDefault, setClockMode, clockModeOptions } from './set-clock-mode'; +export { toBigInt } from './utils/convert-strings'; +export type { Options } from './options'; +export type { Lines } from './utils/format-lines'; +export { formatLinesWithSpaces, spaceBetween } from './utils/format-lines'; +export { findCover } from './utils/find-cover'; +export type { PremintCalculation } from './erc20'; +export { calculatePremint as calculateERC20Premint, scaleByPowerOfTen } from './erc20'; diff --git a/packages/core/solidity/src/options.ts b/packages/core/solidity/src/options.ts index b6f4f54bd..7653e7001 100644 --- a/packages/core/solidity/src/options.ts +++ b/packages/core/solidity/src/options.ts @@ -29,8 +29,10 @@ export interface Options { transformImport?: (parent: ImportContract) => ImportContract; /** * Add additional libraries to the compatibility banner printed at the top of the contract. + * + * If `alwaysKeepOzPrefix` is true, the library name will always keep the "OpenZeppelin " prefix, even if there are multiple libraries from OpenZeppelin being imported. */ - additionalCompatibleLibraries?: { name: string; path: string; version: string }[]; + additionalCompatibleLibraries?: { name: string; path: string; version: string; alwaysKeepOzPrefix?: boolean }[]; } export interface Helpers extends Required { diff --git a/packages/core/solidity/src/print.ts b/packages/core/solidity/src/print.ts index 3fec7d721..c12ba8e4c 100644 --- a/packages/core/solidity/src/print.ts +++ b/packages/core/solidity/src/print.ts @@ -75,15 +75,20 @@ function printVariableOrErrorDefinitionsWithoutComments( return withoutComments.map(v => v.code); } +type LibraryDescription = { + nameAndVersion: string; + alwaysKeepOzPrefix?: boolean; +}; + function printCompatibleLibraryVersions(contract: Contract, opts?: Options): string { - const libraries: string[] = []; + const libraryDescriptions: LibraryDescription[] = []; if (importsLibrary(contract, '@openzeppelin/contracts')) { - libraries.push(`OpenZeppelin Contracts ${compatibleContractsSemver}`); + libraryDescriptions.push({ nameAndVersion: `OpenZeppelin Contracts ${compatibleContractsSemver}` }); } if (importsLibrary(contract, '@openzeppelin/community-contracts')) { try { const commit = getCommunityContractsGitCommit(); - libraries.push(`Community Contracts commit ${commit}`); + libraryDescriptions.push({ nameAndVersion: `OpenZeppelin Community Contracts commit ${commit}` }); } catch (e) { console.error(e); } @@ -91,14 +96,35 @@ function printCompatibleLibraryVersions(contract: Contract, opts?: Options): str if (opts?.additionalCompatibleLibraries) { for (const library of opts.additionalCompatibleLibraries) { if (importsLibrary(contract, library.path)) { - libraries.push(`${library.name} ${library.version}`); + libraryDescriptions.push({ + nameAndVersion: `${library.name} ${library.version}`, + alwaysKeepOzPrefix: library.alwaysKeepOzPrefix, + }); } } } - if (libraries.length === 0) return ''; - if (libraries.length === 1) return `// Compatible with ${libraries[0]}`; - return `// Compatible with ${libraries.slice(0, -1).join(', ')} and ${libraries.slice(-1)}`; + if (libraryDescriptions.length === 0) { + return ''; + } else if (libraryDescriptions.length === 1) { + return `// Compatible with ${libraryDescriptions[0]!.nameAndVersion}`; + } else { + const OZ_PREFIX_WITH_SPACE = 'OpenZeppelin '; + if (libraryDescriptions[0]!.nameAndVersion.startsWith(OZ_PREFIX_WITH_SPACE)) { + for (let i = 1; i < libraryDescriptions.length; i++) { + if ( + libraryDescriptions[i]!.nameAndVersion.startsWith(OZ_PREFIX_WITH_SPACE) && + !libraryDescriptions[i]!.alwaysKeepOzPrefix + ) { + libraryDescriptions[i]!.nameAndVersion = libraryDescriptions[i]!.nameAndVersion.slice( + OZ_PREFIX_WITH_SPACE.length, + ); + } + } + } + const librariesToPrint = libraryDescriptions.map(l => l.nameAndVersion); + return `// Compatible with ${librariesToPrint.slice(0, -1).join(', ')} and ${librariesToPrint.slice(-1)}`; + } } function printInheritance(contract: Contract, { transformName }: Helpers): [] | [string] { @@ -334,30 +360,25 @@ function printNatspecTags(tags: NatspecTag[]): string[] { } function printImports(imports: ImportContract[], helpers: Helpers): string[] { - // Sort imports by name - imports.sort((a, b) => { - if (a.name < b.name) return -1; - if (a.name > b.name) return 1; - return 0; - }); - - const lines: string[] = []; - imports.map(p => { - const importContract = helpers.transformImport(p); - lines.push(`import {${importContract.name}} from "${importContract.path}";`); - }); + const itemByPath = new Map>(); - return lines; + for (const p of imports) { + const { name, path } = helpers.transformImport(p); + const _ = itemByPath.get(path)?.add(name) ?? itemByPath.set(path, new Set([name])); + } + + return Array.from(itemByPath.keys()) + .sort() + .map(path => `import {${Array.from(itemByPath.get(path)!).sort().join(', ')}} from "${path}";`); } function printLibraries(contract: Contract, { transformName }: Helpers): string[] { if (!contract.libraries || contract.libraries.length === 0) return []; return contract.libraries - .sort((a, b) => a.library.name.localeCompare(b.library.name)) - .flatMap(lib => - [...lib.usingFor] - .sort((a, b) => a.localeCompare(b)) - .map(type => `using ${transformName(lib.library)} for ${type};`), - ); + .sort((a, b) => a.library.name.localeCompare(b.library.name)) // Sort by import path + .map(lib => { + const sortedTypes = Array.from(lib.usingFor).sort((a, b) => a.localeCompare(b)); // Sort types + return `using ${transformName(lib.library)} for ${sortedTypes.join(', ')};`; + }); } diff --git a/packages/core/solidity/src/stablecoin.test.ts.md b/packages/core/solidity/src/stablecoin.test.ts.md index 638d42985..567403244 100644 --- a/packages/core/solidity/src/stablecoin.test.ts.md +++ b/packages/core/solidity/src/stablecoin.test.ts.md @@ -45,10 +45,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyStablecoin is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊ constructor(address initialOwner)␊ @@ -166,11 +166,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊ import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyStablecoin is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊ constructor(address initialOwner)␊ @@ -243,9 +243,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ ␊ contract MyStablecoin is ERC20, Ownable, ERC20Permit {␊ constructor(address initialOwner)␊ @@ -322,8 +322,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ ␊ contract MyStablecoin is ERC20, ERC1363, ERC20Permit {␊ @@ -355,10 +355,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and Community Contracts commit b0ddd27␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {ERC20Freezable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Freezable.sol";␊ - import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ ␊ contract MyStablecoin is ERC20, ERC20Permit, ERC20Freezable, Ownable {␊ constructor(address initialOwner)␊ @@ -390,10 +390,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and Community Contracts commit b0ddd27␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ import {ERC20Restricted} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ ␊ contract MyStablecoin is ERC20, ERC20Permit, ERC20Restricted, Ownable {␊ constructor(address initialOwner)␊ @@ -433,10 +433,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and Community Contracts commit b0ddd27␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ import {ERC20Restricted} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ ␊ contract MyStablecoin is ERC20, ERC20Permit, ERC20Restricted, Ownable {␊ constructor(address initialOwner)␊ @@ -606,17 +606,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and Community Contracts commit b0ddd27␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC20Freezable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Freezable.sol";␊ + import {ERC20Restricted} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.sol";␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ + import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊ import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊ import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊ - import {ERC20Freezable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Freezable.sol";␊ import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊ import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊ - import {ERC20Restricted} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.sol";␊ import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊ + import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊ import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊ ␊ contract MyStablecoin is ERC20, ERC20Bridgeable, AccessControl, ERC20Burnable, ERC20Pausable, ERC1363, ERC20Permit, ERC20Votes, ERC20FlashMint, ERC20Freezable, ERC20Restricted {␊ diff --git a/packages/core/solidity/src/stablecoin.test.ts.snap b/packages/core/solidity/src/stablecoin.test.ts.snap index f790a3156..00f762c43 100644 Binary files a/packages/core/solidity/src/stablecoin.test.ts.snap and b/packages/core/solidity/src/stablecoin.test.ts.snap differ diff --git a/packages/core/solidity/src/utils/convert-strings.test.ts b/packages/core/solidity/src/utils/convert-strings.test.ts index 241589949..7c8cf9f9f 100644 --- a/packages/core/solidity/src/utils/convert-strings.test.ts +++ b/packages/core/solidity/src/utils/convert-strings.test.ts @@ -1,8 +1,31 @@ import test from 'ava'; -import { toUint256, UINT256_MAX } from './convert-strings'; +import { toUint256, toBigInt, validateUint256, UINT256_MAX } from './convert-strings'; import { OptionsError } from '../error'; +test('toBigInt', t => { + t.is(toBigInt('123', 'foo'), BigInt(123)); +}); + +test('toBigInt - not number', t => { + const error = t.throws(() => toBigInt('abc', 'foo'), { instanceOf: OptionsError }); + t.is(error.messages.foo, 'Not a valid number'); +}); + +test('toBigInt - negative', t => { + const error = t.throws(() => toBigInt('-1', 'foo'), { instanceOf: OptionsError }); + t.is(error.messages.foo, 'Not a valid number'); +}); + +test('validateUint256', t => { + t.is(validateUint256(BigInt(123), 'foo'), BigInt(123)); +}); + +test('validateUint256 - too large', t => { + const error = t.throws(() => validateUint256(UINT256_MAX + BigInt(1), 'foo'), { instanceOf: OptionsError }); + t.is(error.messages.foo, 'Value is greater than uint256 max value'); +}); + test('toUint256', t => { t.is(toUint256('123', 'foo'), BigInt(123)); }); diff --git a/packages/core/solidity/src/utils/convert-strings.ts b/packages/core/solidity/src/utils/convert-strings.ts index 2618d1c21..fdc3aea53 100644 --- a/packages/core/solidity/src/utils/convert-strings.ts +++ b/packages/core/solidity/src/utils/convert-strings.ts @@ -3,21 +3,32 @@ import { OptionsError } from '../error'; export const UINT256_MAX = BigInt(2) ** BigInt(256) - BigInt(1); /** - * Checks that a string is a valid `uint256` value and converts it to bigint. + * Checks that a string is a valid number, and convert to bigint. * * @param value The string value to check and convert. * @param field The field name to use in the error message if the value is invalid. - * @throws OptionsError if the value is not a valid number or is greater than the maximum value for `uint256`. + * @throws OptionsError if the value is not a valid number. * @returns The validated value as a bigint. */ -export function toUint256(value: string, field: string): bigint { +export function toBigInt(value: string, field: string): bigint { const isValidNumber = /^\d+$/.test(value); if (!isValidNumber) { throw new OptionsError({ [field]: 'Not a valid number', }); } - const numValue = BigInt(value); + return BigInt(value); +} + +/** + * Checks that a bigint value fits within `uint256`. + * + * @param numValue The value to check. + * @param field The field name to use in the error if the value is invalid. + * @throws OptionsError if the value is greater than the maximum value for `uint256`. + * @returns The value as a bigint. + */ +export function validateUint256(numValue: bigint, field: string): bigint { if (numValue > UINT256_MAX) { throw new OptionsError({ [field]: 'Value is greater than uint256 max value', @@ -25,3 +36,16 @@ export function toUint256(value: string, field: string): bigint { } return numValue; } + +/** + * Checks that a string is a valid number, and fits within `uint256`. + * Convenience function that calls `toBigInt` and `validateUint256`. + * + * @param value The value to check. + * @param field The field name to use in the error if the value is invalid. + * @throws OptionsError if the value is not a valid number or is greater than the maximum value for `uint256`. + * @returns The value as a bigint. + */ +export function toUint256(value: string, field: string): bigint { + return validateUint256(toBigInt(value, field), field); +} diff --git a/packages/core/solidity/src/zip-foundry.test.ts.md b/packages/core/solidity/src/zip-foundry.test.ts.md index 9406e6291..991ca6479 100644 --- a/packages/core/solidity/src/zip-foundry.test.ts.md +++ b/packages/core/solidity/src/zip-foundry.test.ts.md @@ -333,16 +333,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊ - import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊ import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊ import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊ import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, OwnableUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊ @@ -774,9 +774,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊ @@ -939,8 +939,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ ␊ contract MyToken is ERC1155, Ownable {␊ constructor(address initialOwner)␊ @@ -1105,9 +1105,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow constructor␊ @@ -1269,11 +1269,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder, ERC1155Holder {␊ constructor(address signer) EIP712("My Account", "1") SignerECDSA(signer) {}␊ @@ -1433,14 +1433,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ diff --git a/packages/core/solidity/src/zip-foundry.test.ts.snap b/packages/core/solidity/src/zip-foundry.test.ts.snap index be784713f..cdcc63d83 100644 Binary files a/packages/core/solidity/src/zip-foundry.test.ts.snap and b/packages/core/solidity/src/zip-foundry.test.ts.snap differ diff --git a/packages/core/solidity/src/zip-hardhat.test.ts b/packages/core/solidity/src/zip-hardhat.test.ts index 9caab3734..b46284733 100644 --- a/packages/core/solidity/src/zip-hardhat.test.ts +++ b/packages/core/solidity/src/zip-hardhat.test.ts @@ -189,7 +189,7 @@ function extractAndRun(makeDeployCommand: (c: Contract) => string | null) { } } - let command = `cd "${tempFolder}" && npm install && npm test`; + let command = `cd "${tempFolder}" && npm ci && npm test`; if (c.constructorArgs === undefined) { // only test deploying the contract if there are no constructor args needed command += ` && ${makeDeployCommand(c)}`; diff --git a/packages/core/solidity/src/zip-hardhat.test.ts.md b/packages/core/solidity/src/zip-hardhat.test.ts.md index 013cb77e2..fb631f5f2 100644 --- a/packages/core/solidity/src/zip-hardhat.test.ts.md +++ b/packages/core/solidity/src/zip-hardhat.test.ts.md @@ -105,7 +105,7 @@ Generated by [AVA](https://avajs.dev). ␊ export default buildModule("MyTokenModule", (m) => {␊ ␊ - // TODO: Set addresses for the contract arguments below␊ + // TODO: Set values for the constructor arguments below␊ const myToken = m.contract("MyToken", [recipient, defaultAdmin, pauser, minter]);␊ ␊ return { myToken };␊ @@ -141,16 +141,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊ - import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊ import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊ import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊ import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊ import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊ import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, OwnableUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊ @@ -277,7 +277,7 @@ Generated by [AVA](https://avajs.dev). async function main() {␊ const ContractFactory = await ethers.getContractFactory("MyToken");␊ ␊ - // TODO: Set addresses for the contract arguments below␊ + // TODO: Set values for the constructor arguments below␊ const instance = await upgrades.deployProxy(ContractFactory, [tokenBridge_, recipient, initialOwner]);␊ await instance.waitForDeployment();␊ ␊ @@ -320,9 +320,9 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊ import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊ import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊ @@ -384,7 +384,7 @@ Generated by [AVA](https://avajs.dev). async function main() {␊ const ContractFactory = await ethers.getContractFactory("MyToken");␊ ␊ - // TODO: Set addresses for the contract arguments below␊ + // TODO: Set values for the constructor arguments below␊ const instance = await upgrades.deployProxy(ContractFactory, [initialOwner]);␊ await instance.waitForDeployment();␊ ␊ @@ -425,8 +425,8 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ ␊ contract MyToken is ERC1155, Ownable {␊ constructor(address initialOwner)␊ @@ -477,7 +477,7 @@ Generated by [AVA](https://avajs.dev). ␊ export default buildModule("MyTokenModule", (m) => {␊ ␊ - // TODO: Set addresses for the contract arguments below␊ + // TODO: Set values for the constructor arguments below␊ const myToken = m.contract("MyToken", [initialOwner]);␊ ␊ return { myToken };␊ @@ -511,11 +511,11 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ - import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊ + import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ ␊ contract MyAccount is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder, ERC1155Holder {␊ constructor(address signer) EIP712("My Account", "1") SignerECDSA(signer) {}␊ @@ -559,7 +559,7 @@ Generated by [AVA](https://avajs.dev). ␊ export default buildModule("MyAccountModule", (m) => {␊ ␊ - // TODO: Set addresses for the contract arguments below␊ + // TODO: Set values for the constructor arguments below␊ const myAccount = m.contract("MyAccount", [signer]);␊ ␊ return { myAccount };␊ @@ -590,14 +590,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0␊ pragma solidity ^0.8.27;␊ ␊ + import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ import {Account} from "@openzeppelin/contracts/account/Account.sol";␊ - import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ + import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ + import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊ + import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊ import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊ - import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊ - import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊ - import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊ ␊ contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊ /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊ @@ -657,8 +657,8 @@ Generated by [AVA](https://avajs.dev). async function main() {␊ const ContractFactory = await ethers.getContractFactory("MyAccount");␊ ␊ - // TODO: Set addresses for the contract arguments below␊ - const instance = await upgrades.deployProxy(ContractFactory, [signer], { unsafeAllow: 'constructor' });␊ + // TODO: Set values for the constructor arguments below␊ + const instance = await upgrades.deployProxy(ContractFactory, [signer], { unsafeAllow: ['constructor'] });␊ await instance.waitForDeployment();␊ ␊ console.log(\`Proxy deployed to ${await instance.getAddress()}\`);␊ @@ -680,7 +680,7 @@ Generated by [AVA](https://avajs.dev). ␊ const signer = (await ethers.getSigners())[0].address;␊ ␊ - const instance = await upgrades.deployProxy(ContractFactory, [signer], { unsafeAllow: 'constructor' });␊ + const instance = await upgrades.deployProxy(ContractFactory, [signer], { unsafeAllow: ['constructor'] });␊ await instance.waitForDeployment();␊ });␊ });␊ diff --git a/packages/core/solidity/src/zip-hardhat.test.ts.snap b/packages/core/solidity/src/zip-hardhat.test.ts.snap index 40e55eefa..65f3fc395 100644 Binary files a/packages/core/solidity/src/zip-hardhat.test.ts.snap and b/packages/core/solidity/src/zip-hardhat.test.ts.snap differ diff --git a/packages/core/solidity/src/zip-hardhat.ts b/packages/core/solidity/src/zip-hardhat.ts index 2a122c8b1..a467710e9 100644 --- a/packages/core/solidity/src/zip-hardhat.ts +++ b/packages/core/solidity/src/zip-hardhat.ts @@ -1,72 +1,31 @@ import JSZip from 'jszip'; import type { GenericOptions } from './build-generic'; -import type { Contract } from './contract'; +import type { Contract, FunctionArgument } from './contract'; import { printContract } from './print'; import SOLIDITY_VERSION from './solidity-version.json'; import type { Lines } from './utils/format-lines'; import { formatLinesWithSpaces, spaceBetween } from './utils/format-lines'; -const hardhatConfig = (upgradeable: boolean) => `\ -import { HardhatUserConfig } from "hardhat/config"; -import "@nomicfoundation/hardhat-toolbox"; -${upgradeable ? `import "@openzeppelin/hardhat-upgrades";` : ''} - -const config: HardhatUserConfig = { - solidity: { - version: "${SOLIDITY_VERSION}", - settings: { - evmVersion: 'cancun', - optimizer: { - enabled: true, - }, - }, - }, -}; - -export default config; -`; +class TestGenerator { + constructor(private parent: HardhatZipGenerator) {} -const tsConfig = `\ -{ - "compilerOptions": { - "target": "es2020", - "module": "commonjs", - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "strict": true, - "skipLibCheck": true, - "resolveJsonModule": true + getContent(c: Contract, opts?: GenericOptions): string { + return formatLinesWithSpaces(2, ...spaceBetween(this.getImports(c), this.getTestCase(c, opts))); } -} -`; - -const gitIgnore = `\ -node_modules -.env -coverage -coverage.json -typechain -typechain-types -# Hardhat files -cache -artifacts -`; - -const test = (c: Contract, opts?: GenericOptions) => { - return formatLinesWithSpaces(2, ...spaceBetween(getImports(c), getTestCase(c))); - - function getTestCase(c: Contract) { - const args = getAddressArgs(c); + private getTestCase(c: Contract, opts?: GenericOptions): Lines[] { return [ `describe("${c.name}", function () {`, [ 'it("Test contract", async function () {', spaceBetween( [`const ContractFactory = await ethers.getContractFactory("${c.name}");`], - getAddressVariables(args), - [`const instance = await ${getDeploymentCall(c, args)};`, 'await instance.waitForDeployment();'], - getExpects(), + this.declareVariables(c.constructorArgs), + this.getDeployLines( + c, + c.constructorArgs.map(a => a.name), + ), + this.getExpects(opts), ), '});', ], @@ -74,25 +33,25 @@ const test = (c: Contract, opts?: GenericOptions) => { ]; } - function getImports(c: Contract) { - return ['import { expect } from "chai";', `import { ${getHardhatPlugins(c).join(', ')} } from "hardhat";`]; + private getImports(c: Contract): Lines[] { + return [ + 'import { expect } from "chai";', + `import { ${this.parent.getHardhatPlugins(c).join(', ')} } from "hardhat";`, + ]; } - function getExpects(): Lines[] { + private getExpects(opts?: GenericOptions): Lines[] { if (opts !== undefined) { switch (opts.kind) { case 'ERC20': case 'ERC721': return [`expect(await instance.name()).to.equal("${opts.name}");`]; - case 'ERC1155': return [`expect(await instance.uri(0)).to.equal("${opts.uri}");`]; - case 'Account': case 'Governor': case 'Custom': break; - default: throw new Error('Unknown ERC'); } @@ -100,46 +59,124 @@ const test = (c: Contract, opts?: GenericOptions) => { return []; } - function getAddressVariables(args: string[]): Lines[] { + private declareVariables(args: FunctionArgument[]): Lines[] { const vars = []; for (let i = 0; i < args.length; i++) { - vars.push(`const ${args[i]} = (await ethers.getSigners())[${i}].address;`); + if (args[i]!.type === 'address') { + vars.push(`const ${args[i]!.name} = (await ethers.getSigners())[${i}].address;`); + } else { + vars.push(`// TODO: Set the following constructor argument`); + vars.push(`// const ${args[i]!.name} = ...;`); + } } return vars; } -}; -function getAddressArgs(c: Contract): string[] { - const args = []; - for (const constructorArg of c.constructorArgs) { - if (constructorArg.type === 'address') { - args.push(constructorArg.name); + private getDeployLines(c: Contract, argNames: string[]): Lines[] { + if (c.constructorArgs.some(a => a.type !== 'address')) { + return [ + `// TODO: Uncomment the below when the missing constructor arguments are set above`, + `// const instance = await ${this.parent.getDeploymentCall(c, argNames)};`, + `// await instance.waitForDeployment();`, + ]; + } else { + return [ + `const instance = await ${this.parent.getDeploymentCall(c, argNames)};`, + 'await instance.waitForDeployment();', + ]; } } - return args; } -function getDeploymentCall(c: Contract, args: string[]): string { - // TODO: remove that selector when the upgrades plugin supports @custom:oz-upgrades-unsafe-allow-reachable - const unsafeAllowConstructor = c.parents.find(p => ['EIP712'].includes(p.contract.name)) !== undefined; +export class HardhatZipGenerator { + protected getAdditionalHardhatImports(): string[] { + return []; + } + + protected getHardhatConfig(upgradeable: boolean): string { + const additionalImports = this.getAdditionalHardhatImports(); + const importsSection = + additionalImports.length > 0 ? additionalImports.map(imp => `import "${imp}";`).join('\n') + '\n' : ''; - return !c.upgradeable - ? `ContractFactory.deploy(${args.join(', ')})` - : unsafeAllowConstructor - ? `upgrades.deployProxy(ContractFactory, [${args.join(', ')}], { unsafeAllow: 'constructor' })` - : `upgrades.deployProxy(ContractFactory, [${args.join(', ')}])`; + return `\ +import { HardhatUserConfig } from "hardhat/config"; +import "@nomicfoundation/hardhat-toolbox"; +${importsSection}${upgradeable ? `import "@openzeppelin/hardhat-upgrades";` : ''} + +const config: HardhatUserConfig = { + solidity: { + version: "${SOLIDITY_VERSION}", + settings: { + evmVersion: 'cancun', + optimizer: { + enabled: true, + }, + }, + }, +}; + +export default config; +`; + } + + protected getTsConfig(): string { + return `\ +{ + "compilerOptions": { + "target": "es2020", + "module": "commonjs", + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "skipLibCheck": true, + "resolveJsonModule": true + } } +`; + } -const script = (c: Contract) => { - const args = getAddressArgs(c); - return `\ -import { ${getHardhatPlugins(c).join(', ')} } from "hardhat"; + protected getGitIgnore(): string { + return `\ +node_modules +.env +coverage +coverage.json +typechain +typechain-types + +# Hardhat files +cache +artifacts +`; + } + + protected getTest(c: Contract, opts?: GenericOptions): string { + return new TestGenerator(this).getContent(c, opts); + } + + public getDeploymentCall(c: Contract, args: string[]): string { + // TODO: remove that selector when the upgrades plugin supports @custom:oz-upgrades-unsafe-allow-reachable + const unsafeAllowConstructor = c.parents.find(p => ['EIP712'].includes(p.contract.name)) !== undefined; + + return !c.upgradeable + ? `ContractFactory.deploy(${args.join(', ')})` + : unsafeAllowConstructor + ? `upgrades.deployProxy(ContractFactory, [${args.join(', ')}], { unsafeAllow: ['constructor'] })` + : `upgrades.deployProxy(ContractFactory, [${args.join(', ')}])`; + } + + protected getScript(c: Contract): string { + return `\ +import { ${this.getHardhatPlugins(c).join(', ')} } from "hardhat"; async function main() { const ContractFactory = await ethers.getContractFactory("${c.name}"); - ${args.length > 0 ? '// TODO: Set addresses for the contract arguments below' : ''} - const instance = await ${getDeploymentCall(c, args)}; + ${c.constructorArgs.length > 0 ? '// TODO: Set values for the constructor arguments below' : ''} + const instance = await ${this.getDeploymentCall( + c, + c.constructorArgs.map(a => a.name), + )}; await instance.waitForDeployment(); console.log(\`${c.upgradeable ? 'Proxy' : 'Contract'} deployed to \${await instance.getAddress()}\`); @@ -152,27 +189,28 @@ main().catch((error) => { process.exitCode = 1; }); `; -}; - -const lowerFirstCharacter = (str: string) => str.charAt(0).toLowerCase() + str.slice(1); + } -const ignitionModule = (c: Contract) => { - const deployArguments = getAddressArgs(c); - const contractVariableName = lowerFirstCharacter(c.name); + private lowerFirstCharacter(str: string): string { + return str.charAt(0).toLowerCase() + str.slice(1); + } - return `import { buildModule } from "@nomicfoundation/hardhat-ignition/modules"; + protected getIgnitionModule(c: Contract): string { + const contractVariableName = this.lowerFirstCharacter(c.name); + return `import { buildModule } from "@nomicfoundation/hardhat-ignition/modules"; export default buildModule("${c.name}Module", (m) => { - ${deployArguments.length > 0 ? '// TODO: Set addresses for the contract arguments below' : ''} - const ${contractVariableName} = m.contract("${c.name}", [${deployArguments.join(', ')}]); + ${c.constructorArgs.length > 0 ? '// TODO: Set values for the constructor arguments below' : ''} + const ${contractVariableName} = m.contract("${c.name}", [${c.constructorArgs.map(a => a.name).join(', ')}]); return { ${contractVariableName} }; }); `; -}; + } -const readme = (c: Contract) => `\ + protected getReadme(c: Contract): string { + return `\ # Sample Hardhat Project This project demonstrates a basic Hardhat use case. It comes with a contract generated by [OpenZeppelin Wizard](https://wizard.openzeppelin.com/), a test for that contract, ${c.upgradeable ? 'and a script that deploys that contract' : 'and a Hardhat Ignition module that deploys that contract'}. @@ -197,43 +235,62 @@ You can target any network from your Hardhat config using: ${c.upgradeable ? 'npx hardhat run --network scripts/deploy.ts' : `npx hardhat ignition deploy ignition/modules/${c.name}.ts --network `} \`\`\` `; + } -function getHardhatPlugins(c: Contract) { - const plugins = ['ethers']; - if (c.upgradeable) { - plugins.push('upgrades'); + public getHardhatPlugins(c: Contract): string[] { + const plugins = ['ethers']; + if (c.upgradeable) { + plugins.push('upgrades'); + } + return plugins; + } + + protected async getPackageJson(c: Contract): Promise { + const { default: packageJson } = c.upgradeable + ? await import('./environments/hardhat/upgradeable/package.json') + : await import('./environments/hardhat/package.json'); + packageJson.license = c.license; + return packageJson; + } + + protected async getPackageLock(c: Contract): Promise { + const { default: packageLock } = c.upgradeable + ? await import('./environments/hardhat/upgradeable/package-lock.json') + : await import('./environments/hardhat/package-lock.json'); + packageLock.packages[''].license = c.license; + return packageLock; } - return plugins; -} -export async function zipHardhat(c: Contract, opts?: GenericOptions) { - const zip = new JSZip(); + protected getPrintContract(c: Contract): string { + return printContract(c); + } - const { default: packageJson } = c.upgradeable - ? await import('./environments/hardhat/upgradeable/package.json') - : await import('./environments/hardhat/package.json'); - packageJson.license = c.license; + async zipHardhat(c: Contract, opts?: GenericOptions): Promise { + const zip = new JSZip(); - const { default: packageLock } = c.upgradeable - ? await import('./environments/hardhat/upgradeable/package-lock.json') - : await import('./environments/hardhat/package-lock.json'); - packageLock.packages[''].license = c.license; + const packageJson = await this.getPackageJson(c); + const packageLock = await this.getPackageLock(c); - zip.file(`contracts/${c.name}.sol`, printContract(c)); - zip.file('test/test.ts', test(c, opts)); + zip.file(`contracts/${c.name}.sol`, this.getPrintContract(c)); + zip.file('test/test.ts', this.getTest(c, opts)); - if (c.upgradeable) { - zip.file('scripts/deploy.ts', script(c)); - } else { - zip.file(`ignition/modules/${c.name}.ts`, ignitionModule(c)); - } + if (c.upgradeable) { + zip.file('scripts/deploy.ts', this.getScript(c)); + } else { + zip.file(`ignition/modules/${c.name}.ts`, this.getIgnitionModule(c)); + } - zip.file('.gitignore', gitIgnore); - zip.file('hardhat.config.ts', hardhatConfig(c.upgradeable)); - zip.file('package.json', JSON.stringify(packageJson, null, 2)); - zip.file(`package-lock.json`, JSON.stringify(packageLock, null, 2)); - zip.file('README.md', readme(c)); - zip.file('tsconfig.json', tsConfig); + zip.file('.gitignore', this.getGitIgnore()); + zip.file('hardhat.config.ts', this.getHardhatConfig(c.upgradeable)); + zip.file('package.json', JSON.stringify(packageJson, null, 2)); + zip.file(`package-lock.json`, JSON.stringify(packageLock, null, 2)); + zip.file('README.md', this.getReadme(c)); + zip.file('tsconfig.json', this.getTsConfig()); + + return zip; + } +} - return zip; +export async function zipHardhat(c: Contract, opts?: GenericOptions): Promise { + return new HardhatZipGenerator().zipHardhat(c, opts); } diff --git a/packages/core/uniswap-hooks/src/hooks.test.ts.md b/packages/core/uniswap-hooks/src/hooks.test.ts.md index 7a19165f6..482738dd5 100644 --- a/packages/core/uniswap-hooks/src/hooks.test.ts.md +++ b/packages/core/uniswap-hooks/src/hooks.test.ts.md @@ -13,8 +13,8 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ ␊ contract MyHook is BaseHook {␊ constructor(IPoolManager _poolManager) BaseHook(_poolManager) {}␊ @@ -53,14 +53,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is BaseHook {␊ constructor(IPoolManager _poolManager) BaseHook(_poolManager) {}␊ @@ -139,13 +138,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is BaseHook {␊ constructor(IPoolManager _poolManager) BaseHook(_poolManager) {}␊ @@ -224,14 +222,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is BaseHook {␊ constructor(IPoolManager _poolManager) BaseHook(_poolManager) {}␊ @@ -351,10 +348,10 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ ␊ contract MyHook is BaseHook {␊ using CurrencySettler for Currency;␊ @@ -395,10 +392,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ ␊ contract MyHook is BaseHook {␊ using SafeCast for *;␊ @@ -439,11 +436,11 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ ␊ contract MyHook is BaseHook {␊ using SlotDerivation for bytes32;␊ @@ -485,10 +482,10 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ ␊ contract MyHook is BaseHook, Ownable {␊ constructor(IPoolManager _poolManager, address initialOwner)␊ @@ -532,8 +529,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ ␊ contract MyHook is BaseHook, AccessControl {␊ constructor(IPoolManager _poolManager, address defaultAdmin)␊ @@ -578,8 +575,8 @@ Generated by [AVA](https://avajs.dev). ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ ␊ contract MyHook is BaseHook, AccessManaged {␊ constructor(IPoolManager _poolManager, address initialAuthority)␊ @@ -621,15 +618,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is BaseHook, Pausable, Ownable {␊ constructor(IPoolManager _poolManager, address initialOwner)␊ @@ -715,14 +711,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is BaseHook, ERC20 {␊ constructor(IPoolManager _poolManager)␊ @@ -796,14 +791,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is BaseHook, ERC1155 {␊ constructor(IPoolManager _poolManager)␊ @@ -877,14 +871,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is BaseHook, ERC6909 {␊ constructor(IPoolManager _poolManager) BaseHook(_poolManager) {}␊ @@ -957,10 +950,10 @@ Generated by [AVA](https://avajs.dev). ␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1025,13 +1018,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1104,14 +1097,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1192,14 +1184,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1314,12 +1305,12 @@ Generated by [AVA](https://avajs.dev). ␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1386,13 +1377,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1459,14 +1450,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ + import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1534,13 +1525,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1611,10 +1602,10 @@ Generated by [AVA](https://avajs.dev). import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1686,10 +1677,10 @@ Generated by [AVA](https://avajs.dev). import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1757,16 +1748,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1854,13 +1844,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -1928,13 +1918,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -2002,13 +1992,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ import {BaseAsyncSwap} from "@openzeppelin/uniswap-hooks/base/BaseAsyncSwap.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Implement how asynchronous swaps are executed␊ // i.e. queuing swaps to be executed together in batches, reordering, etc␊ @@ -2073,13 +2063,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -2171,16 +2161,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the accounting logic␊ // i.e. liquidity mining, rewarding well-behaved LPs, etc␊ @@ -2278,15 +2267,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the accounting logic␊ // i.e. liquidity mining, rewarding well-behaved LPs, etc␊ @@ -2392,16 +2380,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the accounting logic␊ // i.e. liquidity mining, rewarding well-behaved LPs, etc␊ @@ -2531,15 +2518,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -2633,15 +2620,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the accounting logic␊ @@ -2734,17 +2721,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ + import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ ␊ // TODO: Override the required functions to customize the accounting logic␊ // i.e. liquidity mining, rewarding well-behaved LPs, etc␊ @@ -2837,14 +2824,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -2938,13 +2925,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -3039,14 +3026,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the accounting logic␊ @@ -3138,15 +3125,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -3268,13 +3255,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -3366,13 +3353,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -3464,13 +3451,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ import {BaseCustomAccounting} from "@openzeppelin/uniswap-hooks/base/BaseCustomAccounting.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -3559,12 +3546,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -3664,15 +3651,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the pricing curve␊ // i.e. specialized pricing curves, etc␊ @@ -3778,15 +3764,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the pricing curve␊ // i.e. specialized pricing curves, etc␊ @@ -3908,15 +3893,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the pricing curve␊ // i.e. specialized pricing curves, etc␊ @@ -4054,14 +4038,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -4163,14 +4147,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the pricing curve␊ @@ -4271,16 +4255,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ + import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ ␊ // TODO: Override the required functions to customize the pricing curve␊ // i.e. specialized pricing curves, etc␊ @@ -4381,13 +4365,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -4489,12 +4473,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -4597,12 +4581,12 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -4703,15 +4687,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -4849,12 +4833,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -4954,12 +4938,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -5059,12 +5043,12 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ import {BaseCustomCurve} from "@openzeppelin/uniswap-hooks/base/BaseCustomCurve.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ @@ -5161,16 +5145,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -5263,17 +5246,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -5366,16 +5348,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -5460,17 +5441,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -5595,18 +5575,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -5701,17 +5680,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -5806,18 +5784,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -5913,16 +5890,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -6016,15 +5992,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -6122,15 +6097,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -6223,17 +6197,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -6338,16 +6311,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -6440,16 +6412,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -6542,16 +6513,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the LP fee for the entire pool␊ // i.e. dynamic fees depending on current market conditions, etc␊ @@ -6643,14 +6613,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -6734,15 +6703,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -6818,15 +6786,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -6918,15 +6885,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7042,16 +7008,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7137,15 +7102,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7231,16 +7195,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ + import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7327,15 +7290,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7421,14 +7383,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7515,14 +7476,13 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7607,17 +7567,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7722,14 +7681,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7813,14 +7771,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7904,14 +7861,13 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOverrideFee} from "@openzeppelin/uniswap-hooks/fee/BaseOverrideFee.sol";␊ - import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getFee\` to customize the swap fee for each swap␊ // i.e. dynamic fees depending on current market conditions, swap size, swap direction, etc␊ @@ -7992,15 +7948,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8099,15 +8054,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8198,15 +8152,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8297,15 +8250,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8428,17 +8380,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8539,16 +8490,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8649,17 +8599,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8761,16 +8710,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8871,15 +8819,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -8981,15 +8928,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -9089,18 +9035,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -9220,15 +9165,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -9327,15 +9271,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -9434,15 +9377,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {BaseDynamicAfterFee} from "@openzeppelin/uniswap-hooks/fee/BaseDynamicAfterFee.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getTargetUnspecified\` to customize the swap outcome target␊ // i.e. capture any positive difference of the swap outcome that surpasses the target␊ @@ -9538,17 +9480,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -9653,17 +9594,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -9760,16 +9700,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -9858,17 +9797,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -9997,18 +9935,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -10115,18 +10052,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -10233,19 +10169,18 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ + import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -10353,18 +10288,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -10471,17 +10405,16 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -10589,17 +10522,16 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -10705,19 +10637,18 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -10839,17 +10770,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -10954,17 +10884,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -11069,17 +10998,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseHookFee} from "@openzeppelin/uniswap-hooks/fee/BaseHookFee.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_getHookFee\` to customize the hook fee collection for the entire pool␊ // i.e. dynamic hook-owned fees depending on current market conditions, etc␊ @@ -11181,15 +11109,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -11280,15 +11207,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -11371,15 +11297,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -11462,15 +11387,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -11585,17 +11509,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -11688,16 +11611,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -11790,17 +11712,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -11894,16 +11815,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -11996,15 +11916,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -12098,15 +12017,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -12198,18 +12116,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -12321,15 +12238,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -12420,15 +12336,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -12519,15 +12434,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {AntiSandwichHook} from "@openzeppelin/uniswap-hooks/general/AntiSandwichHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override \`_afterSwapHandler\` to determine how accumulated penalty fees are handled␊ // i.e. distributing the fees to well-behaved LPs, improving swap pricing, etc␊ @@ -12615,16 +12529,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -12725,15 +12638,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -12810,15 +12722,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -12895,16 +12806,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13013,18 +12923,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13127,17 +13036,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13240,18 +13148,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13355,17 +13262,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13468,16 +13374,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13581,16 +13486,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13692,18 +13596,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13817,16 +13720,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -13927,16 +13829,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -14037,16 +13938,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LiquidityPenaltyHook} from "@openzeppelin/uniswap-hooks/general/LiquidityPenaltyHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the block number offset for the liquidity penalty␊ // i.e. \`10\` in order to deter JIT attacks linearly for the first 10 blocks after adding liquidity␊ @@ -14146,16 +14046,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20 {␊ constructor(IPoolManager _poolManager)␊ @@ -14253,16 +14152,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20 {␊ constructor(IPoolManager _poolManager)␊ @@ -14344,14 +14242,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20 {␊ constructor(IPoolManager _poolManager)␊ @@ -14417,16 +14315,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20 {␊ constructor(IPoolManager _poolManager)␊ @@ -14532,18 +14429,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20 {␊ using CurrencySettler for Currency;␊ @@ -14643,17 +14539,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20 {␊ using SafeCast for *;␊ @@ -14753,18 +14648,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20 {␊ using SlotDerivation for bytes32;␊ @@ -14865,17 +14759,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, Ownable, ERC20 {␊ constructor(IPoolManager _poolManager, address initialOwner)␊ @@ -14975,16 +14868,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, AccessControl, ERC20 {␊ constructor(IPoolManager _poolManager, address defaultAdmin)␊ @@ -15085,16 +14977,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, AccessManaged, ERC20 {␊ constructor(IPoolManager _poolManager, address initialAuthority)␊ @@ -15188,24 +15079,22 @@ Generated by [AVA](https://avajs.dev). ## pausable LimitOrderHook > Snapshot 1 - - `// SPDX-License-Identifier: MIT␊ - // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ - pragma solidity ^0.8.27;␊ - ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {OrderIdLibrary} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ + + `// SPDX-License-Identifier: MIT␊ + // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ + pragma solidity ^0.8.27;␊ + ␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {LimitOrderHook, OrderIdLibrary} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20, Pausable, Ownable {␊ constructor(IPoolManager _poolManager, address initialOwner)␊ @@ -15341,16 +15230,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC20 {␊ constructor(IPoolManager _poolManager)␊ @@ -15448,16 +15336,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC1155 {␊ constructor(IPoolManager _poolManager)␊ @@ -15555,16 +15442,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {LimitOrderHook} from "@openzeppelin/uniswap-hooks/general/LimitOrderHook.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ contract MyHook is LimitOrderHook, ERC6909 {␊ constructor(IPoolManager _poolManager) BaseHook(_poolManager) {}␊ @@ -15659,15 +15545,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -15791,15 +15677,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -15899,15 +15785,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -16015,15 +15901,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -16155,16 +16041,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -16290,16 +16176,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -16425,17 +16311,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -16562,16 +16448,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -16697,15 +16583,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -16832,15 +16718,15 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -16965,19 +16851,18 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -17141,15 +17026,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -17273,15 +17158,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -17402,15 +17287,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {ReHypothecationHook} from "@openzeppelin/uniswap-hooks/general/ReHypothecationHook.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Override the required functions to customize the rehypothecation logic␊ // i.e. keeping the liquidity in a yield-bearing ERC-4626 Vault while still being available for swaps, etc␊ @@ -17531,15 +17416,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -17641,14 +17525,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -17726,15 +17610,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -17812,15 +17695,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -17930,17 +17812,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18044,16 +17925,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18157,17 +18037,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ + import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18272,16 +18151,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18385,15 +18263,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18498,15 +18375,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18609,18 +18485,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ + import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ - import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18743,15 +18618,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18853,15 +18727,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -18963,15 +18836,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {BaseOracleHook} from "@openzeppelin/uniswap-hooks/oracles/panoptic/BaseOracleHook.sol";␊ - import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19072,15 +18944,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19182,14 +19053,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19267,15 +19138,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19353,15 +19223,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19471,17 +19340,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ + import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ import {CurrencySettler} from "@openzeppelin/uniswap-hooks/utils/CurrencySettler.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {Currency} from "@uniswap/v4-core/src/types/Currency.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19585,16 +19453,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19698,17 +19565,16 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ - import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ import {SlotDerivation} from "@openzeppelin/contracts/utils/SlotDerivation.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ import {TransientSlot} from "@openzeppelin/contracts/utils/TransientSlot.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19813,16 +19679,15 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ - import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -19926,15 +19791,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -20039,15 +19903,14 @@ Generated by [AVA](https://avajs.dev). pragma solidity ^0.8.27;␊ ␊ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -20150,18 +20013,17 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ - import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ - import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ - import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊ + import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ import {Pausable} from "@openzeppelin/contracts/utils/Pausable.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ + import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ + import {BeforeSwapDelta} from "@uniswap/v4-core/src/types/BeforeSwapDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -20284,15 +20146,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -20394,15 +20255,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ @@ -20504,15 +20364,14 @@ Generated by [AVA](https://avajs.dev). // Compatible with OpenZeppelin Contracts ^5.5.0 and OpenZeppelin Uniswap Hooks ^1.2.1␊ pragma solidity ^0.8.27;␊ ␊ - import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ - import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {ERC6909} from "@openzeppelin/contracts/token/ERC6909/ERC6909.sol";␊ - import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ - import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ - import {ModifyLiquidityParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {BaseHook} from "@openzeppelin/uniswap-hooks/base/BaseHook.sol";␊ import {OracleHookWithV3Adapters} from "@openzeppelin/uniswap-hooks/oracles/panoptic/OracleHookWithV3Adapters.sol";␊ + import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";␊ + import {Hooks} from "@uniswap/v4-core/src/libraries/Hooks.sol";␊ + import {BalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";␊ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";␊ - import {SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ + import {ModifyLiquidityParams, SwapParams} from "@uniswap/v4-core/src/types/PoolOperation.sol";␊ ␊ // TODO: Determine the max absolute tick delta for the truncated oracle␊ // i.e. \`488\` to limit tick changes per observation to an equivalent of 5% abrupt price changes␊ diff --git a/packages/core/uniswap-hooks/src/hooks.test.ts.snap b/packages/core/uniswap-hooks/src/hooks.test.ts.snap index 97ef3bfe9..51965598a 100644 Binary files a/packages/core/uniswap-hooks/src/hooks.test.ts.snap and b/packages/core/uniswap-hooks/src/hooks.test.ts.snap differ diff --git a/packages/core/uniswap-hooks/src/package.test.ts b/packages/core/uniswap-hooks/src/package.test.ts index 2e07eda7d..91a3f33b7 100644 --- a/packages/core/uniswap-hooks/src/package.test.ts +++ b/packages/core/uniswap-hooks/src/package.test.ts @@ -24,16 +24,16 @@ test('packed package can be installed and imported', async t => { const tempDir = await mkdtemp(join(tmpdir(), 'wizard-package-test-')); try { - // Pack both packages (since hooks wizard depends on solidity wizard) + // Pack both packages (this package and dependency on solidity package) const solidityPackedPath = await packPackage(solidityPackageRoot); - const hooksPackedPath = await packPackage(hooksPackageRoot); + const packedPath = await packPackage(hooksPackageRoot); try { // Create a test project in temp directory await execAsync('npm init -y', { cwd: tempDir }); // Install both packages - await execAsync(`npm install "${solidityPackedPath}" "${hooksPackedPath}"`, { cwd: tempDir }); + await execAsync(`npm install "${solidityPackedPath}" "${packedPath}"`, { cwd: tempDir }); // Test that the package can be imported const testScript = `const { hooks } = require('@openzeppelin/wizard-uniswap-hooks'); @@ -48,7 +48,7 @@ console.log('SUCCESS'); } finally { // Clean up the packed files await rm(solidityPackedPath, { force: true }); - await rm(hooksPackedPath, { force: true }); + await rm(packedPath, { force: true }); } } finally { // Clean up temp directory diff --git a/packages/core/uniswap-hooks/src/print.ts b/packages/core/uniswap-hooks/src/print.ts index f4e8315a3..9a6ca31ee 100644 --- a/packages/core/uniswap-hooks/src/print.ts +++ b/packages/core/uniswap-hooks/src/print.ts @@ -6,7 +6,12 @@ export function printContract(contract: Contract, opts?: HooksOptions): string { return printSolidityContract(contract, { ...opts, additionalCompatibleLibraries: [ - { name: 'OpenZeppelin Uniswap Hooks', path: '@openzeppelin/uniswap-hooks', version: compatibleContractsSemver }, + { + name: 'OpenZeppelin Uniswap Hooks', + path: '@openzeppelin/uniswap-hooks', + version: compatibleContractsSemver, + alwaysKeepOzPrefix: true, + }, ], }); } diff --git a/packages/mcp/README.md b/packages/mcp/README.md index 22208437e..229300a02 100644 --- a/packages/mcp/README.md +++ b/packages/mcp/README.md @@ -17,6 +17,7 @@ Provides tools to generate smart contract source code for the following language | --- | --- | | solidity | erc20, erc721, erc1155, stablecoin, rwa, account, governor, custom | | cairo | erc20, erc721, erc1155, account, multisig, governor, vesting, custom | +| confidential | erc7984 | | stellar | fungible, stablecoin, non-fungible | | stylus | erc20, erc721, erc1155 | diff --git a/packages/mcp/package.json b/packages/mcp/package.json index 8c3022c5e..55e10ef02 100644 --- a/packages/mcp/package.json +++ b/packages/mcp/package.json @@ -28,7 +28,8 @@ "@openzeppelin/wizard": "^0.10.3", "@openzeppelin/wizard-stylus": "^0.2.0", "@openzeppelin/wizard-stellar": "^0.4.4", - "@openzeppelin/wizard-cairo": "^2.1.0" + "@openzeppelin/wizard-cairo": "^2.1.0", + "@openzeppelin/wizard-confidential": "^0.0.1-alpha.0" }, "devDependencies": { "@types/node": "^20.0.0", @@ -36,4 +37,4 @@ "ts-node": "^10.4.0", "typescript": "^5.0.0" } -} +} \ No newline at end of file diff --git a/packages/mcp/src/confidential/schemas.ts b/packages/mcp/src/confidential/schemas.ts new file mode 100644 index 000000000..822a6a318 --- /dev/null +++ b/packages/mcp/src/confidential/schemas.ts @@ -0,0 +1,35 @@ +import { z } from 'zod'; +import { commonDescriptions, infoDescriptions, confidentialERC7984Descriptions } from '@openzeppelin/wizard-common'; +import type { KindedOptions } from '@openzeppelin/wizard-confidential'; + +/** + * Static type assertions to ensure schemas satisfy the Wizard API types. Not called at runtime. + */ +function _typeAssertions() { + const _assertions: { + [K in keyof KindedOptions]: Omit; + } = { + ERC7984: z.object(erc7984Schema).parse({}), + }; +} + +export const commonSchema = { + info: z + .object({ + securityContact: z.string().optional().describe(infoDescriptions.securityContact), + license: z.string().optional().describe(infoDescriptions.license), + }) + .optional() + .describe(infoDescriptions.info), +} as const satisfies z.ZodRawShape; + +export const erc7984Schema = { + name: z.string().describe(commonDescriptions.name), + symbol: z.string().describe(commonDescriptions.symbol), + contractURI: z.string().describe(confidentialERC7984Descriptions.contractURI), + premint: z.string().optional().describe(confidentialERC7984Descriptions.premint), + networkConfig: z.literal('zama-ethereum').describe(confidentialERC7984Descriptions.networkConfig), + wrappable: z.boolean().optional().describe(confidentialERC7984Descriptions.wrappable), + votes: z.literal('blocknumber').or(z.literal('timestamp')).optional().describe(confidentialERC7984Descriptions.votes), + ...commonSchema, +} as const satisfies z.ZodRawShape; diff --git a/packages/mcp/src/confidential/tools.ts b/packages/mcp/src/confidential/tools.ts new file mode 100644 index 000000000..45627dee2 --- /dev/null +++ b/packages/mcp/src/confidential/tools.ts @@ -0,0 +1,20 @@ +import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'; +import { registerConfidentialERC7984 } from './tools/erc7984.js'; +import type { KindedOptions } from '@openzeppelin/wizard-confidential'; +import type { RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js'; + +type ConfidentialToolRegisterFunctions = { + [kind in keyof KindedOptions]: (server: McpServer) => RegisteredTool; +}; + +function getRegisterFunctions(server: McpServer): ConfidentialToolRegisterFunctions { + return { + ERC7984: () => registerConfidentialERC7984(server), + }; +} + +export function registerConfidentialTools(server: McpServer) { + Object.values(getRegisterFunctions(server)).forEach(registerTool => { + registerTool(server); + }); +} diff --git a/packages/mcp/src/confidential/tools/erc7984.test.ts b/packages/mcp/src/confidential/tools/erc7984.test.ts new file mode 100644 index 000000000..57f803a20 --- /dev/null +++ b/packages/mcp/src/confidential/tools/erc7984.test.ts @@ -0,0 +1,61 @@ +import type { TestFn, ExecutionContext } from 'ava'; +import _test from 'ava'; +import type { RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js'; +import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'; +import { registerConfidentialERC7984 } from './erc7984'; +import type { DeepRequired } from '../../helpers.test'; +import { testMcpInfo, assertAPIEquivalence } from '../../helpers.test'; +import type { ERC7984Options } from '@openzeppelin/wizard-confidential'; +import { erc7984 } from '@openzeppelin/wizard-confidential'; +import { erc7984Schema } from '../schemas'; +import { z } from 'zod'; + +interface Context { + tool: RegisteredTool; + schema: z.ZodObject; +} + +const test = _test as TestFn; + +test.before(t => { + t.context.tool = registerConfidentialERC7984(new McpServer(testMcpInfo)); + t.context.schema = z.object(erc7984Schema); +}); + +function assertHasAllSupportedFields( + t: ExecutionContext, + params: DeepRequired>, +) { + const _: DeepRequired = params; + t.pass(); +} + +test('basic', async t => { + const params: z.infer = { + name: 'TestToken', + symbol: 'TST', + contractURI: 'https://example.com', + networkConfig: 'zama-ethereum', + }; + await assertAPIEquivalence(t, params, erc7984.print); +}); + +test('all', async t => { + const params: DeepRequired> = { + name: 'TestToken', + symbol: 'TST', + contractURI: 'https://example.com', + premint: '1000', + networkConfig: 'zama-ethereum', + wrappable: true, + votes: 'blocknumber', + info: { + license: 'MIT', + securityContact: 'security@example.com', + }, + }; + + assertHasAllSupportedFields(t, params); + + await assertAPIEquivalence(t, params, erc7984.print); +}); diff --git a/packages/mcp/src/confidential/tools/erc7984.ts b/packages/mcp/src/confidential/tools/erc7984.ts new file mode 100644 index 000000000..f2efd5245 --- /dev/null +++ b/packages/mcp/src/confidential/tools/erc7984.ts @@ -0,0 +1,34 @@ +import type { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js'; +import type { ERC7984Options } from '@openzeppelin/wizard-confidential'; +import { erc7984 } from '@openzeppelin/wizard-confidential'; +import { safePrintSolidityCodeBlock, makeDetailedPrompt } from '../../utils'; +import { erc7984Schema } from '../schemas'; +import { confidentialPrompts } from '@openzeppelin/wizard-common'; + +export function registerConfidentialERC7984(server: McpServer): RegisteredTool { + return server.tool( + 'erc7984', + makeDetailedPrompt(confidentialPrompts.ERC7984), + erc7984Schema, + async ({ name, symbol, contractURI, premint, networkConfig, wrappable, votes, info }) => { + const opts: ERC7984Options = { + name, + symbol, + contractURI, + premint, + networkConfig, + wrappable, + votes, + info, + }; + return { + content: [ + { + type: 'text', + text: safePrintSolidityCodeBlock(() => erc7984.print(opts)), + }, + ], + }; + }, + ); +} diff --git a/packages/mcp/src/server.test.ts b/packages/mcp/src/server.test.ts new file mode 100644 index 000000000..55bd4d2c1 --- /dev/null +++ b/packages/mcp/src/server.test.ts @@ -0,0 +1,49 @@ +import test from 'ava'; +import { readdir } from 'fs/promises'; +import { join } from 'path'; +import { readFile } from 'fs/promises'; + +const PACKAGES_CORE_PATH = join(__dirname, '../../core'); +const PACKAGES_MCP_SRC_PATH = join(__dirname); +const SERVER_TS_PATH = join(__dirname, 'server.ts'); + +// Languages that do not need MCP tools +const MCP_EXCLUDED_LANGUAGES: string[] = ['cairo_alpha']; + +test('each core language has mcp tools folder', async t => { + // Get all directories in packages/core + const coreEntries = await readdir(PACKAGES_CORE_PATH, { withFileTypes: true }); + const coreDirs = coreEntries + .filter(entry => entry.isDirectory()) + .map(entry => entry.name) + .filter(name => !MCP_EXCLUDED_LANGUAGES.includes(name)); + + // Get all directories in packages/mcp/src + const mcpEntries = await readdir(PACKAGES_MCP_SRC_PATH, { withFileTypes: true }); + const mcpDirs = mcpEntries.filter(entry => entry.isDirectory()).map(entry => entry.name); + + // Assert that each core directory has a corresponding mcp directory + for (const coreDir of coreDirs) { + t.true( + mcpDirs.includes(coreDir), + `Language folder '${coreDir}' from packages/core should have a corresponding folder in packages/mcp/src`, + ); + } +}); + +test('each mcp tools folder is registered in server.ts', async t => { + // Get all directories in packages/mcp/src + const mcpEntries = await readdir(PACKAGES_MCP_SRC_PATH, { withFileTypes: true }); + const mcpDirs = mcpEntries.filter(entry => entry.isDirectory()).map(entry => entry.name); + + // Read server.ts content + const serverContent = await readFile(SERVER_TS_PATH, 'utf-8'); + + // For each directory, check if it's used in server.ts + for (const mcpDir of mcpDirs) { + t.true( + serverContent.includes(`${mcpDir}/tools`), + `Expected '${mcpDir}/tools' not found in server.ts for language '${mcpDir}'`, + ); + } +}); diff --git a/packages/mcp/src/server.ts b/packages/mcp/src/server.ts index 498e03d2a..dd786937f 100644 --- a/packages/mcp/src/server.ts +++ b/packages/mcp/src/server.ts @@ -1,6 +1,7 @@ import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'; import { registerSolidityTools } from './solidity/tools.js'; import { registerCairoTools } from './cairo/tools.js'; +import { registerConfidentialTools } from './confidential/tools.js'; import { registerStellarTools } from './stellar/tools.js'; import { registerStylusTools } from './stylus/tools.js'; import { registerUniswapHooksTools } from './uniswap-hooks/tools.js'; @@ -14,7 +15,7 @@ export function createServer() { }, { instructions: `\ -Tools are provided for different smart contract languages and frameworks: Solidity, Starknet's Cairo, Stellar Soroban, Arbitrum Stylus, and Uniswap v4 Hooks. +Tools are provided for different smart contract languages and blockchain ecosystems. Each tool generates a smart contract using recommended best practices with OpenZeppelin Contracts libraries, and returns the source code. The tools do not write to disk. If the user requests to create a new smart contract, use the appropriate tool to generate the contract. If the user asks to modify an existing smart contract, use these tools to determine the recommended patterns. Toggle the options in a tool to determine how different features affect the code, then apply the same types of changes to the user's contract. @@ -24,6 +25,7 @@ If the user asks to modify an existing smart contract, use these tools to determ registerSolidityTools(server); registerCairoTools(server); + registerConfidentialTools(server); registerStellarTools(server); registerStylusTools(server); registerUniswapHooksTools(server); diff --git a/packages/ui/api/ai-assistant/function-definitions/confidential-shared.ts b/packages/ui/api/ai-assistant/function-definitions/confidential-shared.ts new file mode 100644 index 000000000..5b8b06690 --- /dev/null +++ b/packages/ui/api/ai-assistant/function-definitions/confidential-shared.ts @@ -0,0 +1,20 @@ +import type { AiFunctionPropertyDefinition } from '../types/function-definition.ts'; +import type { ConfidentialCommonOptions } from '../types/languages.ts'; +import { infoDescriptions } from '../../../../common/src/ai/descriptions/common.ts'; + +export const commonFunctionDescription = { + info: { + type: 'object', + description: infoDescriptions.info, + properties: { + securityContact: { + type: 'string', + description: infoDescriptions.securityContact, + }, + license: { + type: 'string', + description: infoDescriptions.license, + }, + }, + }, +} as const satisfies AiFunctionPropertyDefinition['properties']; diff --git a/packages/ui/api/ai-assistant/function-definitions/confidential.ts b/packages/ui/api/ai-assistant/function-definitions/confidential.ts new file mode 100644 index 000000000..f477da46e --- /dev/null +++ b/packages/ui/api/ai-assistant/function-definitions/confidential.ts @@ -0,0 +1,43 @@ +import type { AiFunctionDefinition } from '../types/function-definition.ts'; +import { addFunctionPropertiesFrom } from './shared.ts'; +import { commonFunctionDescription } from './confidential-shared.ts'; +import { + confidentialPrompts, + confidentialERC7984Descriptions, +} from '../../../../common/src/ai/descriptions/confidential.ts'; + +export const confidentialERC7984AIFunctionDefinition = { + name: 'ERC7984', + description: confidentialPrompts.ERC7984, + parameters: { + type: 'object', + properties: { + ...addFunctionPropertiesFrom(commonFunctionDescription, ['name', 'symbol', 'info']), + contractURI: { + type: 'string', + description: confidentialERC7984Descriptions.contractURI, + }, + premint: { + type: 'string', + description: confidentialERC7984Descriptions.premint, + }, + networkConfig: { + anyOf: [{ type: 'string', enum: ['zama-ethereum'] }], + description: confidentialERC7984Descriptions.networkConfig, + }, + wrappable: { + type: 'boolean', + description: confidentialERC7984Descriptions.wrappable, + }, + votes: { + anyOf: [ + { type: 'boolean', enum: [false] }, + { type: 'string', enum: ['blocknumber', 'timestamp'] }, + ], + description: confidentialERC7984Descriptions.votes, + }, + }, + required: ['name', 'symbol', 'contractURI', 'networkConfig'], + additionalProperties: false, + }, +} as const satisfies AiFunctionDefinition<'confidential', 'ERC7984'>; diff --git a/packages/ui/api/ai-assistant/types/languages.ts b/packages/ui/api/ai-assistant/types/languages.ts index 20358bed3..97219ba77 100644 --- a/packages/ui/api/ai-assistant/types/languages.ts +++ b/packages/ui/api/ai-assistant/types/languages.ts @@ -21,6 +21,9 @@ export type StellarCommonContractOptions = Omit & { access?: false }; +// Confidential +import type { KindedOptions as ConfidentialKindedOptions } from '../../../../core/confidential/dist'; +export type { CommonOptions as ConfidentialCommonOptions } from '../../../../core/confidential/dist/common-options'; type SolidityContractsOptions = Omit< SolidityKindedOptions, @@ -37,6 +40,7 @@ export type LanguagesContractsOptions = { solidity: SolidityContractsOptions; cairo: CairoKindedOptions; cairoAlpha: CairoAlphaKindedOptions; + confidential: ConfidentialKindedOptions; polkadot: Omit; stellar: Omit & { Fungible: StellarKindedOptions['Fungible'] & StellarCommonContractOptions; diff --git a/packages/ui/api/ai.ts b/packages/ui/api/ai.ts index 76003df7f..73a4d35d2 100644 --- a/packages/ui/api/ai.ts +++ b/packages/ui/api/ai.ts @@ -4,6 +4,7 @@ import * as cairoFunctions from './ai-assistant/function-definitions/cairo.ts'; import * as cairoAlphaFunctions from './ai-assistant/function-definitions/cairo-alpha.ts'; import * as stellarFunctions from './ai-assistant/function-definitions/stellar.ts'; import * as stylusFunctions from './ai-assistant/function-definitions/stylus.ts'; +import * as confidentialFunctions from './ai-assistant/function-definitions/confidential.ts'; import * as uniswapHooksFunctions from './ai-assistant/function-definitions/uniswap-hooks.ts'; import { saveChatInRedisIfDoesNotExist } from './services/redis.ts'; import type { ChatMessages } from './services/open-ai.ts'; @@ -26,6 +27,7 @@ const getFunctionsContext = + confidentialConfidential stellarStellar stylusStylus uniswap-hooksUniswap Hooks diff --git a/packages/ui/public/confidential.html b/packages/ui/public/confidential.html new file mode 100644 index 000000000..95abc206b --- /dev/null +++ b/packages/ui/public/confidential.html @@ -0,0 +1,100 @@ + + + + + + OpenZeppelin Contracts Wizard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ Forum + Docs + GitHub OpenZeppelin + Twitter/X +
+
+ +
+
+ soliditySolidity + cairoCairo + confidentialConfidential + stellarStellar + stylusStylus + uniswap-hooksUniswap Hooks +
+
+
+ +
+ + + + + + + + + + + + + diff --git a/packages/ui/public/icons/confidential.svg b/packages/ui/public/icons/confidential.svg new file mode 100644 index 000000000..0fabbaf57 --- /dev/null +++ b/packages/ui/public/icons/confidential.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/ui/public/icons/zama.png b/packages/ui/public/icons/zama.png new file mode 100644 index 000000000..858ef1855 Binary files /dev/null and b/packages/ui/public/icons/zama.png differ diff --git a/packages/ui/public/index.html b/packages/ui/public/index.html index 98dba0cf2..d860ededa 100644 --- a/packages/ui/public/index.html +++ b/packages/ui/public/index.html @@ -97,6 +97,7 @@
soliditySolidity cairoCairo + confidentialConfidential stellarStellar stylusStylus uniswap-hooksUniswap Hooks diff --git a/packages/ui/public/polkadot.html b/packages/ui/public/polkadot.html new file mode 100644 index 000000000..519398323 --- /dev/null +++ b/packages/ui/public/polkadot.html @@ -0,0 +1,101 @@ + + + + + + OpenZeppelin Contracts Wizard + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ Forum + Docs + GitHub OpenZeppelin + Twitter/X +
+
+ +
+
+ soliditySolidity + cairoCairo + confidentialConfidential + polkadotPolkadot + stellarStellar + stylusStylus +
+
+
+ +
+ + + + + + + + + + + + + diff --git a/packages/ui/public/stellar.html b/packages/ui/public/stellar.html index 2e70aa784..3c879fbc6 100644 --- a/packages/ui/public/stellar.html +++ b/packages/ui/public/stellar.html @@ -65,6 +65,7 @@
soliditySolidity cairoCairo + confidentialConfidential stellarStellar stylusStylus uniswap-hooksUniswap Hooks diff --git a/packages/ui/public/stylus.html b/packages/ui/public/stylus.html index ec0a6c70d..4f32ee57b 100644 --- a/packages/ui/public/stylus.html +++ b/packages/ui/public/stylus.html @@ -65,6 +65,7 @@
soliditySolidity cairoCairo + confidentialConfidential stellarStellar stylusStylus uniswap-hooksUniswap Hooks diff --git a/packages/ui/public/uniswap-hooks.html b/packages/ui/public/uniswap-hooks.html index 017031882..fd52e7730 100644 --- a/packages/ui/public/uniswap-hooks.html +++ b/packages/ui/public/uniswap-hooks.html @@ -95,6 +95,7 @@
soliditySolidity cairoCairo + confidentialConfidential stellarStellar stylusStylus uniswap-hooksUniswap Hooks diff --git a/packages/ui/rollup.config.mjs b/packages/ui/rollup.config.mjs index 2f6eb05b4..3924352a6 100644 --- a/packages/ui/rollup.config.mjs +++ b/packages/ui/rollup.config.mjs @@ -99,8 +99,9 @@ export default [ assetFileNames: '[name][extname]', }, plugins: [ - // Generate openzeppelin-contracts.js data file + // Generate contract library data files onStartRun(...'yarn --cwd ../core/solidity prepare'.split(' ')), + onStartRun(...'yarn --cwd ../core/confidential prepare'.split(' ')), svelte(await import('./svelte.config.js')), diff --git a/packages/ui/src/common/languages-types.ts b/packages/ui/src/common/languages-types.ts index 77f7c2acf..375e93dd8 100644 --- a/packages/ui/src/common/languages-types.ts +++ b/packages/ui/src/common/languages-types.ts @@ -1,6 +1,7 @@ import type { GenericOptions as SolidityOptions } from '@openzeppelin/wizard'; import type { GenericOptions as CairoOptions } from '@openzeppelin/wizard-cairo'; import type { GenericOptions as CairoAlphaOptions } from '@openzeppelin/wizard-cairo-alpha'; +import type { GenericOptions as ConfidentialOptions } from '@openzeppelin/wizard-confidential'; import type { GenericOptions as StellarOptions } from '@openzeppelin/wizard-stellar'; import type { GenericOptions as StylusOptions } from '@openzeppelin/wizard-stylus'; import type { GenericOptions as UniswapHooksOptions } from '@openzeppelin/wizard-uniswap-hooks'; @@ -9,6 +10,7 @@ export type LanguagesOptions = | Required | Required | Required + | Required | Required | Required | Required; @@ -17,7 +19,8 @@ export type Language = | 'solidity' | 'cairo' | 'cairo-alpha' + | 'confidential' | 'polkadot-solidity' - | 'stylus' | 'stellar' + | 'stylus' | 'uniswap-hooks-solidity'; diff --git a/packages/ui/src/common/styles/vars.css b/packages/ui/src/common/styles/vars.css index 4ef58c8d0..78b499dda 100644 --- a/packages/ui/src/common/styles/vars.css +++ b/packages/ui/src/common/styles/vars.css @@ -36,6 +36,9 @@ --stellar-black: #0f0f0f; + --confidential-black: #000000; + --confidential-yellow: #ffd208; + --uniswap-pink: #f50eb4; /* Dimensions (scale taken from Tailwind) */ diff --git a/packages/ui/src/confidential/App.svelte b/packages/ui/src/confidential/App.svelte new file mode 100644 index 000000000..5715efba1 --- /dev/null +++ b/packages/ui/src/confidential/App.svelte @@ -0,0 +1,471 @@ + + +
+ + +
+
+ + + +
+ + {#if hasErrors} + + {:else} +
+ + + {#if showButtons.openInRemix} + + +
+ Perform the following steps: +

+ 1. + {#if copiedRemappings} + + Copied! + {:else} + + to your clipboard. + {/if} +

+

+ 2. + . +

+

+ 3. + In Remix's file explorer, create a new file called
+ remappings.txt and paste the remappings into it. +

+
+ + {/if} + + + + + + + {#if showButtons.downloadHardhat} + + {/if} + +
+ {/if} +
+ +
+
+
+ +
+
+ +
+ 
+        {#if showCode}
+          {@html highlightedCode}
+        {/if}
+
+
+
+
+ + diff --git a/packages/ui/src/confidential/ERC7984Controls.svelte b/packages/ui/src/confidential/ERC7984Controls.svelte new file mode 100644 index 000000000..95c894f29 --- /dev/null +++ b/packages/ui/src/confidential/ERC7984Controls.svelte @@ -0,0 +1,106 @@ + + +
+

Settings

+ +
+ + + +
+ + + + + +
+ + Network Configuration + Specify the network configuration and provider to use for FHEVM contracts. + +
+ +
+
+
+ +
+

Features

+ +
+ +
+
+ + +
+ + +
+ + + diff --git a/packages/ui/src/confidential/inject-hyperlinks.ts b/packages/ui/src/confidential/inject-hyperlinks.ts new file mode 100644 index 000000000..e73749c44 --- /dev/null +++ b/packages/ui/src/confidential/inject-hyperlinks.ts @@ -0,0 +1,34 @@ +import { version as contractsVersion } from '@openzeppelin/contracts/package.json'; +import { version as confidentialContractsVersion } from '@openzeppelin/confidential-contracts/package.json'; +import { version as fhevmSolidityVersion } from '@fhevm/solidity/package.json'; + +function remapFhevmNpmVersionToGitTag(version: string): string { + // The FHEVM Solidity contracts are published on npm with version 0.9.1, but correspond to tag 0.9.14. + if (version === '0.9.1') { + return 'v0.9.14'; + } + return `v${version}`; +} + +export function injectHyperlinks(code: string) { + // We are modifying HTML, so use HTML escaped chars. The pattern excludes paths that include /../ in the URL. + const importContractsRegex = + /"(@openzeppelin\/)(contracts-upgradeable\/|contracts\/)((?:(?!\.\.)[^/]+\/)*?[^/]*?)"/g; + const importConfidentialContractsRegex = + /"(@openzeppelin\/)(confidential-contracts\/)((?:(?!\.\.)[^/]+\/)*?[^/]*?)"/g; + const importFhevmSolidityRegex = /"(@fhevm\/)(solidity\/)((?:(?!\.\.)[^/]+\/)*?[^/]*?)"/g; + + return code + .replace( + importContractsRegex, + `"$1$2$3"`, + ) + .replace( + importConfidentialContractsRegex, + `"$1$2$3"`, + ) + .replace( + importFhevmSolidityRegex, + `"$1$2$3"`, + ); +} diff --git a/packages/ui/src/main.ts b/packages/ui/src/main.ts index 9a27d84d5..635fdc0d6 100644 --- a/packages/ui/src/main.ts +++ b/packages/ui/src/main.ts @@ -3,6 +3,7 @@ import './common/styles/global.css'; import SolidityApp from './solidity/App.svelte'; import CairoApp from './cairo/App.svelte'; import CairoAlphaApp from './cairo_alpha/App.svelte'; +import ConfidentialApp from './confidential/App.svelte'; import PolkadotApp from './polkadot/App.svelte'; import StellarApp from './stellar/App.svelte'; import StylusApp from './stylus/App.svelte'; @@ -17,6 +18,7 @@ import { compatibleContractsSemver as cairoAlphaSemver, contractsVersion as cairoAlphaVersion, } from '@openzeppelin/wizard-cairo-alpha'; +import { compatibleConfidentialContractsSemver as confidentialSemver } from '@openzeppelin/wizard-confidential'; import { compatibleContractsSemver as stellarSemver } from '@openzeppelin/wizard-stellar'; import { compatibleContractsSemver as stylusSemver } from '@openzeppelin/wizard-stylus'; import { compatibleContractsSemver as uniswapHooksSemver } from '@openzeppelin/wizard-uniswap-hooks'; @@ -46,7 +48,7 @@ const initialOpts: InitialOptions = { interface CompatibleSelection { compatible: true; - appType: 'solidity' | 'cairo' | 'cairo_alpha' | 'polkadot' | 'stellar' | 'stylus' | 'uniswap-hooks'; + appType: 'solidity' | 'cairo' | 'cairo_alpha' | 'confidential' | 'polkadot' | 'stellar' | 'stylus' | 'uniswap-hooks'; } interface IncompatibleSelection { @@ -82,6 +84,13 @@ function evaluateSelection( return { compatible: false, compatibleVersionsSemver: `${cairoAlphaSemver} || ${cairoSemver}` }; } } + case 'confidential': { + if (requestedVersion === undefined || semver.satisfies(requestedVersion, confidentialSemver)) { + return { compatible: true, appType: 'confidential' }; + } else { + return { compatible: false, compatibleVersionsSemver: confidentialSemver }; + } + } case 'polkadot': { // Use Solidity Contracts semver if (requestedVersion === undefined || semver.satisfies(requestedVersion, soliditySemver)) { @@ -172,6 +181,9 @@ if (!selection.compatible) { case 'stylus': app = new StylusApp({ target: document.body, props: { initialTab, initialOpts } }); break; + case 'confidential': + app = new ConfidentialApp({ target: document.body, props: { initialTab, initialOpts } }); + break; case 'uniswap-hooks': app = new UniswapHooksApp({ target: document.body, props: { initialTab, initialOpts } }); break; diff --git a/packages/ui/src/standalone.css b/packages/ui/src/standalone.css index 2cb1de09d..c8b8b122b 100644 --- a/packages/ui/src/standalone.css +++ b/packages/ui/src/standalone.css @@ -153,6 +153,13 @@ body { contrast(100%); } +.nav .switch.switch-confidential.active { + --color-2: #000000; +} +.nav .switch.switch-confidential.active img { + filter: brightness(0); +} + .nav .switch.switch-uniswap-hooks.active { --color-2: var(--uniswap-pink); } diff --git a/yarn.lock b/yarn.lock index 06e11663d..72a79fca2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@adraffy/ens-normalize@1.10.1": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz#63430d04bd8c5e74f8d7d049338f1cd9d4f02069" + integrity sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw== + "@alloc/quick-lru@^5.2.0": version "5.2.0" resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" @@ -507,6 +512,42 @@ resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d" integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA== +"@fhevm/hardhat-plugin@^0.3.0-1": + version "0.3.0-1" + resolved "https://registry.yarnpkg.com/@fhevm/hardhat-plugin/-/hardhat-plugin-0.3.0-1.tgz#954efd430213a723d2cc48d4141d3f034edd4c76" + integrity sha512-SnxtynkDehpkvoq0CRi1x09J01/K1rP2Q99fMNUv6PxXowwvjhZYhq0vw8qi6mZLI62AVMh94KbzN/Gb3L4e/w== + dependencies: + "@fhevm/host-contracts" "0.9.0" + debug "^4.1.1" + dotenv "^16.5.0" + picocolors "^1.1.1" + resolve "^1.22.10" + +"@fhevm/host-contracts@0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@fhevm/host-contracts/-/host-contracts-0.9.0.tgz#b296946edb193ba4097c8c262f337e4a42cd6878" + integrity sha512-N/DRfpXVCzHbg+9NE5sLHzTH3X7Wt3xRSN/7Jyoo+mKgjI7u40heJz8z/dUqvcq0h8wXjXcZcQHgP4pjMNjLKw== + dependencies: + encrypted-types "^0.0.4" + optionalDependencies: + solidity-comments-darwin-arm64 "0.1.1" + solidity-comments-linux-x64-gnu "0.1.1" + +"@fhevm/mock-utils@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@fhevm/mock-utils/-/mock-utils-0.1.0.tgz#403522994f1f7a9e3c27715c8dfa2587e12d1f0c" + integrity sha512-MZk+hXNrO4t0kIgoO9nLln9lKCefCe6gCAKeBhwAMmndIdYGIGkNJHVTbqAAMWS7wPTsA5pkR47BWvX0N6XaZQ== + +"@fhevm/solidity@^0.9.1": + version "0.9.1" + resolved "https://registry.yarnpkg.com/@fhevm/solidity/-/solidity-0.9.1.tgz#1ca0fe341a03f8a5a49a292f3666058a77f4735b" + integrity sha512-QxP+R+6v3aHA/rzgH9cDsiYOwRBB6zLAL3qNI4YfRewKA6ZB01cdkYvrB80FkJyddzxRNsT1jHIvJvSRS8XZ+Q== + dependencies: + encrypted-types "^0.0.4" + optionalDependencies: + solidity-comments-darwin-arm64 "0.1.1" + solidity-comments-linux-x64-gnu "0.1.1" + "@humanfs/core@^0.19.1": version "0.19.1" resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77" @@ -654,6 +695,13 @@ resolved "https://registry.yarnpkg.com/@noble/ciphers/-/ciphers-1.3.0.tgz#f64b8ff886c240e644e5573c097f86e5b43676dc" integrity sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw== +"@noble/curves@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.2.0.tgz#92d7e12e4e49b23105a2555c6984d41733d65c35" + integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw== + dependencies: + "@noble/hashes" "1.3.2" + "@noble/curves@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.9.0.tgz#13e0ca8be4a0ce66c113693a94514e5599f40cfc" @@ -675,6 +723,11 @@ dependencies: "@noble/hashes" "1.8.0" +"@noble/hashes@1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39" + integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ== + "@noble/hashes@1.7.2", "@noble/hashes@~1.7.1": version "1.7.2" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.7.2.tgz#d53c65a21658fb02f3303e7ee3ba89d6754c64b4" @@ -754,6 +807,14 @@ "@nomicfoundation/edr-linux-x64-musl" "0.11.3" "@nomicfoundation/edr-win32-x64-msvc" "0.11.3" +"@nomicfoundation/hardhat-ethers@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-ethers/-/hardhat-ethers-3.1.0.tgz#d33595e85cdb53e802391de64ee35910c078dbb0" + integrity sha512-jx6fw3Ms7QBwFGT2MU6ICG292z0P81u6g54JjSV105+FbTZOF4FJqPksLfDybxkkOeq28eDxbqq7vpxRYyIlxA== + dependencies: + debug "^4.1.1" + lodash.isequal "^4.5.0" + "@nomicfoundation/solidity-analyzer-darwin-arm64@0.1.2": version "0.1.2" resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-darwin-arm64/-/solidity-analyzer-darwin-arm64-0.1.2.tgz#3a9c3b20d51360b20affb8f753e756d553d49557" @@ -806,11 +867,21 @@ version "0.0.1" resolved "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#b0ddd275a4c5d87ba2ded654b33e08db85094588" +"@openzeppelin/confidential-contracts@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/confidential-contracts/-/confidential-contracts-0.3.0.tgz#5e7d08fb19d50109be1cff8a3c7b2ac3645f514b" + integrity sha512-SccPGH4RgmKNtNBhv6gU85Ek/MT99fuI09o14xN4gd6PBrjEetUoAS01dlevP1lpqbAoyM8oiXshOEJ86M5tyw== + "@openzeppelin/contracts-upgradeable@^5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.5.0.tgz#e35b3ededa5ccc13205c2b42e2058cd5cb7d424a" integrity sha512-Va5hKG5oaK0EE5bXTVWugcGimMHazxL+SL523dH6WVbGiuLXwuWr9oxtLyPHQSVGtgmlIgtKNR5V+OUpCIUwFQ== +"@openzeppelin/contracts@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.4.0.tgz#177594bdb2d86c71f5d1052fe40cb4edb95fb20f" + integrity sha512-eCYgWnLg6WO+X52I16TZt8uEjbtdkgLC0SUX/xnAksjjrQI4Xfn4iBRoI5j55dmlOhDv1Y7BoR3cU7e3WWhC6A== + "@openzeppelin/contracts@^5.5.0": version "5.5.0" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.5.0.tgz#24e8a2f9598de484dcb223512af656edf52bc0e8" @@ -1173,6 +1244,13 @@ dependencies: undici-types "~7.10.0" +"@types/node@22.7.5": + version "22.7.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.7.5.tgz#cfde981727a7ab3611a481510b473ae54442b92b" + integrity sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ== + dependencies: + undici-types "~6.19.2" + "@types/node@^12.7.1": version "12.20.55" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" @@ -1355,6 +1433,21 @@ picomatch "^4.0.2" resolve-from "^5.0.0" +"@zama-fhe/relayer-sdk@0.3.0-5": + version "0.3.0-5" + resolved "https://registry.yarnpkg.com/@zama-fhe/relayer-sdk/-/relayer-sdk-0.3.0-5.tgz#f1d809bcdb95c39006c6e5a84842d1c285c1657b" + integrity sha512-DIPlN9z5tfSCXqUlhQN2MEv57HmAUHSGV9LPtGs6LWmM7POj6WsMd1hU7Qci4AWPsor7k3IqMfqGGthIvot/DQ== + dependencies: + commander "^14.0.0" + ethers "^6.15.0" + fetch-retry "^6.0.0" + keccak "^3.0.4" + node-tfhe "1.4.0-alpha.3" + node-tkms "^0.12.0" + tfhe "1.4.0-alpha.3" + tkms "^0.12.0" + wasm-feature-detect "^1.8.0" + abbrev@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-3.0.1.tgz#8ac8b3b5024d31464fe2a5feeea9f4536bf44025" @@ -1395,6 +1488,11 @@ adm-zip@^0.4.16: resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365" integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg== +aes-js@4.0.0-beta.5: + version "4.0.0-beta.5" + resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.5.tgz#8d2452c52adedebc3a3e28465d858c11ca315873" + integrity sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q== + agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -1946,6 +2044,11 @@ commander@^11.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906" integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== +commander@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.0.tgz#f244fc74a92343514e56229f16ef5c5e22ced5e9" + integrity sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA== + commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -2425,6 +2528,11 @@ domutils@^3.0.1: domelementtype "^2.3.0" domhandler "^5.0.3" +dotenv@^16.5.0: + version "16.6.1" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.6.1.tgz#773f0e69527a8315c7285d5ee73c4459d20a8020" + integrity sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow== + dotenv@^8.1.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -2492,6 +2600,11 @@ encodeurl@^2.0.0: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== +encrypted-types@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/encrypted-types/-/encrypted-types-0.0.4.tgz#6df80d7917d02f3946b21caf2dd77ba91ac22971" + integrity sha512-f55ccBBUwvqWqr3ymAVOLZ6bzjsSQZlDN0GcKFmzkvTpml4Vm3Y6BCaHhCuW/ctrabTJJ3DFnUsjtFOpokJUaQ== + enquirer@^2.3.0, enquirer@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56" @@ -2729,6 +2842,19 @@ ethereum-cryptography@^1.0.3, ethereum-cryptography@^2.2.1, ethereum-cryptograph "@scure/bip32" "1.7.0" "@scure/bip39" "1.6.0" +ethers@^6.15.0: + version "6.15.0" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.15.0.tgz#2980f2a3baf0509749b7e21f8692fa8a8349c0e3" + integrity sha512-Kf/3ZW54L4UT0pZtsY/rf+EkBU7Qi5nnhonjUb8yTXcxH3cdcWrV2cRyk0Xk/4jK6OoHhxxZHriyhje20If2hQ== + dependencies: + "@adraffy/ens-normalize" "1.10.1" + "@noble/curves" "1.2.0" + "@noble/hashes" "1.3.2" + "@types/node" "22.7.5" + aes-js "4.0.0-beta.5" + tslib "2.7.0" + ws "8.17.1" + eventemitter3@^4.0.4: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -2841,6 +2967,11 @@ fdir@^6.2.0, fdir@^6.4.4: resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350" integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg== +fetch-retry@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/fetch-retry/-/fetch-retry-6.0.0.tgz#4ffdf92c834d72ae819e42a4ee2a63f1e9454426" + integrity sha512-BUFj1aMubgib37I3v4q78fYo63Po7t4HUPTpQ6/QE6yK6cIQrP+W43FYToeTEyg5m2Y7eFUtijUuAv/PDlWuag== + figures@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/figures/-/figures-6.1.0.tgz#935479f51865fa7479f6fa94fc6fc7ac14e62c4a" @@ -3660,7 +3791,7 @@ jszip@^3.6.0: readable-stream "~2.3.6" setimmediate "^1.0.5" -keccak@^3.0.2: +keccak@^3.0.2, keccak@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d" integrity sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q== @@ -3750,6 +3881,11 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== + lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -4083,6 +4219,16 @@ node-releases@^2.0.19: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314" integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw== +node-tfhe@1.4.0-alpha.3: + version "1.4.0-alpha.3" + resolved "https://registry.yarnpkg.com/node-tfhe/-/node-tfhe-1.4.0-alpha.3.tgz#9e8d8afbd13ea7b0c00283f6929bf0a7af9787e3" + integrity sha512-oTcWL0OFA6t6BhScmDiGQ3VA8tU8T3EXCzIzpNxQxcuJDgQtiUF5CV6dgJLOrpWck4KCp1Bo/xLhv07uwn3q6Q== + +node-tkms@^0.12.0: + version "0.12.5" + resolved "https://registry.yarnpkg.com/node-tkms/-/node-tkms-0.12.5.tgz#fc7f2ee30e86859082b9643c305d6ba8ceeddcbc" + integrity sha512-1GZf8DtZGSqNKT/K4swcNytwhChYXUkKXg/rJTc66FbJ3VwjPbDDheHlp5kEBw0tFQO+dJ0lWsm+NRtafucFYg== + nofilter@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-3.1.0.tgz#c757ba68801d41ff930ba2ec55bab52ca184aa66" @@ -5104,7 +5250,7 @@ resolve@1.17.0: dependencies: path-parse "^1.0.6" -resolve@^1.1.7, resolve@^1.21.0, resolve@^1.22.1, resolve@^1.22.8: +resolve@^1.1.7, resolve@^1.21.0, resolve@^1.22.1, resolve@^1.22.10, resolve@^1.22.8: version "1.22.10" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39" integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w== @@ -5499,6 +5645,16 @@ solidity-ast@^0.4.18: resolved "https://registry.yarnpkg.com/solidity-ast/-/solidity-ast-0.4.60.tgz#7c0324eace040034d6a40edbd85475e4773cbbe8" integrity sha512-UwhasmQ37ji1ul8cIp0XlrQ/+SVQhy09gGqJH4jnwdo2TgI6YIByzi0PI5QvIGcIdFOs1pbSmJW1pnWB7AVh2w== +solidity-comments-darwin-arm64@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/solidity-comments-darwin-arm64/-/solidity-comments-darwin-arm64-0.1.1.tgz#9fc53a617229d942e091f6365d7715c6d7ddf19e" + integrity sha512-ze1+YboHm8tRJXCoFEsxtU1gpvQ3rCH55xMtBH6dtyh1/gz4qrKCOUBaAP+IHplbzCacZBn+Pz3UmMDOoGshRw== + +solidity-comments-linux-x64-gnu@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/solidity-comments-linux-x64-gnu/-/solidity-comments-linux-x64-gnu-0.1.1.tgz#be9d8c2e861db2ee3f9b8b8402ce600dec0fde72" + integrity sha512-oiU4yhh1Q9SeGXQ+/sogfTNoOkU8I8IvlIeotBQziTOonUHrxQk4E63kNiYGPDn5ZbB3BhKFmGHNRNrkufsxcQ== + sorcery@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/sorcery/-/sorcery-0.11.1.tgz#7cac27ae9c9549b3cd1e4bb85317f7b2dc7b7e22" @@ -5853,6 +6009,11 @@ terser@^5.0.0: commander "^2.20.0" source-map-support "~0.5.20" +tfhe@1.4.0-alpha.3: + version "1.4.0-alpha.3" + resolved "https://registry.yarnpkg.com/tfhe/-/tfhe-1.4.0-alpha.3.tgz#e00e20f3e12b302b49c2fecc336faa6a05639462" + integrity sha512-xdla7hi2WzLFIdAx2/ihRZ/bKlKcgDDabTJGtoqp1E5oqhLM1PzTXsJE0p7tW8+ebrvxiMGfbgMAWnU3f2ZAIQ== + thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" @@ -5892,6 +6053,11 @@ tippy.js@^6.3.7: dependencies: "@popperjs/core" "^2.9.0" +tkms@^0.12.0: + version "0.12.5" + resolved "https://registry.yarnpkg.com/tkms/-/tkms-0.12.5.tgz#1a48db4f83bcca049b9a2970aa00dca5765050f3" + integrity sha512-FuZYwBGEmdDAQ8S4mmq0o9SBhNQWczqOTX8L+lHLmPcLT7KCLlof6jYyXlp2/8IIFLnZ4gwEzLeWBYaW05q3AA== + tmp@0.0.33, tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -5955,6 +6121,11 @@ ts-node@^10.4.0, ts-node@^10.9.2: v8-compile-cache-lib "^3.0.1" yn "3.1.1" +tslib@2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01" + integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA== + tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -6031,6 +6202,11 @@ uncrypto@^0.1.3: resolved "https://registry.yarnpkg.com/uncrypto/-/uncrypto-0.1.3.tgz#e1288d609226f2d02d8d69ee861fa20d8348ef2b" integrity sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q== +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + undici-types@~6.21.0: version "6.21.0" resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" @@ -6114,6 +6290,11 @@ vary@^1, vary@^1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== +wasm-feature-detect@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/wasm-feature-detect/-/wasm-feature-detect-1.8.0.tgz#4e9f55b0a64d801f372fbb0324ed11ad3abd0c78" + integrity sha512-zksaLKM2fVlnB5jQQDqKXXwYHLQUVH9es+5TOOHwGOVJOCeRBCiPjwSg+3tN2AdTCzjgli4jijCH290kXb/zWQ== + webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -6209,6 +6390,11 @@ write-file-atomic@^6.0.0: imurmurhash "^0.1.4" signal-exit "^4.0.1" +ws@8.17.1: + version "8.17.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b" + integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ== + ws@^7.4.3, ws@^7.4.6: version "7.5.10" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"