diff --git a/LICENSE b/LICENSE index f288702..950b309 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,21 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 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 General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is 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. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - 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. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - 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 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. Use with the GNU Affero General Public License. - - 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 Affero 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 special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU 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 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 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 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 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - 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 GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +MIT License + +Copyright (c) Giants Village + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 7de4a3e..4af0893 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,10 @@ Event listeners can be set for login/logout events. ```typescript import {WalletConnectProviderFactory} from "@elrond-giants/erdjs-auth"; -const provider = new WalletConnectProviderFactory("devnet").createProvider(); +const provider = new WalletConnectProviderFactory({ + chainId: "D", + projectId: "yourProjectId" +}).createProvider(); provider.on( "login", diff --git a/package-lock.json b/package-lock.json index 2609ccd..9906c9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,14 +7,14 @@ "": { "name": "@elrond-giants/erdjs-auth", "version": "0.8.0", - "license": "GPL-3.0-or-later", + "license": "MIT", "dependencies": { - "@multiversx/sdk-core": "^12.6.0", + "@multiversx/sdk-core": "^12.8.0", "@multiversx/sdk-extension-provider": "^3.0.0", - "@multiversx/sdk-hw-provider": "^3.0.3", + "@multiversx/sdk-hw-provider": "^6.4.0", "@multiversx/sdk-wallet": "^4.2.0", "@multiversx/sdk-wallet-connect-provider": "^4.0.2", - "@multiversx/sdk-web-wallet-provider": "^3.0.0", + "@multiversx/sdk-web-wallet-provider": "^3.1.0", "tslib": "^2.4.0" }, "devDependencies": { @@ -23,116 +23,89 @@ } }, "node_modules/@ledgerhq/devices": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-7.0.6.tgz", - "integrity": "sha512-trEqJqgXuXLgb228c6kJdur0idTVxtofy8NxumvsspZKh5x/pHJX8EoNxWX91Pg7H3AA+jxLEeRvAjNDVDJgGQ==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.3.tgz", + "integrity": "sha512-Q7/vqkGELSBuwFafFoTqlHIRyOjw8JqbSgiQwe2R38xN0RKtKIh+5E6UfMKyoExiq+SrQg0IC8P2LS+XdjOHLw==", "dependencies": { - "@ledgerhq/errors": "^6.12.2", + "@ledgerhq/errors": "^6.12.6", "@ledgerhq/logs": "^6.10.1", "rxjs": "6", "semver": "^7.3.5" } }, "node_modules/@ledgerhq/errors": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.12.2.tgz", - "integrity": "sha512-qYTkxlWHVItxPAb9pQewfVoN8nFvvFYzWEyzVRX/NuO/g3JKL5kef5lLuqTtUIFOvFROMLi3EBxU+vbvV0ktow==" + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.12.6.tgz", + "integrity": "sha512-D+r2B09vaRO06wfGoss+rNgwqWSoK0bCtsaJWzlD2hv1zxTtucqVtSztbRFypIqxWTCb3ix5Nh2dWHEJVTp2Xw==" }, "node_modules/@ledgerhq/hw-transport": { - "version": "6.27.9", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.27.9.tgz", - "integrity": "sha512-Po0eFWyH3C6I5oxLW3t/jtjqFJdF6/zmF9WL3n5lvSVbtmilPGz2IFOwHoz/XWSwM4PLwV6JXgFBIC6h6UNn/Q==", + "version": "6.28.4", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.4.tgz", + "integrity": "sha512-fB2H92YQjidmae2GFCmOGPwkZWk0lvTu0tlLlzfiY0wRheAG+DEgjnqhdU8wmydkPLIj0WUjRgldtnJtg/a2iQ==", "dependencies": { - "@ledgerhq/devices": "^7.0.6", - "@ledgerhq/errors": "^6.12.2", + "@ledgerhq/devices": "^8.0.3", + "@ledgerhq/errors": "^6.12.6", "events": "^3.3.0" } }, - "node_modules/@ledgerhq/hw-transport-u2f": { - "version": "5.36.0-deprecated", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-5.36.0-deprecated.tgz", - "integrity": "sha512-T/+mGHIiUK/ZQATad6DMDmobCMZ1mVST952009jKzhaE1Et2Uy2secU+QhRkx3BfEAkvwa0zSRSYCL9d20Iqjg==", - "deprecated": "@ledgerhq/hw-transport-u2f is deprecated. Please use @ledgerhq/hw-transport-webusb or @ledgerhq/hw-transport-webhid. https://github.com/LedgerHQ/ledgerjs/blob/master/docs/migrate_webusb.md", + "node_modules/@ledgerhq/hw-transport-web-ble": { + "version": "6.27.17", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-web-ble/-/hw-transport-web-ble-6.27.17.tgz", + "integrity": "sha512-OoKbImhgyi43F6PM2KAJfViW+oEmZ3M8Tq9XZ0X57oL6QCQUYv6FakEFFkZzNuNWFdtFKGPgNt6xygqIdNElEQ==", "dependencies": { - "@ledgerhq/errors": "^5.34.0", - "@ledgerhq/hw-transport": "^5.34.0", - "@ledgerhq/logs": "^5.30.0", - "u2f-api": "0.2.7" + "@ledgerhq/devices": "^8.0.5", + "@ledgerhq/errors": "^6.13.0", + "@ledgerhq/hw-transport": "^6.28.6", + "@ledgerhq/logs": "^6.10.1", + "rxjs": "6" } }, - "node_modules/@ledgerhq/hw-transport-u2f/node_modules/@ledgerhq/devices": { - "version": "5.51.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.51.1.tgz", - "integrity": "sha512-4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA==", + "node_modules/@ledgerhq/hw-transport-web-ble/node_modules/@ledgerhq/devices": { + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.7.tgz", + "integrity": "sha512-BbPyET52lXnVs7CxJWrGYqmtGdbGzj+XnfCqLsDnA7QYr1CZREysxmie+Rr6BKpNDBRVesAovXjtaVaZOn+upw==", "dependencies": { - "@ledgerhq/errors": "^5.50.0", - "@ledgerhq/logs": "^5.50.0", + "@ledgerhq/errors": "^6.14.0", + "@ledgerhq/logs": "^6.10.1", "rxjs": "6", "semver": "^7.3.5" } }, - "node_modules/@ledgerhq/hw-transport-u2f/node_modules/@ledgerhq/errors": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.50.0.tgz", - "integrity": "sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow==" + "node_modules/@ledgerhq/hw-transport-web-ble/node_modules/@ledgerhq/errors": { + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.14.0.tgz", + "integrity": "sha512-ZWJw2Ti6Dq1Ott/+qYqJdDWeZm16qI3VNG5rFlb0TQ3UcAyLIQZbnnzzdcVVwVeZiEp66WIpINd/pBdqsHVyOA==" }, - "node_modules/@ledgerhq/hw-transport-u2f/node_modules/@ledgerhq/hw-transport": { - "version": "5.51.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz", - "integrity": "sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw==", + "node_modules/@ledgerhq/hw-transport-web-ble/node_modules/@ledgerhq/hw-transport": { + "version": "6.28.8", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.8.tgz", + "integrity": "sha512-XxQVl4htd018u/M66r0iu5nlHi+J6QfdPsORzDF6N39jaz+tMqItb7tUlXM/isggcuS5lc7GJo7NOuJ8rvHZaQ==", "dependencies": { - "@ledgerhq/devices": "^5.51.1", - "@ledgerhq/errors": "^5.50.0", + "@ledgerhq/devices": "^8.0.7", + "@ledgerhq/errors": "^6.14.0", "events": "^3.3.0" } }, - "node_modules/@ledgerhq/hw-transport-u2f/node_modules/@ledgerhq/logs": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.50.0.tgz", - "integrity": "sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA==" - }, "node_modules/@ledgerhq/hw-transport-webhid": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.11.2.tgz", - "integrity": "sha512-y/Cv2oRDXy0wsGQsSrNi6e8DziGRNbgTiW7dgXcenI/1RfsCN+2hPfNMr8a9s2zPJ8Tfv2Sm5VubbspWDhPUCQ==", + "version": "6.27.15", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.27.15.tgz", + "integrity": "sha512-xhtFy/SNttvBna8t1ZiP74K6Lj8uDhp0W+Zjvwz4IS6tS9gWZbKUB7scbrNrJep6Q77Of1bzDXrswyaoxFZrUg==", "dependencies": { - "@ledgerhq/devices": "^6.11.2", - "@ledgerhq/errors": "^6.10.0", - "@ledgerhq/hw-transport": "^6.11.2", - "@ledgerhq/logs": "^6.10.0" - } - }, - "node_modules/@ledgerhq/hw-transport-webhid/node_modules/@ledgerhq/devices": { - "version": "6.27.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-6.27.1.tgz", - "integrity": "sha512-jX++oy89jtv7Dp2X6gwt3MMkoajel80JFWcdc0HCouwDsV1mVJ3SQdwl/bQU0zd8HI6KebvUP95QTwbQLLK/RQ==", - "dependencies": { - "@ledgerhq/errors": "^6.10.0", - "@ledgerhq/logs": "^6.10.0", - "rxjs": "6", - "semver": "^7.3.5" + "@ledgerhq/devices": "^8.0.3", + "@ledgerhq/errors": "^6.12.6", + "@ledgerhq/hw-transport": "^6.28.4", + "@ledgerhq/logs": "^6.10.1" } }, "node_modules/@ledgerhq/hw-transport-webusb": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.11.2.tgz", - "integrity": "sha512-ReiYoypXybLQi1ekA+YQqsvbSj0wwTFH7Lg690eUkqZydjDd4lMjpZk7lDczsXp3wxTjE/mdAQ0bpNwZWmPTJw==", + "version": "6.27.15", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.27.15.tgz", + "integrity": "sha512-XRteQmJMFbMETOwwwJrXhEvBEdu1DpuDQNI04bzMQE9p81rLjwd6pIhfP/W1O94av7Iq4kaatNsNpxkitmp59w==", "dependencies": { - "@ledgerhq/devices": "^6.11.2", - "@ledgerhq/errors": "^6.10.0", - "@ledgerhq/hw-transport": "^6.11.2", - "@ledgerhq/logs": "^6.10.0" - } - }, - "node_modules/@ledgerhq/hw-transport-webusb/node_modules/@ledgerhq/devices": { - "version": "6.27.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-6.27.1.tgz", - "integrity": "sha512-jX++oy89jtv7Dp2X6gwt3MMkoajel80JFWcdc0HCouwDsV1mVJ3SQdwl/bQU0zd8HI6KebvUP95QTwbQLLK/RQ==", - "dependencies": { - "@ledgerhq/errors": "^6.10.0", - "@ledgerhq/logs": "^6.10.0", - "rxjs": "6", - "semver": "^7.3.5" + "@ledgerhq/devices": "^8.0.3", + "@ledgerhq/errors": "^6.12.6", + "@ledgerhq/hw-transport": "^6.28.4", + "@ledgerhq/logs": "^6.10.1" } }, "node_modules/@ledgerhq/logs": { @@ -149,9 +122,9 @@ } }, "node_modules/@multiversx/sdk-core": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/@multiversx/sdk-core/-/sdk-core-12.6.0.tgz", - "integrity": "sha512-aJjSn8EzaYXalUuvAuxOTPtv8GDbimJlSYNRLjCsToyfwGAyS9cRllmq2d1I2nlrR89YgAsOL9qp+sI5DA7yBw==", + "version": "12.8.0", + "resolved": "https://registry.npmjs.org/@multiversx/sdk-core/-/sdk-core-12.8.0.tgz", + "integrity": "sha512-+XtnwQ/dUaXrpu/GCNud7r5AaQtNKRVqeKnjVUoKKHr14ohXbg9FW2Xx7IrJvehEMupjdx+6phR+nAXR60bIbQ==", "dependencies": { "@multiversx/sdk-transaction-decoder": "1.0.2", "bech32": "1.1.4", @@ -186,18 +159,21 @@ } }, "node_modules/@multiversx/sdk-hw-provider": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@multiversx/sdk-hw-provider/-/sdk-hw-provider-3.0.3.tgz", - "integrity": "sha512-YGPiwnhMN/Eq05KjbbVvT+vOsNgQ4JUsQZVS8y0gc4V/dXe8Ud+Rw4loMJj1uSUiTNjTJA3bjnFPgIiK3a+VZA==", - "dependencies": { - "@ledgerhq/devices": "7.0.6", - "@ledgerhq/errors": "6.12.2", - "@ledgerhq/hw-transport": "6.27.9", - "@ledgerhq/hw-transport-u2f": "5.36.0-deprecated", - "@ledgerhq/hw-transport-webhid": "6.11.2", - "@ledgerhq/hw-transport-webusb": "6.11.2", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@multiversx/sdk-hw-provider/-/sdk-hw-provider-6.4.0.tgz", + "integrity": "sha512-o+iO64U7gi3oqQHIaCNWoOCarrOQyjXEq7kEsWg/HXJOANpc+lq4GiXPtBkN5mOwPoj/UlEk1HfxA+54mTCFNQ==", + "dependencies": { + "@ledgerhq/devices": "8.0.3", + "@ledgerhq/errors": "6.12.6", + "@ledgerhq/hw-transport": "6.28.4", + "@ledgerhq/hw-transport-web-ble": "6.27.17", + "@ledgerhq/hw-transport-webhid": "6.27.15", + "@ledgerhq/hw-transport-webusb": "6.27.15", "buffer": "6.0.3", "platform": "1.3.6" + }, + "peerDependencies": { + "@multiversx/sdk-core": ">= 12.5.0" } }, "node_modules/@multiversx/sdk-transaction-decoder": { @@ -246,9 +222,9 @@ } }, "node_modules/@multiversx/sdk-web-wallet-provider": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@multiversx/sdk-web-wallet-provider/-/sdk-web-wallet-provider-3.0.0.tgz", - "integrity": "sha512-JzyOJJKx+vr1kMRHwVx6Y/SBSo/yUeWAHPeUJtvmjyRrTEhniYUhuKgy6U8lkD4djLKf8G/qpUOXwvfu4fbXuw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@multiversx/sdk-web-wallet-provider/-/sdk-web-wallet-provider-3.1.0.tgz", + "integrity": "sha512-gIE7AudJl5Ax64AMAD0o6m0cVi+dI5LW2TSM5M9K7zKMWWCflhv27a2A61JkCIQ6CK5OTIkMXaFb61OzUqhplQ==", "dependencies": { "qs": "6.10.3" }, @@ -1490,9 +1466,9 @@ "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==" }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -1604,11 +1580,6 @@ "node": ">=4.2.0" } }, - "node_modules/u2f-api": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/u2f-api/-/u2f-api-0.2.7.tgz", - "integrity": "sha512-fqLNg8vpvLOD5J/z4B6wpPg4Lvowz1nJ9xdHcCzdUPKcFE/qNCceV2gNZxSJd5vhAZemHr/K/hbzVA0zxB5mkg==" - }, "node_modules/uint8arrays": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-3.1.1.tgz", @@ -1663,121 +1634,91 @@ }, "dependencies": { "@ledgerhq/devices": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-7.0.6.tgz", - "integrity": "sha512-trEqJqgXuXLgb228c6kJdur0idTVxtofy8NxumvsspZKh5x/pHJX8EoNxWX91Pg7H3AA+jxLEeRvAjNDVDJgGQ==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.3.tgz", + "integrity": "sha512-Q7/vqkGELSBuwFafFoTqlHIRyOjw8JqbSgiQwe2R38xN0RKtKIh+5E6UfMKyoExiq+SrQg0IC8P2LS+XdjOHLw==", "requires": { - "@ledgerhq/errors": "^6.12.2", + "@ledgerhq/errors": "^6.12.6", "@ledgerhq/logs": "^6.10.1", "rxjs": "6", "semver": "^7.3.5" } }, "@ledgerhq/errors": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.12.2.tgz", - "integrity": "sha512-qYTkxlWHVItxPAb9pQewfVoN8nFvvFYzWEyzVRX/NuO/g3JKL5kef5lLuqTtUIFOvFROMLi3EBxU+vbvV0ktow==" + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.12.6.tgz", + "integrity": "sha512-D+r2B09vaRO06wfGoss+rNgwqWSoK0bCtsaJWzlD2hv1zxTtucqVtSztbRFypIqxWTCb3ix5Nh2dWHEJVTp2Xw==" }, "@ledgerhq/hw-transport": { - "version": "6.27.9", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.27.9.tgz", - "integrity": "sha512-Po0eFWyH3C6I5oxLW3t/jtjqFJdF6/zmF9WL3n5lvSVbtmilPGz2IFOwHoz/XWSwM4PLwV6JXgFBIC6h6UNn/Q==", + "version": "6.28.4", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.4.tgz", + "integrity": "sha512-fB2H92YQjidmae2GFCmOGPwkZWk0lvTu0tlLlzfiY0wRheAG+DEgjnqhdU8wmydkPLIj0WUjRgldtnJtg/a2iQ==", "requires": { - "@ledgerhq/devices": "^7.0.6", - "@ledgerhq/errors": "^6.12.2", + "@ledgerhq/devices": "^8.0.3", + "@ledgerhq/errors": "^6.12.6", "events": "^3.3.0" } }, - "@ledgerhq/hw-transport-u2f": { - "version": "5.36.0-deprecated", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-5.36.0-deprecated.tgz", - "integrity": "sha512-T/+mGHIiUK/ZQATad6DMDmobCMZ1mVST952009jKzhaE1Et2Uy2secU+QhRkx3BfEAkvwa0zSRSYCL9d20Iqjg==", + "@ledgerhq/hw-transport-web-ble": { + "version": "6.27.17", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-web-ble/-/hw-transport-web-ble-6.27.17.tgz", + "integrity": "sha512-OoKbImhgyi43F6PM2KAJfViW+oEmZ3M8Tq9XZ0X57oL6QCQUYv6FakEFFkZzNuNWFdtFKGPgNt6xygqIdNElEQ==", "requires": { - "@ledgerhq/errors": "^5.34.0", - "@ledgerhq/hw-transport": "^5.34.0", - "@ledgerhq/logs": "^5.30.0", - "u2f-api": "0.2.7" + "@ledgerhq/devices": "^8.0.5", + "@ledgerhq/errors": "^6.13.0", + "@ledgerhq/hw-transport": "^6.28.6", + "@ledgerhq/logs": "^6.10.1", + "rxjs": "6" }, "dependencies": { "@ledgerhq/devices": { - "version": "5.51.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.51.1.tgz", - "integrity": "sha512-4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA==", + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-8.0.7.tgz", + "integrity": "sha512-BbPyET52lXnVs7CxJWrGYqmtGdbGzj+XnfCqLsDnA7QYr1CZREysxmie+Rr6BKpNDBRVesAovXjtaVaZOn+upw==", "requires": { - "@ledgerhq/errors": "^5.50.0", - "@ledgerhq/logs": "^5.50.0", + "@ledgerhq/errors": "^6.14.0", + "@ledgerhq/logs": "^6.10.1", "rxjs": "6", "semver": "^7.3.5" } }, "@ledgerhq/errors": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.50.0.tgz", - "integrity": "sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow==" + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.14.0.tgz", + "integrity": "sha512-ZWJw2Ti6Dq1Ott/+qYqJdDWeZm16qI3VNG5rFlb0TQ3UcAyLIQZbnnzzdcVVwVeZiEp66WIpINd/pBdqsHVyOA==" }, "@ledgerhq/hw-transport": { - "version": "5.51.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz", - "integrity": "sha512-6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw==", + "version": "6.28.8", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.28.8.tgz", + "integrity": "sha512-XxQVl4htd018u/M66r0iu5nlHi+J6QfdPsORzDF6N39jaz+tMqItb7tUlXM/isggcuS5lc7GJo7NOuJ8rvHZaQ==", "requires": { - "@ledgerhq/devices": "^5.51.1", - "@ledgerhq/errors": "^5.50.0", + "@ledgerhq/devices": "^8.0.7", + "@ledgerhq/errors": "^6.14.0", "events": "^3.3.0" } - }, - "@ledgerhq/logs": { - "version": "5.50.0", - "resolved": "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.50.0.tgz", - "integrity": "sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA==" } } }, "@ledgerhq/hw-transport-webhid": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.11.2.tgz", - "integrity": "sha512-y/Cv2oRDXy0wsGQsSrNi6e8DziGRNbgTiW7dgXcenI/1RfsCN+2hPfNMr8a9s2zPJ8Tfv2Sm5VubbspWDhPUCQ==", - "requires": { - "@ledgerhq/devices": "^6.11.2", - "@ledgerhq/errors": "^6.10.0", - "@ledgerhq/hw-transport": "^6.11.2", - "@ledgerhq/logs": "^6.10.0" - }, - "dependencies": { - "@ledgerhq/devices": { - "version": "6.27.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-6.27.1.tgz", - "integrity": "sha512-jX++oy89jtv7Dp2X6gwt3MMkoajel80JFWcdc0HCouwDsV1mVJ3SQdwl/bQU0zd8HI6KebvUP95QTwbQLLK/RQ==", - "requires": { - "@ledgerhq/errors": "^6.10.0", - "@ledgerhq/logs": "^6.10.0", - "rxjs": "6", - "semver": "^7.3.5" - } - } + "version": "6.27.15", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-6.27.15.tgz", + "integrity": "sha512-xhtFy/SNttvBna8t1ZiP74K6Lj8uDhp0W+Zjvwz4IS6tS9gWZbKUB7scbrNrJep6Q77Of1bzDXrswyaoxFZrUg==", + "requires": { + "@ledgerhq/devices": "^8.0.3", + "@ledgerhq/errors": "^6.12.6", + "@ledgerhq/hw-transport": "^6.28.4", + "@ledgerhq/logs": "^6.10.1" } }, "@ledgerhq/hw-transport-webusb": { - "version": "6.11.2", - "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.11.2.tgz", - "integrity": "sha512-ReiYoypXybLQi1ekA+YQqsvbSj0wwTFH7Lg690eUkqZydjDd4lMjpZk7lDczsXp3wxTjE/mdAQ0bpNwZWmPTJw==", - "requires": { - "@ledgerhq/devices": "^6.11.2", - "@ledgerhq/errors": "^6.10.0", - "@ledgerhq/hw-transport": "^6.11.2", - "@ledgerhq/logs": "^6.10.0" - }, - "dependencies": { - "@ledgerhq/devices": { - "version": "6.27.1", - "resolved": "https://registry.npmjs.org/@ledgerhq/devices/-/devices-6.27.1.tgz", - "integrity": "sha512-jX++oy89jtv7Dp2X6gwt3MMkoajel80JFWcdc0HCouwDsV1mVJ3SQdwl/bQU0zd8HI6KebvUP95QTwbQLLK/RQ==", - "requires": { - "@ledgerhq/errors": "^6.10.0", - "@ledgerhq/logs": "^6.10.0", - "rxjs": "6", - "semver": "^7.3.5" - } - } + "version": "6.27.15", + "resolved": "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-6.27.15.tgz", + "integrity": "sha512-XRteQmJMFbMETOwwwJrXhEvBEdu1DpuDQNI04bzMQE9p81rLjwd6pIhfP/W1O94av7Iq4kaatNsNpxkitmp59w==", + "requires": { + "@ledgerhq/devices": "^8.0.3", + "@ledgerhq/errors": "^6.12.6", + "@ledgerhq/hw-transport": "^6.28.4", + "@ledgerhq/logs": "^6.10.1" } }, "@ledgerhq/logs": { @@ -1791,9 +1732,9 @@ "integrity": "sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw==" }, "@multiversx/sdk-core": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/@multiversx/sdk-core/-/sdk-core-12.6.0.tgz", - "integrity": "sha512-aJjSn8EzaYXalUuvAuxOTPtv8GDbimJlSYNRLjCsToyfwGAyS9cRllmq2d1I2nlrR89YgAsOL9qp+sI5DA7yBw==", + "version": "12.8.0", + "resolved": "https://registry.npmjs.org/@multiversx/sdk-core/-/sdk-core-12.8.0.tgz", + "integrity": "sha512-+XtnwQ/dUaXrpu/GCNud7r5AaQtNKRVqeKnjVUoKKHr14ohXbg9FW2Xx7IrJvehEMupjdx+6phR+nAXR60bIbQ==", "requires": { "@multiversx/sdk-transaction-decoder": "1.0.2", "bech32": "1.1.4", @@ -1824,16 +1765,16 @@ "requires": {} }, "@multiversx/sdk-hw-provider": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@multiversx/sdk-hw-provider/-/sdk-hw-provider-3.0.3.tgz", - "integrity": "sha512-YGPiwnhMN/Eq05KjbbVvT+vOsNgQ4JUsQZVS8y0gc4V/dXe8Ud+Rw4loMJj1uSUiTNjTJA3bjnFPgIiK3a+VZA==", - "requires": { - "@ledgerhq/devices": "7.0.6", - "@ledgerhq/errors": "6.12.2", - "@ledgerhq/hw-transport": "6.27.9", - "@ledgerhq/hw-transport-u2f": "5.36.0-deprecated", - "@ledgerhq/hw-transport-webhid": "6.11.2", - "@ledgerhq/hw-transport-webusb": "6.11.2", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@multiversx/sdk-hw-provider/-/sdk-hw-provider-6.4.0.tgz", + "integrity": "sha512-o+iO64U7gi3oqQHIaCNWoOCarrOQyjXEq7kEsWg/HXJOANpc+lq4GiXPtBkN5mOwPoj/UlEk1HfxA+54mTCFNQ==", + "requires": { + "@ledgerhq/devices": "8.0.3", + "@ledgerhq/errors": "6.12.6", + "@ledgerhq/hw-transport": "6.28.4", + "@ledgerhq/hw-transport-web-ble": "6.27.17", + "@ledgerhq/hw-transport-webhid": "6.27.15", + "@ledgerhq/hw-transport-webusb": "6.27.15", "buffer": "6.0.3", "platform": "1.3.6" } @@ -1883,9 +1824,9 @@ } }, "@multiversx/sdk-web-wallet-provider": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@multiversx/sdk-web-wallet-provider/-/sdk-web-wallet-provider-3.0.0.tgz", - "integrity": "sha512-JzyOJJKx+vr1kMRHwVx6Y/SBSo/yUeWAHPeUJtvmjyRrTEhniYUhuKgy6U8lkD4djLKf8G/qpUOXwvfu4fbXuw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@multiversx/sdk-web-wallet-provider/-/sdk-web-wallet-provider-3.1.0.tgz", + "integrity": "sha512-gIE7AudJl5Ax64AMAD0o6m0cVi+dI5LW2TSM5M9K7zKMWWCflhv27a2A61JkCIQ6CK5OTIkMXaFb61OzUqhplQ==", "requires": { "qs": "6.10.3" } @@ -2977,9 +2918,9 @@ "integrity": "sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==" }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -3063,11 +3004,6 @@ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, - "u2f-api": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/u2f-api/-/u2f-api-0.2.7.tgz", - "integrity": "sha512-fqLNg8vpvLOD5J/z4B6wpPg4Lvowz1nJ9xdHcCzdUPKcFE/qNCceV2gNZxSJd5vhAZemHr/K/hbzVA0zxB5mkg==" - }, "uint8arrays": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-3.1.1.tgz", diff --git a/package.json b/package.json index 972c548..6060b9d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@elrond-giants/erdjs-auth", - "version": "0.8.0", + "version": "0.9.0", "description": "Easy to use MultiversX typescript Auth Providers, with a common interface.", "main": "dist/index.js", "types": "dist/index.d.js", @@ -14,14 +14,14 @@ "MultiversX" ], "author": "ElrondGiants", - "license": "GPL-3.0-or-later", + "license": "MIT", "dependencies": { - "@multiversx/sdk-core": "^12.6.0", + "@multiversx/sdk-core": "^12.8.0", "@multiversx/sdk-extension-provider": "^3.0.0", - "@multiversx/sdk-hw-provider": "^3.0.3", + "@multiversx/sdk-hw-provider": "^6.4.0", "@multiversx/sdk-wallet": "^4.2.0", "@multiversx/sdk-wallet-connect-provider": "^4.0.2", - "@multiversx/sdk-web-wallet-provider": "^3.0.0", + "@multiversx/sdk-web-wallet-provider": "^3.1.0", "tslib": "^2.4.0" }, "devDependencies": { diff --git a/src/AuthProviders/LedgerProvider.ts b/src/AuthProviders/LedgerProvider.ts index bbca92c..dff1cf3 100644 --- a/src/AuthProviders/LedgerProvider.ts +++ b/src/AuthProviders/LedgerProvider.ts @@ -1,5 +1,4 @@ import { HWProvider } from '@multiversx/sdk-hw-provider'; - import { AuthProviderType, EventHandler, EventType, @@ -69,7 +68,7 @@ export class LedgerProvider implements IAuthProvider { token, }); this.address = address; - this.signature = signature.hex(); + this.signature = signature.toString("hex"); } else { this.address = await this.provider.login({ addressIndex: this.addressIndex }); } diff --git a/src/Factories/PemProviderFactory.ts b/src/Factories/PemProviderFactory.ts index 2ac537a..0d39b44 100644 --- a/src/Factories/PemProviderFactory.ts +++ b/src/Factories/PemProviderFactory.ts @@ -3,10 +3,7 @@ import { IAuthProvider, IAuthProviderFactory } from '../types'; import EventsBus from "../EventBus"; export class PemProviderFactory implements IAuthProviderFactory { - private readonly walletPemKey: string; - constructor(walletPemKey: string) { - this.walletPemKey = walletPemKey; - } + constructor(private readonly walletPemKey: string) {} createProvider(): IAuthProvider { return new PemProvider(this.walletPemKey, new EventsBus()); } diff --git a/src/Factories/WalletConnectProviderFactory.ts b/src/Factories/WalletConnectProviderFactory.ts index 6b79a37..ac89617 100644 --- a/src/Factories/WalletConnectProviderFactory.ts +++ b/src/Factories/WalletConnectProviderFactory.ts @@ -1,20 +1,26 @@ import {WalletConnectV2Provider} from "@multiversx/sdk-wallet-connect-provider"; import {WalletConnectProvider} from '../AuthProviders'; -import {IAuthProvider, IAuthProviderFactory, INetworkConfig, NetworkEnv} from '../types'; -import {network} from "../network"; +import { + IAuthProvider, + IAuthProviderFactory, + WalletConnectProviderOptions +} from '../types'; import EventsBus from "../EventBus"; +import {getNetworkOptions} from "../utils/network"; -export class WalletConnectProviderFactory implements IAuthProviderFactory { - private networkOptions: INetworkConfig; - private readonly projectId: string; - constructor(env: NetworkEnv, projectId: string) { - this.networkOptions = network[env]; - this.projectId = projectId; +export class WalletConnectProviderFactory implements IAuthProviderFactory { + protected options: Required; + + constructor({chainId, projectId, relayAddress}: WalletConnectProviderOptions) { + if (!relayAddress) { + const networkOptions = getNetworkOptions(chainId); + relayAddress = networkOptions.relayAddress + } + this.options = {chainId, projectId, relayAddress}; } createProvider(): IAuthProvider { - let walletConnectProvider: WalletConnectProvider; const eventBus = new EventsBus(); const provider = new WalletConnectV2Provider( @@ -24,14 +30,12 @@ export class WalletConnectProviderFactory implements IAuthProviderFactory { onClientEvent: (event) => eventBus.emit(event.name, event.data), }, - this.networkOptions.chainId, - this.networkOptions.relayAddress, - this.projectId + this.options.chainId, + this.options.relayAddress, + this.options.projectId ); + return new WalletConnectProvider(provider, eventBus); - walletConnectProvider = new WalletConnectProvider(provider, eventBus); - - return walletConnectProvider; } } diff --git a/src/Factories/WebProviderFactory.ts b/src/Factories/WebProviderFactory.ts index 4798610..a78b121 100644 --- a/src/Factories/WebProviderFactory.ts +++ b/src/Factories/WebProviderFactory.ts @@ -1,23 +1,25 @@ import { WalletProvider } from '@multiversx/sdk-web-wallet-provider/out'; import { WebProvider } from '../AuthProviders'; -import {IAuthProvider, IAuthProviderFactory, IWebConnectionOptions, NetworkEnv} from '../types'; -import {network} from "../network"; +import { + IAuthProvider, + IAuthProviderFactory, + WebProviderOptions +} from '../types'; import EventsBus from "../EventBus"; +import {getNetworkOptions} from "../utils/network"; -export class WebProviderFactory implements IAuthProviderFactory { - private readonly networkAddress: string; - private connectionOptions: IWebConnectionOptions = {}; - private address: string | null = null; - - constructor(env: NetworkEnv) { - const networkOptions = network[env]; - this.networkAddress = networkOptions.walletAddress; - } - setConnectionOptions(value: IWebConnectionOptions) { - this.connectionOptions = value; - return this; +export class WebProviderFactory implements IAuthProviderFactory { + private address: string | null = null; + protected options: Required; + + constructor({chainId, walletAddress, networkOptions}: WebProviderOptions) { + if (!walletAddress) { + const options = getNetworkOptions(chainId); + walletAddress = options.walletAddress; + } + this.options = {chainId, walletAddress, networkOptions: networkOptions ?? {}}; } setAddress(value: string | null) { @@ -27,8 +29,13 @@ export class WebProviderFactory implements IAuthProviderFactory { } createProvider(): IAuthProvider { - const provider = new WalletProvider(this.networkAddress); - - return new WebProvider(provider, this.connectionOptions, new EventsBus(), this.address); + const provider = new WalletProvider(this.options.walletAddress); + + return new WebProvider( + provider, + this.options.networkOptions || {}, + new EventsBus(), + this.address + ); } } diff --git a/src/network.ts b/src/network.ts index d78b72c..a8156ab 100644 --- a/src/network.ts +++ b/src/network.ts @@ -13,7 +13,7 @@ export const network: { }, "devnet": { bridgeAddress: "https://bridge.walletconnect.org", - walletAddress: "https://devnet-wallet.multiversx.com/dapp/init", + walletAddress: "https://devnet2-wallet.multiversx.com/dapp/init", chainId: "D", relayAddress: "wss://relay.walletconnect.com" }, diff --git a/src/types/index.ts b/src/types/index.ts index 9896775..7a1f0bb 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -118,4 +118,24 @@ export type AuthToken = { address: string; body: string; signature: string; -} & DecodedLoginTokenType; \ No newline at end of file +} & DecodedLoginTokenType; + +export type NetworkOptions = { + chainId: string; + walletAddress?: string; + bridgeAddress?: string; + relayAddress?: string; + webConnectionOptions?: IWebConnectionOptions; +}; + +export type WebProviderOptions = { + chainId: string; + walletAddress?: string, + networkOptions?: IWebConnectionOptions +}; + +export type WalletConnectProviderOptions = { + chainId: string; + projectId: string; + relayAddress?: string; +} diff --git a/src/utils/network.ts b/src/utils/network.ts new file mode 100644 index 0000000..c0cb9ed --- /dev/null +++ b/src/utils/network.ts @@ -0,0 +1,12 @@ +import {INetworkConfig} from "../types"; +import {network} from "../network"; + +export const getNetworkOptions = (chainId: string): INetworkConfig => { + const networkOptions = Object.values(network) + .find((network) => network.chainId === chainId); + if (!networkOptions) { + throw new Error(`Unknown chainId: ${chainId}`); + } + + return networkOptions; +} \ No newline at end of file