From dcb98fa99eec727c919b46eddadd439dd796ab14 Mon Sep 17 00:00:00 2001 From: buffalu <85544055+buffalu@users.noreply.github.com> Date: Sat, 27 Jan 2024 15:17:02 -0600 Subject: [PATCH] Fix versioning and add LICENSE file (#101) --- Cargo.lock | 14 +-- Cargo.toml | 22 ++-- LICENSE.txt | 177 +++++++++++++++++++++++++++++++++ block_engine/Cargo.toml | 9 +- core/Cargo.toml | 11 +- jito-protos/Cargo.toml | 8 +- relayer/Cargo.toml | 11 +- rpc/Cargo.toml | 11 +- transaction-relayer/Cargo.toml | 11 +- web/Cargo.toml | 11 +- 10 files changed, 240 insertions(+), 45 deletions(-) create mode 100644 LICENSE.txt diff --git a/Cargo.lock b/Cargo.lock index f1b2880f4e1215..758c6061b23e75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2460,7 +2460,7 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jito-block-engine" -version = "0.1.0" +version = "0.1.3" dependencies = [ "cached", "dashmap 5.5.3", @@ -2480,7 +2480,7 @@ dependencies = [ [[package]] name = "jito-core" -version = "0.1.0" +version = "0.1.3" dependencies = [ "bincode", "crossbeam-channel", @@ -2506,7 +2506,7 @@ dependencies = [ [[package]] name = "jito-protos" -version = "0.1.0" +version = "0.1.3" dependencies = [ "bytes", "prost 0.12.3", @@ -2520,7 +2520,7 @@ dependencies = [ [[package]] name = "jito-relayer" -version = "0.1.0" +version = "0.1.3" dependencies = [ "chrono", "crossbeam-channel", @@ -2551,7 +2551,7 @@ dependencies = [ [[package]] name = "jito-relayer-web" -version = "0.1.0" +version = "0.1.3" dependencies = [ "axum 0.5.17", "jito-relayer", @@ -2565,7 +2565,7 @@ dependencies = [ [[package]] name = "jito-rpc" -version = "0.1.0" +version = "0.1.3" dependencies = [ "crossbeam-channel", "dashmap 5.5.3", @@ -2577,7 +2577,7 @@ dependencies = [ [[package]] name = "jito-transaction-relayer" -version = "0.1.0" +version = "0.1.3" dependencies = [ "bincode", "clap 4.4.8", diff --git a/Cargo.toml b/Cargo.toml index 69540d3570c579..a01e6141b8e7df 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [ "block_engine", "core", "jito-protos", -# "packet_blaster", // TODO (LB): fix + # "packet_blaster", // TODO (LB): fix "relayer", "rpc", "transaction-relayer", @@ -11,6 +11,14 @@ members = [ ] resolver = "1" +[workspace.package] +version = "0.1.3" +authors = ["Jito Network "] +repository = "https://github.com/jito-foundation/jito-relayer" +homepage = "https://jito.network/" +license = "Apache-2.0" +edition = "2021" + [workspace.dependencies] axum = "0.5.17" bincode = "1.3.3" @@ -26,12 +34,12 @@ futures-util = "0.3" histogram = "0.6.9" hostname = "0.3" itertools = "0.10.5" -jito-block-engine = { path = "block_engine" } -jito-core = { path = "core" } -jito-protos = { path = "jito-protos" } -jito-relayer = { path = "relayer" } -jito-relayer-web = { path = "web" } -jito-rpc = { path = "rpc" } +jito-block-engine = { path = "block_engine", version = "=0.1.3" } +jito-core = { path = "core", version = "=0.1.3" } +jito-protos = { path = "jito-protos", version = "=0.1.3" } +jito-relayer = { path = "relayer", version = "=0.1.3" } +jito-relayer-web = { path = "web", version = "=0.1.3" } +jito-rpc = { path = "rpc", version = "=0.1.3" } jwt = { version = "0.16.0", features = ["openssl"] } keyed_priority_queue = "0.4.1" lazy_static = "1.4.0" diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000000000..f433b1a53f5b83 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS diff --git a/block_engine/Cargo.toml b/block_engine/Cargo.toml index 1a5d9675f5791c..936f1f7494bde2 100644 --- a/block_engine/Cargo.toml +++ b/block_engine/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "jito-block-engine" -version = "0.1.0" description = "Relayer Block Engine Client" -authors = ["Jito Team "] -homepage = "https://jito.wtf/" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +homepage = { workspace = true } +edition = { workspace = true } +license = { workspace = true } publish = false [dependencies] diff --git a/core/Cargo.toml b/core/Cargo.toml index c7cf8a236bb4b4..1bfd62df4dbac7 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "jito-core" -version = "0.1.0" -description = "Core Code" -authors = ["Jito Team "] -homepage = "https://jito.wtf/" -edition = "2021" +description = "Jito relayer core code" +version = { workspace = true } +authors = { workspace = true } +homepage = { workspace = true } +edition = { workspace = true } +license = { workspace = true } publish = false [dependencies] diff --git a/jito-protos/Cargo.toml b/jito-protos/Cargo.toml index 0d29b1e8b90573..0a3ec9016c0b03 100644 --- a/jito-protos/Cargo.toml +++ b/jito-protos/Cargo.toml @@ -1,7 +1,11 @@ [package] name = "jito-protos" -version = "0.1.0" -edition = "2021" +description = "Jito relayer protobuf code" +version = { workspace = true } +authors = { workspace = true } +homepage = { workspace = true } +edition = { workspace = true } +license = { workspace = true } publish = false [dependencies] diff --git a/relayer/Cargo.toml b/relayer/Cargo.toml index 5c3250dc36e472..0f2c25a7a1b31f 100644 --- a/relayer/Cargo.toml +++ b/relayer/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "jito-relayer" -version = "0.1.0" -description = "Relayer GRPC server" -authors = ["Jito Team "] -homepage = "https://jito.wtf/" -edition = "2021" +description = "Jito relayer code" +version = { workspace = true } +authors = { workspace = true } +homepage = { workspace = true } +edition = { workspace = true } +license = { workspace = true } publish = false [dependencies] diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 63dd086d41331b..1122f176e43f67 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "jito-rpc" -version = "0.1.0" -description = "Code to communicate with RPC servers" -authors = ["Jito Team "] -homepage = "https://jito.wtf/" -edition = "2021" +description = "Jito relayer RPC code" +version = { workspace = true } +authors = { workspace = true } +homepage = { workspace = true } +edition = { workspace = true } +license = { workspace = true } publish = false [dependencies] diff --git a/transaction-relayer/Cargo.toml b/transaction-relayer/Cargo.toml index ff1edf34c3cf43..e43e3091887307 100644 --- a/transaction-relayer/Cargo.toml +++ b/transaction-relayer/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "jito-transaction-relayer" -version = "0.1.0" -description = "Solana Transaction Relayer" -authors = ["Jito Team "] -homepage = "https://jito.wtf/" -edition = "2021" +description = "Jito relayer entrypoint" +version = { workspace = true } +authors = { workspace = true } +homepage = { workspace = true } +edition = { workspace = true } +license = { workspace = true } publish = false [dependencies] diff --git a/web/Cargo.toml b/web/Cargo.toml index d73f162a73cd82..f8f2f7a3c6371b 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "jito-relayer-web" -version = "0.1.0" -description = "Transaction relayer web server" -authors = ["Jito Team "] -homepage = "https://jito.wtf/" -edition = "2021" +description = "Jito relayer web server" +version = { workspace = true } +authors = { workspace = true } +homepage = { workspace = true } +edition = { workspace = true } +license = { workspace = true } publish = false [dependencies]