From c865d08e1ecef99237755066163c4fb73034f1ed Mon Sep 17 00:00:00 2001 From: AEJT Date: Thu, 9 Jan 2020 03:26:46 -0500 Subject: [PATCH] Dragonglass (DRGL) rebrands to Fango (XFG) --- .../coins/{Dragonglass.java => Fango.java} | 8 ++-- .../META-INF/services/bisq.asset.Asset | 2 +- .../bisq/asset/coins/DragonglassTest.java | 45 ------------------ .../test/java/bisq/asset/coins/FangoTest.java | 47 +++++++++++++++++++ .../resources/i18n/displayStrings.properties | 18 +++---- 5 files changed, 61 insertions(+), 59 deletions(-) rename assets/src/main/java/bisq/asset/coins/{Dragonglass.java => Fango.java} (78%) delete mode 100644 assets/src/test/java/bisq/asset/coins/DragonglassTest.java create mode 100644 assets/src/test/java/bisq/asset/coins/FangoTest.java diff --git a/assets/src/main/java/bisq/asset/coins/Dragonglass.java b/assets/src/main/java/bisq/asset/coins/Fango.java similarity index 78% rename from assets/src/main/java/bisq/asset/coins/Dragonglass.java rename to assets/src/main/java/bisq/asset/coins/Fango.java index 68bd41df2cd..5719630080e 100644 --- a/assets/src/main/java/bisq/asset/coins/Dragonglass.java +++ b/assets/src/main/java/bisq/asset/coins/Fango.java @@ -21,10 +21,10 @@ import bisq.asset.Coin; import bisq.asset.RegexAddressValidator; -@AltCoinAccountDisclaimer("account.altcoin.popup.drgl.msg") -public class Dragonglass extends Coin { +@AltCoinAccountDisclaimer("account.altcoin.popup.xfg.msg") +public class Fango extends Coin { - public Dragonglass() { - super("Dragonglass", "DRGL", new RegexAddressValidator("^(dRGL)[1-9A-HJ-NP-Za-km-z]{94}$")); + public Fango() { + super("Fango", "XFG", new RegexAddressValidator("^(fango)[1-9A-HJ-NP-Za-km-z]{94}$")); } } diff --git a/assets/src/main/resources/META-INF/services/bisq.asset.Asset b/assets/src/main/resources/META-INF/services/bisq.asset.Asset index c50ae587255..66587b8fd44 100644 --- a/assets/src/main/resources/META-INF/services/bisq.asset.Asset +++ b/assets/src/main/resources/META-INF/services/bisq.asset.Asset @@ -39,13 +39,13 @@ bisq.asset.coins.Dextro bisq.asset.coins.Dogecoin bisq.asset.coins.Doichain bisq.asset.coins.Donu -bisq.asset.coins.Dragonglass bisq.asset.coins.DSTRA bisq.asset.coins.Emercoin bisq.asset.coins.Ergo bisq.asset.coins.Ether bisq.asset.coins.EtherClassic bisq.asset.coins.Faircoin +bisq.asset.coins.Fango bisq.asset.coins.FourtyTwo bisq.asset.coins.Fujicoin bisq.asset.coins.Galilel diff --git a/assets/src/test/java/bisq/asset/coins/DragonglassTest.java b/assets/src/test/java/bisq/asset/coins/DragonglassTest.java deleted file mode 100644 index 51e4974f901..00000000000 --- a/assets/src/test/java/bisq/asset/coins/DragonglassTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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 . - */ - -package bisq.asset.coins; - -import bisq.asset.AbstractAssetTest; - -import org.junit.Test; - -public class DragonglassTest extends AbstractAssetTest { - - public DragonglassTest() { - super(new Dragonglass()); - } - - @Test - public void testValidAddresses() { - assertValidAddress("dRGLhxvCtLk1vfSD3WmFzyTN5ph2gZYvkZfxvLSrcdry95x4PPJrCKBTKDEFZYTw4bCGqoiaUWxNd8B41vqXaTY72Vi2XcvikX"); - assertValidAddress("dRGLjS5v91tDd4GDZeahUj95nkXSNQs5DMY1YStLN2hSNWD67iZh7ED7oDw841Kx6oUYouZaXmBNFcqSptNZ4dL94CbZbF53jt"); - } - - @Test - public void testInvalidAddresses() { - assertInvalidAddress("dRGLjS5v91tDd4GDZeahUj95nkXSNQs5DMY1YStLN2hSNWD67iZh7ED7oDw841Kx6oUYouZaXmBNFcqSptNZ4dL94CbZbF53j"); - assertInvalidAddress("dRGLjS5v91tDd4GDZeahUj95nkXSNQs5DMY1YStLN2hSNWD67iZh7ED7oDw841Ko6oUYouZaXmBNFcqSptNZ4dL94oUCifk4048"); - assertInvalidAddress("DRGLhxvCtLk1vfSD3WmFzyTN5ph2gZYvkZfxvLSrcdry95x4PPJrCKBTKDEFZYTw4bCGqoiaUWxNd8B41vqXaTY72Vi2XcvikX"); - assertInvalidAddress("drglhxvCtLk1vfSD3WmFzyTN5ph2gZYvkZfxvLSrcdry95x4PPJrCKBTKDEFZYTw4bCGqoiaUWxNd8B41vqXaTY72Vi2XcvikX"); - assertInvalidAddress("dRgLjS5v91tDd4GDZeahUj95nkXSNQs5DMY1YStLN2hSNWD67iZh7ED7oDw841Kx6oUYouZaXmBNFcqSptNZ4dL94CbZbF53jt"); - assertInvalidAddress("dRGlhxvCtLk1vfSD3WmFzyTN5ph2gZYvkZfxvLSrcdry95x4PPJrCKBTKDEFZYTw4bCGqoiaUWxNd8B41vqXaTY72Vi2XcvikX"); - } -} diff --git a/assets/src/test/java/bisq/asset/coins/FangoTest.java b/assets/src/test/java/bisq/asset/coins/FangoTest.java new file mode 100644 index 00000000000..283c3a93568 --- /dev/null +++ b/assets/src/test/java/bisq/asset/coins/FangoTest.java @@ -0,0 +1,47 @@ +/* + * 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 . + */ + +package bisq.asset.coins; + +import bisq.asset.AbstractAssetTest; + +import org.junit.Test; + +public class FangoTest extends AbstractAssetTest { + + public FangoTest() { + super(new Fango()); + } + + @Test + public void testValidAddresses() { + assertValidAddress("fango7cNPfNMd7bPXtnVcxeVutJ8eV5CHPADdSmkURA9HyhWWDjz61qXUAjsRisdeDMrCQw1EPG4RSZi9BkVgg5iBRgJRaLogir"); + assertValidAddress("fango4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwYD"); + } + + @Test + public void testInvalidAddresses() { + assertInvalidAddress("fango4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwD"); + assertInvalidAddress("fango4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwYDd"); + assertInvalidAddress("fangO4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwYD"); + assertInvalidAddress("fanGo4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwYD"); + assertInvalidAddress("faNgo4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwYD"); + assertInvalidAddress("fAngo4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwYD"); + assertInvalidAddress("Fango4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwYD"); + assertInvalidAddress("FANGO4Uxurg6s7mTd7r7aZeMxkdrsPNYQM4yPjmX6rTRh4VZx4QGqe3K29vKB9sEBxMztybnbj3ZvNgGS7ztzLZ88x83hM3GwYD"); + } +} diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index ca915c4f1e6..b71baf65227 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1384,23 +1384,23 @@ transfer using the QWC Block Explorer (https://explorer.qwertycoin.org).\n\n\ Failure to provide the required information to the mediator or arbitrator will result in losing the dispute case. In all cases of dispute, the \ QWC sender bears 100% of the burden of responsibility in verifying transactions to an mediator or arbitrator. \n\n\ If you do not understand these requirements, do not trade on Bisq. First, seek help at the QWC Discord (https://discord.gg/rUkfnpC). -account.altcoin.popup.drgl.msg=Trading Dragonglass on Bisq requires that you understand and fulfill \ +account.altcoin.popup.xfg.msg=Trading Fango on Bisq requires that you understand and fulfill \ the following requirements:\n\n\ -Because of the privacy Dragonglass provides, a transaction is not verifiable on the public blockchain. If required, you \ +Because of the privacy Fango provides, certain details of transactions are unavailable on the public blockchain. If required, you \ can prove your payment through the use of your TXN-Private-Key.\n\ The TXN-Private Key is a one-time key automatically generated for every transaction that can \ -only be accessed from within your DRGL wallet.\n\ -Either by DRGL-wallet GUI (inside transaction details dialog) or by the Dragonglass CLI simplewallet (using command "get_tx_key").\n\n\ -DRGL version 'Oathkeeper' and higher are REQUIRED for both.\n\n\ +only be accessed from within your fango wallet.\n\ +Either by fango-wallet GUI (inside transaction details dialog) or by the fandomgold CLI simplewallet (using command "get_tx_key").\n\n\ +Fandom Gold version 'APOTHEOSIS II' or higher are REQUIRED for both.\n\n\ In case of a dispute, you must provide the mediator or arbitrator the following data:\n\ - The TXN-Private key\n\ - The transaction hash\n\ - The recipient's public address\n\n\ -Verification of payment can be made using the above data as inputs at (http://drgl.info/#check_txn).\n\n\ -Failure to provide the above data, or if you used an incompatible wallet, will result in losing the \ -dispute case. The Dragonglass sender is responsible for providing verification of the DRGL transfer to the \ +Verification of payment can be made using the above data as inputs at any XFG block explorer (http://explorer.fandom.gold/#check_txn).\n\n\ +Failure to provide the above data, or using an incompatible wallet, will result in losing the \ +dispute case. The Fango sender is responsible for providing verification of the XFG transfer to the \ mediator or arbitrator in case of a dispute. Use of PaymentID is not required.\n\n\ -If you are unsure about any part of this process, visit Dragonglass on Discord (http://discord.drgl.info) for help. +If you are unsure about any part of this process, visit FANG0 on Discord (http://discord.fandom.gold/) for help. account.altcoin.popup.ZEC.msg=When using Zcash you can only use the transparent addresses (starting with t), not \ the z-addresses (private), because the mediator or arbitrator would not be able to verify the transaction with z-addresses. account.altcoin.popup.XZC.msg=When using Zcoin you can only use the transparent (traceable) addresses, not \