From 1ac264600a01784044483ca5fed03aa2cf2325d8 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 28 Aug 2020 12:17:47 +0200 Subject: [PATCH 1/8] set linux path explicitly --- src/main/java/com/sparrowwallet/sparrow/io/Hwi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java b/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java index 6e5c45be..9b65c609 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java @@ -217,7 +217,7 @@ public class Hwi { inputStream = Hwi.class.getResourceAsStream("/external/windows/hwi.exe"); tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null); } else { - inputStream = Hwi.class.getResourceAsStream("/external/" + platform.getPlatformId().toLowerCase() + "/hwi"); + inputStream = Hwi.class.getResourceAsStream("/external/linux/hwi"); tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable)); } From 1fea119173f3336fe215313bee420ed30075b1f2 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 28 Aug 2020 13:31:27 +0200 Subject: [PATCH 2/8] shorten button width --- .../sparrow/control/MnemonicKeystoreImportPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java index 026bf2eb..7fdef600 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java @@ -81,7 +81,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane { private void createEnterMnemonicButton() { enterMnemonicButton = new SplitMenuButton(); enterMnemonicButton.setAlignment(Pos.CENTER_RIGHT); - enterMnemonicButton.setText("Set Words Length"); + enterMnemonicButton.setText("Set Words Size"); enterMnemonicButton.setOnAction(event -> { enterMnemonic(24); }); From d1fbe94d90648964808996857a91198e4dbadcf8 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 28 Aug 2020 14:41:26 +0200 Subject: [PATCH 3/8] welcome page tweak --- .../com/sparrowwallet/sparrow/control/WelcomeDialog.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java index 28814d80..49d181a3 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WelcomeDialog.java @@ -15,8 +15,8 @@ import org.controlsfx.control.ToggleSwitch; public class WelcomeDialog extends Dialog { private static final String[] ELECTRUM_SERVERS = new String[]{ "ElectrumX (Recommended)", "https://github.com/spesmilo/electrumx", - "electrs", "https://github.com/romanz/electrs", - "esplora-electrs", "https://github.com/Blockstream/electrs"}; + "electrs (Experimental)", "https://github.com/romanz/electrs", + "esplora-electrs (Experimental)", "https://github.com/Blockstream/electrs"}; private final HostServices hostServices; @@ -71,7 +71,8 @@ public class WelcomeDialog extends Dialog { } private HyperlinkLabel createBulletedLink(String name, String url) { - HyperlinkLabel label = new HyperlinkLabel(" \u2022 [" + name + "]"); + String[] nameParts = name.split(" "); + HyperlinkLabel label = new HyperlinkLabel(" \u2022 [" + nameParts[0] + "] " + (nameParts.length > 1 ? nameParts[1] : "")); label.setOnAction(event -> { hostServices.showDocument(url); }); From 06957b12e6626c15e053d1b7099e58b761f14014 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 28 Aug 2020 14:42:38 +0200 Subject: [PATCH 4/8] build ubuntu --- .github/workflows/package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml index 710eebd4..49b4773a 100644 --- a/.github/workflows/package.yaml +++ b/.github/workflows/package.yaml @@ -7,7 +7,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest] + os: [windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 with: From c9a4fb4ec446b08f14eb34186e7e2675099f8056 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 28 Aug 2020 15:20:31 +0200 Subject: [PATCH 5/8] license --- LICENSE | 190 ++++++++++++++++++++++++++++++++++++++++++++++----- build.gradle | 6 +- drongo | 2 +- 3 files changed, 177 insertions(+), 21 deletions(-) diff --git a/LICENSE b/LICENSE index cd10e92c..f433b1a5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,19 +1,177 @@ -Copyright (c) 2020 Craig Raw -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: + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -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. + 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/build.gradle b/build.gradle index 398ef498..8f053d75 100644 --- a/build.gradle +++ b/build.gradle @@ -142,9 +142,7 @@ jlink { appVersion = "${sparrowVersion}" skipInstaller = os.macOsX imageOptions = [] - installerOptions = [ - '--file-associations', 'src/main/deploy/associations.properties', - ] + installerOptions = ['--file-associations', 'src/main/deploy/associations.properties', '--license-file', 'LICENSE'] if(os.windows) { installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut'] imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico'] @@ -152,7 +150,7 @@ jlink { } if(os.linux) { installerOptions += ['--linux-shortcut'] - imageOptions += ['--icon', 'src/main/deploy/package/linux/sparrow.png'] + imageOptions += ['--icon', 'src/main/deploy/package/linux/sparrow.png', '--linux-rpm-license-type', 'ASL 2.0'] } if(os.macOsX) { installerOptions += ['--mac-sign', '--mac-signing-key-user-name', 'Craig Raw (UPLVMSK9D7)'] diff --git a/drongo b/drongo index bd964e9b..1e0c8f0b 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit bd964e9bd2dca849f0f444d5a40ca65a5eb20fa8 +Subproject commit 1e0c8f0bded3c47d0c3191667c947f360da8d209 From 135c1d1719f3d92b34675129b3201b7a08631e22 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 28 Aug 2020 15:29:25 +0200 Subject: [PATCH 6/8] build tweak --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8f053d75..1e060a5b 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,7 @@ jlink { } if(os.linux) { installerOptions += ['--linux-shortcut'] - imageOptions += ['--icon', 'src/main/deploy/package/linux/sparrow.png', '--linux-rpm-license-type', 'ASL 2.0'] + imageOptions += ['--icon', 'src/main/deploy/package/linux/sparrow.png', '--linux-app-release', "${sparrowVersion}"] } if(os.macOsX) { installerOptions += ['--mac-sign', '--mac-signing-key-user-name', 'Craig Raw (UPLVMSK9D7)'] From 6dca03f8b4a1fd0ec93f6a44a0113bafde6dfb63 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 28 Aug 2020 15:34:35 +0200 Subject: [PATCH 7/8] build tweak #2 --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1e060a5b..6911f43d 100644 --- a/build.gradle +++ b/build.gradle @@ -150,7 +150,8 @@ jlink { } if(os.linux) { installerOptions += ['--linux-shortcut'] - imageOptions += ['--icon', 'src/main/deploy/package/linux/sparrow.png', '--linux-app-release', "${sparrowVersion}"] + imageOptions += ['--icon', 'src/main/deploy/package/linux/sparrow.png'] + installerOptions += ['--linux-rpm-license-type', 'ASL 2.0', '--linux-app-release', "${sparrowVersion}"] } if(os.macOsX) { installerOptions += ['--mac-sign', '--mac-signing-key-user-name', 'Craig Raw (UPLVMSK9D7)'] From 7eb4b9c61d26d2f5c6f390ad7f2ec7cf4eba3628 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 28 Aug 2020 16:02:08 +0200 Subject: [PATCH 8/8] linux build fixes --- build.gradle | 5 ++--- .../package/linux/{sparrow.png => Sparrow.png} | Bin 2 files changed, 2 insertions(+), 3 deletions(-) rename src/main/deploy/package/linux/{sparrow.png => Sparrow.png} (100%) diff --git a/build.gradle b/build.gradle index 6911f43d..b1bc565c 100644 --- a/build.gradle +++ b/build.gradle @@ -149,9 +149,8 @@ jlink { installerType = "exe" } if(os.linux) { - installerOptions += ['--linux-shortcut'] - imageOptions += ['--icon', 'src/main/deploy/package/linux/sparrow.png'] - installerOptions += ['--linux-rpm-license-type', 'ASL 2.0', '--linux-app-release', "${sparrowVersion}"] + installerOptions += ['--linux-shortcut', '--linux-rpm-license-type', 'ASL 2.0'] + imageOptions += ['--icon', 'src/main/deploy/package/linux/Sparrow.png', '--resource-dir', 'src/main/deploy/package/linux/'] } if(os.macOsX) { installerOptions += ['--mac-sign', '--mac-signing-key-user-name', 'Craig Raw (UPLVMSK9D7)'] diff --git a/src/main/deploy/package/linux/sparrow.png b/src/main/deploy/package/linux/Sparrow.png similarity index 100% rename from src/main/deploy/package/linux/sparrow.png rename to src/main/deploy/package/linux/Sparrow.png