Merge pull request bisq-network#3059 from camthegeek/list-masari

List Masari (MSR)

assets/src/main/java/bisq/asset/coins/Masari.java

@@ -0,0 +1,30 @@
+/*
+ * 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.AltCoinAccountDisclaimer;
+import bisq.asset.Coin;
+import bisq.asset.CryptoNoteAddressValidator;
+
+@AltCoinAccountDisclaimer("account.altcoin.popup.msr.msg")
+public class Masari extends Coin {
+
+     public Masari() {
+         super("Masari", "MSR", new CryptoNoteAddressValidator(28, 52));
+    }
+}

assets/src/main/resources/META-INF/services/bisq.asset.Asset

@@ -61,6 +61,7 @@ bisq.asset.coins.Litecoin
 bisq.asset.coins.LitecoinPlus
 bisq.asset.coins.LitecoinZ
 bisq.asset.coins.Lytix
+bisq.asset.coins.Masari
 bisq.asset.coins.Mask
 bisq.asset.coins.Mile
 bisq.asset.coins.MirQuiX

assets/src/test/java/bisq/asset/coins/MasariTest.java

@@ -0,0 +1,44 @@
+/*
+ * 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 MasariTest extends AbstractAssetTest {
+
+     public MasariTest() {
+        super(new Masari());
+    }
+
+     @Test
+    public void testValidAddresses() {
+        assertValidAddress("5n9Y2vwnf8oKBhHxRAyjS9aS9j5hTPjtS8RKzMbD3tP95yxkQWbUHkFhLs2UsjgNxj28W6YzNL9WFeY91xPGFXAaUwyVm1h");
+        assertValidAddress("9n1AVze3gmj3ZpEz5Xju92FRiqtmcnQhhXJK7yx9D9qrHRvjZftndVci8HCYFttFeD7ftAMUqUGxG8iA4Sn2eVz45R2NUJj");
+        assertValidAddress("5iB4LfuyvA5HSJP5A1xUKGb8pw5NkywxSeRZPxzy1U7kT3wBmypemQUUzTiCwjy6PTSrJpAvxiNDSUEjNryt17C8RvPdEg3");
+    }
+
+     @Test
+    public void testInvalidAddresses() {
+        assertInvalidAddress("");
+        assertInvalidAddress("5hJpeWa9aogfpY5Su8YmeYaeuD7pyQvSZURcNx26QskbSk9UdZ6cR4HR4YsdWRiBJfCZKLHRTfj7ojGUJ7N5j5hg4pGGCE");
+        assertInvalidAddress("5kYyn6K8hRWg16nztTuvaZ6Jg3ytH84gjbUoEKjbMU4u659PKLpKuLWVSujFwJ1Qp3ZUxhcFHBXMQDmeAz46By3FRRkdaug2");
+        assertInvalidAddress("4okMfbVrFXE4nF9dRKnVLiJi2xiMDDuSk6MJexpBaNgsLutSaBN7euR8TCf4Z1dqmG85GdQHrzSpYgX8Lf2VJnkaAk9MtQV");
+        assertInvalidAddress("5jrE2mwcHkvZq9rQcvX1GCELnwAF6wwmJ4rhVdDP6y#326Gp6KSNbeWWb1sD2dmDZvczHFs8LGM1UjTQfQjjAu6S4eXGC5h");
+    }
+}

core/src/main/resources/i18n/displayStrings.properties

@@ -1113,6 +1113,29 @@ arbitrator in case of a dispute.\n\n\
 There is no payment ID required, just the normal public address.\n\
 If you are not sure about that process visit (https://www.getmonero.org/resources/user-guides/prove-payment.html) \
 or the Monero forum (https://forum.getmonero.org) to find more information.
+account.altcoin.popup.msr.msg=Trading MSR on Bisq requires that you understand and fulfill \
+the following requirements:\n\n\
+For sending MSR, you need to use either the official Masari GUI wallet, Masari CLI wallet with the \
+store-tx-info flag enabled (enabled by default) or the Masari web wallet (https://wallet.getmasari.org). Please be sure you can access the tx key as \
+that would be required in case of a dispute.\n\
+masari-wallet-cli (use the command get_tx_key)\n\
+masari-wallet-gui (go to history tab and click on the (P) button for payment proof)\n\n\
+Masari Web Wallet (goto Account -> transaction history and view details on your sent transaction)\n\n
+Verification can be accomplished in-wallet.\n\
+masari-wallet-cli : using command (check_tx_key).\n\
+masari-wallet-gui : on the Advanced > Prove/Check page.\n\
+Verification can be accomplished in the block explorer \n\
+Open block explorer (https://explorer.getmasari.org), use the search bar to find your transaction hash.\n\
+Once transaction is found, scroll to bottom to the 'Prove Sending' area and fill in details as needed.\n\
+You need to provide the arbitrator the following data in case of a dispute:\n\
+- The tx private key\n\
+- The transaction hash\n\
+- The recipient's public address\n\n\
+Failure to provide the above data, or if you used an incompatible wallet, will result in losing the \
+dispute case. The MSR sender is responsible for providing verification of the MSR transfer to the \
+arbitrator in case of a dispute.\n\n\
+There is no payment ID required, just the normal public address.\n\
+If you are not sure about that process, ask for help on the Official Masari Discord (https://discord.gg/sMCwMqs).
 account.altcoin.popup.blur.msg=Trading BLUR on Bisq requires that you understand and fulfill \
 the following requirements:\n\n\
 To send BLUR you must use the Blur Network CLI or GUI Wallet. \n\n\