Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge v1.2.0/v1.2.1 with master #3521

Merged
merged 48 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
2450d9b
List Krypton (ZOD)
gregmeszaros Sep 3, 2019
d333520
Temporarily disable onion host for @KanoczTomas's BTC node
wiz Sep 15, 2019
047ec4a
Add Ergo (ERG) without Bouncy Castle dependency.
jasondavies Sep 18, 2019
fbd6525
List CTSCoin (CTSC)
cryptogeuse Sep 24, 2019
06a28d0
Merge pull request #3289 from plutomonkey/ergo
ripcurlx Sep 27, 2019
c63c77c
Tweak the English name of Japan Bank Transfer payment method
wiz Sep 28, 2019
f71cf15
List Animecoin (ANI)
Sep 28, 2019
7bed73e
Merge pull request #3344 from wiz/tweak-japan-bank-transfer-string
ripcurlx Sep 30, 2019
b1c8141
Add mediator prefix to trade statistics
chimp1984 Oct 2, 2019
406c098
List Faircoin (FAIR)
jsalatas Oct 3, 2019
f5f4611
List uPlexa (UPX)
QuantumLeaper Oct 1, 2019
d20afd6
Remove not used private methods from BisqEnvironment
lusarz Oct 3, 2019
ca1538d
Merge pull request #3354 from jsalatas/faircoin-pr
ripcurlx Oct 4, 2019
95e9bd4
Merge pull request #3351 from chimp1984/fix-missing-addition-of-mediator
ripcurlx Oct 4, 2019
70d17ea
Merge pull request #3350 from QuantumLeaper/list-upx-asset
ripcurlx Oct 4, 2019
bae6e7a
Merge pull request #3324 from ctscoin/list-ctsc-asset
ripcurlx Oct 4, 2019
b6cc351
Add onInitP2pNetwork and onInitWallet to BisqSetupListener
ManfredKarrer Jan 16, 2019
fb9f59d
Start server at onInitWallet and add wallet password handler
ManfredKarrer Jan 16, 2019
3cfa73a
Merge pull request #3263 from wiz/disable-kanocztomas-onion-btcnode
ripcurlx Oct 7, 2019
560d66b
Merge pull request #3348 from blabno/changes-needed-for-minimal-api
ripcurlx Oct 7, 2019
5ecc897
Add combination (Blockstream.info + Mempool.space) block explorer
wiz Oct 8, 2019
3c1f8a1
Revert "Temporarily disable onion host for @KanoczTomas's BTC node"
wiz Oct 8, 2019
5babcec
Temporarily disable KanoczTomas btcnode on both onion and clearnet
wiz Oct 8, 2019
0770a78
Merge pull request #3378 from wiz/disable-kanocztomas-btcnode-entirely
ripcurlx Oct 9, 2019
f3950bd
Merge pull request #3377 from wiz/add-mempool-space-transaction-tracker
ripcurlx Oct 9, 2019
a9c2448
Refactor BisqApp - update scene size calculation
lusarz Oct 9, 2019
584e552
Refactor BisqApp - update error popup message build
lusarz Oct 9, 2019
23877d4
Refactor BisqApp - move icon load into ImageUtil
lusarz Oct 9, 2019
db17fd5
Remove unused Utilities
lusarz Oct 9, 2019
679985d
Increase minimum TX fee to 2 sats/vByte to fix #3106 (#3387)
wiz Oct 10, 2019
ccfbf6f
Fix mistakes in English source (#3386)
ripcurlx Oct 10, 2019
a5aea5a
Merge pull request #3383 from lusarz/remove-unused-utilities
ripcurlx Oct 14, 2019
94b12a7
Merge pull request #3382 from lusarz/refactor-bisq-app-image-util
ripcurlx Oct 14, 2019
4277ec8
Merge pull request #3381 from lusarz/refactor-bisq-app-throwable
ripcurlx Oct 14, 2019
d8dd014
Refactor BisqEnvironment
lusarz Oct 3, 2019
aaddda9
Merge pull request #3380 from lusarz/refactor-bisq-app-scene-size-cal…
ripcurlx Oct 14, 2019
57fc862
Merge pull request #3363 from lusarz/refactor-bisq-environment-2
ripcurlx Oct 14, 2019
1e40bb0
List Ndau (XND)
coriolinus Aug 19, 2019
2178dbd
Merge pull request #3362 from lusarz/refactor-bisq-environment
ripcurlx Oct 15, 2019
75f28eb
Merge pull request #3190 from kryptonchain/list-krypton-zod
ripcurlx Oct 17, 2019
c8cb7ff
Show connected Bitcoin network peer info
devinbileck Jun 3, 2019
1557a7b
Merge pull request #3423 from devinbileck/show-connected-peer-info
ripcurlx Oct 18, 2019
c91c40c
Merge pull request #3110 from oneiro-ndev/list-ndau
ripcurlx Oct 18, 2019
7e4b8b7
Merge pull request #3396 from caraphinneth/list-ani-asset
ripcurlx Oct 18, 2019
4eb3b59
Not show payment account details for blocked offers (#3425)
ripcurlx Oct 18, 2019
2967702
Add GitHub issue template for user reported bugs (#3454)
wiz Oct 24, 2019
fc49792
Merge branch 'master' of github.com:bisq-network/bisq into merge-with…
ripcurlx Oct 30, 2019
2a28e12
Fix wrong auto merge
ripcurlx Oct 30, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
### Description

<!-- brief description of the bug -->

#### Version

<!-- commit id or version number -->

### Steps to reproduce

<!--if you can reliably reproduce the bug, list the steps here -->

### Expected behaviour

<!--description of the expected behavior -->

### Actual behaviour

<!-- explain what happened instead of the expected behaviour -->

### Screenshots

<!--Screenshots if gui related, drag and drop to add to the issue -->

#### Device or machine

<!-- device/machine used, operating system -->



#### Additional info

<!-- Additional information useful for debugging (e.g. logs) -->
28 changes: 28 additions & 0 deletions assets/src/main/java/bisq/asset/coins/Krypton.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* This file is part of Bisq.
*
* Bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/

package bisq.asset.coins;

import bisq.asset.Coin;
import bisq.asset.RegexAddressValidator;

public class Krypton extends Coin {

public Krypton() {
super("Krypton", "ZOD", new RegexAddressValidator("^QQQ[1-9A-Za-z^OIl]{95}"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ bisq.asset.coins.Iridium
bisq.asset.coins.Kekcoin
bisq.asset.coins.KnowYourDeveloper
bisq.asset.coins.Kore
bisq.asset.coins.Krypton
bisq.asset.coins.Litecoin
bisq.asset.coins.LitecoinPlus
bisq.asset.coins.LitecoinZ
Expand Down
48 changes: 48 additions & 0 deletions assets/src/test/java/bisq/asset/coins/KryptonTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* This file is part of Bisq.
*
* Bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/

package bisq.asset.coins;

import bisq.asset.AbstractAssetTest;

import org.junit.Test;

public class KryptonTest extends AbstractAssetTest {

public KryptonTest() {
super(new Krypton());
}

@Test
public void testValidAddresses() {
assertValidAddress("QQQ1LgQ1m8vX5tGrBZ2miS7A54Fmj5Qbij4UXT8nD4aqF75b1cpAauxVkjYaefcztV62UrDT1K9WHDeQWu4vpVXU2wezpshvex");
assertValidAddress("QQQ1G56SKneSK1833tKjLH7E4ZgFwnqhqUb1HMHgYbnhaST56mukM1296jiYjTyTdMWnvH5FpWNAJWaQqwyPJHUR8qXRKBJy9o");
assertValidAddress("QQQ1Bg61uUZhsNaTmUSZNcFgX2bk9wnAoYg9DSYZidDMJt7wVyccvMy8J7zRBoV5iT1pbraFUDWPQWWdXGPPws2P2ZGe8UzsaJ");
}

@Test
public void testInvalidAddresses() {
assertInvalidAddress("QQQ1Bg61uUZhsNaTmUSZNcFgX2bk9wnAoYg9DSYZidDMJt7wVyccvMy8J7zRBoV5iT1pbraFUDWPQWWdXGPPws2P2ZGe8");
assertInvalidAddress("11QQQ1Bg61uUZhsNaTmUSZNcFgX2bk9wnAoYg9DSYZidDMJt7wVyccvMy8J7zRBoV5iT1pbraFUDWPQWWdXGPPws2P2ZGe8UzsaJ");
assertInvalidAddress("");
assertInvalidAddress("#RoUKWRwpsx1F");
assertInvalidAddress("YQQ1G56SKneSK1833tKjLH7E4ZgFwnqhqUb1HMHgYbnhaST56mukM1296jiYjTyTdMWnvH5FpWNAJWaQqwyPJHUR8qXRKBJy9o");
assertInvalidAddress("3jyRo3rcp9fjdfjdSGpx");
assertInvalidAddress("QQQ1G56SKneSK1833tKjLH7E4ZgFwnqhqUb1HMHgYbnhaST56mukM1296jiYjTyTdMWnvH5FpWNAJWaQqwyPJHUR8qXRKBJy9#");
assertInvalidAddress("ZOD1Bg61uUZhsNaTmUSZNcFgX2bk9wnAoYg9DSYZidDMJt7wVyccvMy8J7zRBoV5iT1pbraFUDWPQWWdXGPPws2P2ZGe8UzsaJ");
}
}