diff --git a/LICENSE (URKit) b/LICENSE (URKit) new file mode 100644 index 00000000..cc351b21 --- /dev/null +++ b/LICENSE (URKit) @@ -0,0 +1,19 @@ +BSD-2-Clause Plus Patent License + +SPDX-License-Identifier: [BSD-2-Clause-Patent](https://spdx.org/licenses/BSD-2-Clause-Patent.html) + +Copyright © 2020 Blockchain Commons, LLC + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +Subject to the terms and conditions of this license, each copyright holder and contributor hereby grants to those receiving rights under this license a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except for failure to satisfy the conditions of this license) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer this software, where such license applies only to those patent claims, already acquired or hereafter acquired, licensable by such copyright holder or contributor that are necessarily infringed by: + +(a) their Contribution(s) (the licensed copyrights of copyright holders and non-copyrightable additions of contributors, in source or binary form) alone; or +(b) combination of their Contribution(s) with the work of authorship to which such Contribution(s) was added by such copyright holder or contributor, if, at the time the Contribution is added, such addition causes such combination to be necessarily infringed. The patent license shall not apply to any other combinations which include the Contribution. +Except as expressly stated above, no rights or licenses from any copyright holder or contributor is granted under this license, whether expressly, by implication, estoppel or otherwise. + +DISCLAIMER + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/drongo b/drongo index 958d9c52..8d49cebc 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 958d9c52746c1c41ec47cdb9162651b7ff80493f +Subproject commit 8d49cebcaca6ccb2ea699fe8141554d1470d0a97 diff --git a/src/main/java/com/sparrowwallet/sparrow/ur/Bytewords.java b/src/main/java/com/sparrowwallet/sparrow/ur/Bytewords.java index 76716b9f..bcc0fcbc 100644 --- a/src/main/java/com/sparrowwallet/sparrow/ur/Bytewords.java +++ b/src/main/java/com/sparrowwallet/sparrow/ur/Bytewords.java @@ -10,6 +10,9 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.zip.CRC32; +/** + * Ported from https://github.com/BlockchainCommons/URKit + */ public class Bytewords { public static final String BYTEWORDS = "ableacidalsoapexaquaarchatomauntawayaxisbackbaldbarnbeltbetabiasbluebodybragbrewbulbbuzzcalmcashcatschefcityclawcodecolacookcostcruxcurlcuspcyandarkdatadaysdelidicedietdoordowndrawdropdrumdulldutyeacheasyechoedgeepicevenexamexiteyesfactfairfernfigsfilmfishfizzflapflewfluxfoxyfreefrogfuelfundgalagamegeargemsgiftgirlglowgoodgraygrimgurugushgyrohalfhanghardhawkheathelphighhillholyhopehornhutsicedideaidleinchinkyintoirisironitemjadejazzjoinjoltjowljudojugsjumpjunkjurykeepkenokeptkeyskickkilnkingkitekiwiknoblamblavalazyleaflegsliarlistlimplionlogoloudloveluaulucklungmainmanymathmazememomenumeowmildmintmissmonknailnavyneednewsnextnoonnotenumbobeyoboeomitonyxopenovalowlspaidpartpeckplaypluspoempoolposepuffpumapurrquadquizraceramprealredorichroadrockroofrubyruinrunsrustsafesagascarsetssilkskewslotsoapsolosongstubsurfswantacotasktaxitenttiedtimetinytoiltombtoystriptunatwinuglyundouniturgeuservastveryvetovialvibeviewvisavoidvowswallwandwarmwaspwavewaxywebswhatwhenwhizwolfworkyankyawnyellyogayurtzapszestzinczonezoomzero"; private static final List bytewordsList; diff --git a/src/main/java/com/sparrowwallet/sparrow/ur/UR.java b/src/main/java/com/sparrowwallet/sparrow/ur/UR.java index fe2a3769..830b04b9 100644 --- a/src/main/java/com/sparrowwallet/sparrow/ur/UR.java +++ b/src/main/java/com/sparrowwallet/sparrow/ur/UR.java @@ -3,6 +3,9 @@ package com.sparrowwallet.sparrow.ur; import java.util.Arrays; import java.util.Objects; +/** + * Ported from https://github.com/BlockchainCommons/URKit + */ public class UR { private final String type; private final byte[] data; diff --git a/src/main/java/com/sparrowwallet/sparrow/ur/URDecoder.java b/src/main/java/com/sparrowwallet/sparrow/ur/URDecoder.java index 22c6ed6d..7082c05c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/ur/URDecoder.java +++ b/src/main/java/com/sparrowwallet/sparrow/ur/URDecoder.java @@ -9,6 +9,9 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * Ported from https://github.com/BlockchainCommons/URKit + */ public class URDecoder { private static final Pattern SEQUENCE_COMPONENT_PATTERN = Pattern.compile("(\\d+)-(\\d+)"); diff --git a/src/main/java/com/sparrowwallet/sparrow/ur/UREncoder.java b/src/main/java/com/sparrowwallet/sparrow/ur/UREncoder.java index 595e3459..fa7dba0c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/ur/UREncoder.java +++ b/src/main/java/com/sparrowwallet/sparrow/ur/UREncoder.java @@ -6,6 +6,9 @@ import java.util.Arrays; import java.util.List; import java.util.StringJoiner; +/** + * Ported from https://github.com/BlockchainCommons/URKit + */ public class UREncoder { private final UR ur; private final FountainEncoder fountainEncoder; diff --git a/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainDecoder.java b/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainDecoder.java index 5629e0cb..1721d1aa 100644 --- a/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainDecoder.java +++ b/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainDecoder.java @@ -10,6 +10,9 @@ import java.util.zip.CRC32; import static com.sparrowwallet.sparrow.ur.fountain.FountainUtils.chooseFragments; +/** + * Ported from https://github.com/BlockchainCommons/URKit + */ public class FountainDecoder { private final Set recievedPartIndexes = new TreeSet<>(); private Set lastPartIndexes; diff --git a/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainEncoder.java b/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainEncoder.java index ed63c14b..bddd9658 100644 --- a/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainEncoder.java +++ b/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainEncoder.java @@ -18,6 +18,9 @@ import java.util.zip.CRC32; import static com.sparrowwallet.sparrow.ur.fountain.FountainUtils.chooseFragments; +/** + * Ported from https://github.com/BlockchainCommons/URKit + */ public class FountainEncoder { private final int messageLen; private final long checksum; diff --git a/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainUtils.java b/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainUtils.java index b41c39ca..56673957 100644 --- a/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainUtils.java +++ b/src/main/java/com/sparrowwallet/sparrow/ur/fountain/FountainUtils.java @@ -6,6 +6,9 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; +/** + * Ported from https://github.com/BlockchainCommons/URKit + */ public class FountainUtils { static List chooseFragments(long seqNum, int seqLen, long checkSum) { // The first `seqLen` parts are the "pure" fragments, not mixed with any