Merge branch 'master' into turnstile

2018-10-28 21:32:46 -07:00
parent 8094a4dcc8 32fec42390
commit 887b78758d
19 changed files with 147 additions and 103 deletions
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -12,11 +12,17 @@ const QString Utils::getTokenName() {
    }
 }

-const QString Utils::getDonationAddr() {
+const QString Utils::getDonationAddr(bool sapling) {
    if (Settings::getInstance()->isTestnet()) 
-        return "tmP1JL19JyJh3jPMUbfovk4W67jB7VJWybu";
+        if (sapling)
+            return "ztestsapling1kdp74adyfsmm9838jaupgfyx3npgw8ut63stjjx757pc248cuc0ymzphqeux60c64qe5qt68ygh";
+        else
+            return "ztbGDqgkmXQjheivgeirwEvJLD4SUNqsWCGwxwVg4YpGz1ARR8P2rXaptkT14z3NDKamcxNmQuvmvktyokMs7HkutRNSx1D";
    else 
-        return "t1KfJJrSuVYmnNLrw7EZHRv1kZY3zdGGLyb";    
+        if (sapling)
+            return "zs1gv64eu0v2wx7raxqxlmj354y9ycznwaau9kduljzczxztvs4qcl00kn2sjxtejvrxnkucw5xx9u";
+        else
+            return "zcEgrceTwvoiFdEvPWcsJHAMrpLsprMF6aRJiQa3fan5ZphyXLPuHghnEPrEPRoEVzUy65GnMVyCTRdkT6BYBepnXh6NBYs";    
 }

 const QString Utils::getDevSproutAddr() {