New markets, fix #224

btdex · Apr 30, 2022 · a8823de · a8823de
1 parent 65620db
commit a8823de
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -67,6 +67,8 @@ dependencies {
     implementation 'com.github.jjos2372:ledger4j:06fb465b5a'
 
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
+
+    implementation 'com.github.stellar:java-stellar-sdk:0.32.0'
 
 	//logging
 	implementation 'org.apache.logging.log4j:log4j-api:2.15.0'

diff --git a/src/main/java/btdex/core/Market.java b/src/main/java/btdex/core/Market.java
@@ -37,6 +37,8 @@ public abstract class Market {
 	public static long MARKET_HIVE    	     = 0x000000014;
 	public static long MARKET_SSIGNA         = 0x000000015;
 
+	public static long MARKET_XLM            = 0x000000016;
+
 	public static long MARKET_XCH            = 0x000000060;
 
 	// TODO: fill with other cryptos here

diff --git a/src/main/java/btdex/core/Markets.java b/src/main/java/btdex/core/Markets.java
@@ -17,6 +17,7 @@
 import btdex.markets.MarketXCH;
 import btdex.markets.MarketXMR;
 import btdex.markets.MarketXLA;
+import btdex.markets.MarketXLM;
 import btdex.markets.MarketHIVE;
 import btdex.markets.MarketSSIGNA;
 import signumj.service.NodeService;
@@ -45,14 +46,15 @@ public static void loadStandardMarkets(Boolean testnet, NodeService NS) {
         markets.add(new MarketBUSDT());
         markets.add(new MarketDOGE());
         markets.add(new MarketETH());
+		markets.add(new MarketHIVE());
         markets.add(new MarketLTC());
+		markets.add(new MarketSSIGNA());
         markets.add(new MarketXCH());
         markets.add(new MarketXMR());
         markets.add(new MarketXLA());
+        markets.add(new MarketXLM());
         markets.add(new MarketWBNB());
         markets.add(new MarketWSIGNA());
-		markets.add(new MarketHIVE());
-		markets.add(new MarketSSIGNA());
     }
 
     public static void addUserMarket(Market m) {

diff --git a/src/main/java/btdex/markets/MarketHIVE.java b/src/main/java/btdex/markets/MarketHIVE.java
@@ -2,10 +2,11 @@
 
 import java.util.HashMap;
 
-import btdex.core.Globals;
 import btdex.locale.Translation;
 
 public class MarketHIVE extends MarketCrypto {
+
+	static final String REGEX = "^@[a-zA-Z0-9]*$";
 
 	public String getTicker() {
 		return "HIVE";
@@ -30,4 +31,14 @@ public long getID() {
 	public int getUCA_ID() {
 		return 5370;
 	}
+
+	@Override
+	public void validate(HashMap<String, String> fields) throws Exception {
+		super.validate(fields);
+
+		String addr = fields.get(ADDRESS);
+
+		if(!addr.matches(REGEX))
+			throw new Exception(Translation.tr("mkt_invalid_address", addr, toString()));
+	}	
 }
diff --git a/src/main/java/btdex/markets/MarketSSIGNA.java b/src/main/java/btdex/markets/MarketSSIGNA.java
@@ -1,11 +1,6 @@
 package btdex.markets;
 
-import java.util.HashMap;
-
-import btdex.core.Globals;
-import btdex.locale.Translation;
-
-public class MarketSSIGNA extends MarketCrypto {
+public class MarketSSIGNA extends MarketHIVE {
 
 	public String getTicker() {
 		return "SWAP.SIGNA";