Added Dogecoins (DOGED)

UberPay · Oct 23, 2015 · 345b8eb · bitspill · Oct 24, 2015 · bitspill
1 parent 5923669
commit 345b8eb
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,6 @@ Coins Pending for inclusion:
 
 Pending electrum node
 
-- DogecoinDark (DOGED)
 - Clamcoin (CLAM)
 - Starcoin (START)
 - VCoin (VCN)
@@ -45,13 +44,18 @@ Pending electrum node
 - Account Summary (Wallet Balance Summary)
 - Integration with StartChat https://play.google.com/store/apps/details?id=com.wStartChat
 - Geopay.me's Gold/Silver Coin Swap Service (More to be announced)
+- Upgrade Crypto Exchange Rates Ticker to include more coins
 
 - Splash page implementation pre-alpha phase
 
 
 ## Version history
 
-New Version v1.7.02.6
+New Version v1.7.02.7
+
+- Added DogecoinDark (DOGED)
+
+Version v1.7.02.6
 
 - Added STEPS Coin
 

diff --git a/core/src/main/java/com/mygeopay/core/coins/BatacoinMain.java b/core/src/main/java/com/mygeopay/core/coins/BatacoinMain.java
@@ -1,6 +1,7 @@
 package com.mygeopay.core.coins;
 
 import com.mygeopay.core.coins.families.BitFamily;
+import com.mygeopay.core.coins.families.PeerFamily;
 
 
 /**
@@ -21,7 +22,7 @@ private BatacoinMain() {
         fullname = "Batacoin";
         symbol = "BTA";
         uriScheme = "batacoin";
-        bip44Index = 2;
+        bip44Index = 112;
         unitExponent = 8;
         feePerKb = value(1000);
         minNonDust = value(0); // 0.00000 Not used

diff --git a/core/src/main/java/com/mygeopay/core/coins/CryptoescudoMain.java b/core/src/main/java/com/mygeopay/core/coins/CryptoescudoMain.java
@@ -24,9 +24,9 @@ private CryptoescudoMain() {
         uriScheme = "cryptoescudo";
         bip44Index = 111; // TODO Need confirmation in Satoshi Labs
         unitExponent = 8;
-        feePerKb = value(0); // 0 Zerado para testes normal 100 000
+        feePerKb = value(100000000L); // 0 Zerado para testes normal 100 000
         minNonDust = value(1000); // 0.00001 CESC mininput
-        softDustLimit = value(0); // 0 CESC
+        softDustLimit = value(100000000L); // 0 CESC
         softDustPolicy = SoftDustPolicy.BASE_FEE_FOR_EACH_SOFT_DUST_TXO;
     }
 

diff --git a/core/src/main/java/com/mygeopay/core/coins/DogecoinDarkMain.java b/core/src/main/java/com/mygeopay/core/coins/DogecoinDarkMain.java
@@ -16,18 +16,18 @@ private DogecoinDarkMain() {
         p2shHeader = 33;
         acceptableAddressCodes = new int[] { addressHeader, p2shHeader };
         dumpedPrivateKeyHeader = 158;
-        spendableCoinbaseDepth = 100; // COINBASE_MATURITY_NEW
+        spendableCoinbaseDepth = 500; // COINBASE_MATURITY_NEW
 
-        family = BitFamily.get();
+        family = PeerFamily.get();
         name = "DOGED (α)";
         fullname = "DogecoinDark";
         symbol = "DOGED";
         uriScheme = "dogecoindark";
         bip44Index = 77;
-        unitExponent = 8;
-        feePerKb = value(10000000);
-        minNonDust = value(1000000);
-        softDustLimit = value(10000000); // TODO Verify values 1 DOGED
+        unitExponent = 6; // value displays correct digits [2.014602] / [0.02146] only when 6 not 8 ??
+        feePerKb = value(100000L);
+        minNonDust = value(1000);
+        softDustLimit = value(1000000L); // TODO Verify values 1 DOGED
         softDustPolicy = SoftDustPolicy.BASE_FEE_FOR_EACH_SOFT_DUST_TXO;
     }
 

diff --git a/wallet/build.gradle b/wallet/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId 'com.mygeopay.wallet'
         minSdkVersion 11
         targetSdkVersion 22
-        versionCode 56
-        versionName 'v1.7.02.6'
+        versionCode 57
+        versionName 'v1.7.02.7'
     }
     buildTypes {
         release {

diff --git a/wallet/src/main/java/com/mygeopay/wallet/Constants.java b/wallet/src/main/java/com/mygeopay/wallet/Constants.java
@@ -183,7 +183,7 @@ public class Constants {
                                                     new ServerAddress("jbs-cce-2.coinomi.net", 5029)),
             new CoinAddress(CanadaeCoinMain.get(),  new ServerAddress("cdn-cce-1.coinomi.net", 5033),
                                                     new ServerAddress("cdn-cce-2.coinomi.net", 5033)),
-            new CoinAddress(ClamcoinMain.get(),     new ServerAddress("clam.el.0.btcnetwork.info", 50001)),
+            //new CoinAddress(ClamcoinMain.get(),     new ServerAddress("clam.el.0.btcnetwork.info", 50001)),
             // TODO Correct electrum URL for CLAM
             new CoinAddress(DogecoinDarkMain.get(), new ServerAddress("electrum-doged.space", 50001),
             // new CoinAddress(DogecoinDarkTest.get(), new ServerAddress("electrum-doged.space", 50002),
@@ -192,9 +192,10 @@ public class Constants {
             new CoinAddress(NovacoinMain.get(),     new ServerAddress("nvc-cce-1.coinomi.net", 5034),
                                                     new ServerAddress("nvc-cce-2.coinomi.net", 5034)),
             //
-            new CoinAddress(BatacoinMain.get(),      new ServerAddress("104.236.239.154", 50001)),
+            new CoinAddress(BatacoinMain.get(),     new ServerAddress("104.236.239.154", 50001)),
             //
-            new CoinAddress(StepscoinMain.get(),      new ServerAddress("192.241.216.229", 50001)),
+            new CoinAddress(StepscoinMain.get(),    new ServerAddress("192.241.216.229", 50001),
+                                                    new ServerAddress("192.241.216.229", 50002)),
             // electrum.bta.xyz
             new CoinAddress(VpncoinMain.get(),      new ServerAddress("vpn-cce-1.coinomi.net", 5032),
                                                     new ServerAddress("vpn-cce-2.coinomi.net", 5032))
@@ -296,7 +297,7 @@ public class Constants {
             BitcoinMain.get(),
             DogecoinMain.get(),
             LitecoinMain.get(),
-/*            DogecoinDarkMain.get(), */
+            DogecoinDarkMain.get(),
 /*            BatacoinMain.get(), */
             ViacoinMain.get(),
             MazacoinMain.get(),

diff --git a/wallet/src/main/res/values-ru/strings.xml b/wallet/src/main/res/values-ru/strings.xml
@@ -180,7 +180,7 @@
         <item quantity="many">%d секунд</item>
     </plurals>
     <!-- About Activity -->
-    <string name="title_activity_about">UberPay</string>
+    <string name="title_activity_about"> О UberPay</string>
     <string name="app_name_long">UberPay для Android</string>
     <string name="about_licence">Программа с открытым исходным кодом\nhttps://github.com/UberPay/uberpay-wallet\nИсходный код открыт на основе лицензии GNU General Public License 3</string>
     <string name="about_credits_nubits">Инфраструктура серверов предоставлена NuBits - Первой Всемирной Стабильной Цифровой Валютой \nhttps://nubits.com/</string>