Merge pull request #67 from uniworld-io/fixClaimFuture

- review safely math cal
uniworld-io · Feb 14, 2022 · 8be7fac · 8be7fac
2 parents 4ae23b4 + b563c91
commit 8be7fac
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 59 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 group 'org.unichain'
-version '2.0.5-SNAPSHOT'
+version '2.0.5'
 
 apply plugin: 'java'
 apply plugin: 'com.google.protobuf'

diff --git a/src/main/java/org/unichain/core/actuator/TokenTransferActuatorV4.java b/src/main/java/org/unichain/core/actuator/TokenTransferActuatorV4.java
@@ -77,7 +77,9 @@ public boolean execute(TransactionResultCapsule ret) throws ContractExeException
           - don't charge token fee
         */
         if(isCreateNewAcc)
+        {
           dbManager.adjustBalanceNoPut(ownerAccountCap, -dbManager.getDynamicPropertiesStore().getCreateNewAccountFeeInSystemContract());
+        }
 
         ownerAccountCap.burnToken(tokenKey, ctx.getAmount());
         dbManager.getAccountStore().put(ownerAddr, ownerAccountCap);

diff --git a/src/main/java/org/unichain/core/db/StorageMarket.java b/src/main/java/org/unichain/core/db/StorageMarket.java
@@ -15,64 +15,35 @@ public StorageMarket(Manager manager) {
   }
 
   private long exchange_to_supply(boolean isUNW, long quant) {
-    logger.info("isUNW: " + isUNW);
     long balance = isUNW ? dbManager.getDynamicPropertiesStore().getTotalStoragePool() :
         dbManager.getDynamicPropertiesStore().getTotalStorageReserved();
-    logger.info("balance: " + balance);
-    long newBalance = balance + quant;
-    logger.info("balance + quant: " + (balance + quant));
-
-//    if (isUNW) {
-//      dbManager.getDynamicPropertiesStore().saveTotalStoragePool(newBalance);
-//    } else {
-//      dbManager.getDynamicPropertiesStore().saveTotalStorageReserved(newBalance);
-//    }
-
+    long newBalance = Math.addExact(balance, quant);
     double issuedSupply = -supply * (1.0 - Math.pow(1.0 + (double) quant / newBalance, 0.0005));
-    logger.info("issuedSupply: " + issuedSupply);
     long out = (long) issuedSupply;
-    supply += out;
-
+    supply = Math.addExact(supply, out);
     return out;
   }
 
   private long exchange_to_supply2(boolean isUNW, long quant) {
-    logger.info("isUNW: " + isUNW);
     long balance = isUNW ? dbManager.getDynamicPropertiesStore().getTotalStoragePool() :
         dbManager.getDynamicPropertiesStore().getTotalStorageReserved();
-    logger.info("balance: " + balance);
-    long newBalance = balance - quant;
-    logger.info("balance - quant: " + (balance - quant));
-
-//    if (isUNW) {
-//      dbManager.getDynamicPropertiesStore().saveTotalStoragePool(newBalance);
-//    } else {
-//      dbManager.getDynamicPropertiesStore().saveTotalStorageReserved(newBalance);
-//    }
-
+    long newBalance = Math.subtractExact(balance, quant);
     double issuedSupply = -supply * (1.0 - Math.pow(1.0 + (double) quant / newBalance, 0.0005));
-    logger.info("issuedSupply: " + issuedSupply);
     long out = (long) issuedSupply;
-    supply += out;
-
+    supply = Math.addExact(supply, out);
     return out;
   }
 
   private long exchange_from_supply(boolean isUNW, long supplyQuant) {
     long balance = isUNW ? dbManager.getDynamicPropertiesStore().getTotalStoragePool() :
         dbManager.getDynamicPropertiesStore().getTotalStorageReserved();
-    supply -= supplyQuant;
+    supply =Math.subtractExact(supply, supplyQuant);
 
-    double exchangeBalance =
-        balance * (Math.pow(1.0 + (double) supplyQuant / supply, 2000.0) - 1.0);
-    logger.info("exchangeBalance: " + exchangeBalance);
+    double exchangeBalance = balance * (Math.pow(1.0 + (double) supplyQuant / supply, 2000.0) - 1.0);
     long out = (long) exchangeBalance;
-
     if (isUNW) {
       out = Math.round(exchangeBalance / 100000) * 100000;
-      logger.info("---out: " + out);
     }
-
     return out;
   }
 
@@ -97,17 +68,13 @@ public long tryPayTax(long duration, long limit) {
     long tax = exchange(storageTax, false);
     logger.info("tax: " + tax);
 
-    long newTotalTax = dbManager.getDynamicPropertiesStore().getTotalStorageTax() + tax;
-    long newTotalPool = dbManager.getDynamicPropertiesStore().getTotalStoragePool() - tax;
-    long newTotalReserved = dbManager.getDynamicPropertiesStore().getTotalStorageReserved()
-        + storageTax;
+    long newTotalTax = Math.addExact(dbManager.getDynamicPropertiesStore().getTotalStorageTax(), tax);
+    long newTotalPool = Math.subtractExact(dbManager.getDynamicPropertiesStore().getTotalStoragePool(), tax);
+    long newTotalReserved = Math.addExact(dbManager.getDynamicPropertiesStore().getTotalStorageReserved(), storageTax);
     logger.info("reserved: " + dbManager.getDynamicPropertiesStore().getTotalStorageReserved());
-    boolean eq = dbManager.getDynamicPropertiesStore().getTotalStorageReserved()
-        == 128L * 1024 * 1024 * 1024;
+    boolean eq = dbManager.getDynamicPropertiesStore().getTotalStorageReserved() == 128L * 1024 * 1024 * 1024;
     logger.info("reserved == 128GB: " + eq);
-    logger.info("newTotalTax: " + newTotalTax + "  newTotalPool: " + newTotalPool
-        + "  newTotalReserved: " + newTotalReserved);
-
+    logger.info("newTotalTax: " + newTotalTax + "  newTotalPool: " + newTotalPool + "  newTotalReserved: " + newTotalReserved);
     return storageTax;
   }
 
@@ -116,16 +83,13 @@ public long payTax(long duration, long limit) {
     long tax = exchange(storageTax, false);
     logger.info("tax: " + tax);
 
-    long newTotalTax = dbManager.getDynamicPropertiesStore().getTotalStorageTax() + tax;
-    long newTotalPool = dbManager.getDynamicPropertiesStore().getTotalStoragePool() - tax;
-    long newTotalReserved = dbManager.getDynamicPropertiesStore().getTotalStorageReserved()
-        + storageTax;
+    long newTotalTax = Math.addExact(dbManager.getDynamicPropertiesStore().getTotalStorageTax(), tax);
+    long newTotalPool = Math.subtractExact(dbManager.getDynamicPropertiesStore().getTotalStoragePool(), tax);
+    long newTotalReserved = Math.addExact(dbManager.getDynamicPropertiesStore().getTotalStorageReserved(), storageTax);
     logger.info("reserved: " + dbManager.getDynamicPropertiesStore().getTotalStorageReserved());
-    boolean eq = dbManager.getDynamicPropertiesStore().getTotalStorageReserved()
-        == 128L * 1024 * 1024 * 1024;
+    boolean eq = dbManager.getDynamicPropertiesStore().getTotalStorageReserved() == 128L * 1024 * 1024 * 1024;
     logger.info("reserved == 128GB: " + eq);
-    logger.info("newTotalTax: " + newTotalTax + "  newTotalPool: " + newTotalPool
-        + "  newTotalReserved: " + newTotalReserved);
+    logger.info("newTotalTax: " + newTotalTax + "  newTotalPool: " + newTotalPool + "  newTotalReserved: " + newTotalReserved);
     dbManager.getDynamicPropertiesStore().saveTotalStorageTax(newTotalTax);
     dbManager.getDynamicPropertiesStore().saveTotalStoragePool(newTotalPool);
     dbManager.getDynamicPropertiesStore().saveTotalStorageReserved(newTotalReserved);

diff --git a/src/main/java/org/unichain/core/services/http/fullnode/servlet/GetAccountByIdServlet.java b/src/main/java/org/unichain/core/services/http/fullnode/servlet/GetAccountByIdServlet.java
@@ -26,7 +26,6 @@ public class GetAccountByIdServlet extends HttpServlet {
   private Wallet wallet;
 
   private String convertOutput(Account account) {
-    // convert asset id
     if (account.getAssetIssuedID().isEmpty()) {
       return JsonFormat.printToString(account, false);
     } else {

diff --git a/src/main/java/org/unichain/core/services/http/fullnode/servlet/GetFutureTransferServlet.java b/src/main/java/org/unichain/core/services/http/fullnode/servlet/GetFutureTransferServlet.java
@@ -29,7 +29,7 @@ private String convertOutput(FuturePack futurePack) {
   }
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
-
+      doPost(request, response);
   }
 
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {

diff --git a/src/main/java/org/unichain/core/services/http/fullnode/servlet/GetTokenFutureServlet.java b/src/main/java/org/unichain/core/services/http/fullnode/servlet/GetTokenFutureServlet.java
@@ -29,7 +29,7 @@ private String convertOutput(Protocol.FutureTokenPack tokenPool) {
   }
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
-
+      doPost(request, response);
   }
 
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {

diff --git a/src/main/java/org/unichain/core/services/http/fullnode/servlet/GetTokenPoolServlet.java b/src/main/java/org/unichain/core/services/http/fullnode/servlet/GetTokenPoolServlet.java
@@ -46,7 +46,7 @@ private String convertOutput(Contract.TokenPage page) {
   }
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
-
+      doPost(request, response);
   }
 
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {

diff --git a/ver.sh b/ver.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -x
-versionName='2.0.4'
-versionCode='204'
+versionName='2.0.5'
+versionCode='205'
 
 versionPath="src/main/java/org/unichain/program/Version.java"
 sed -i -e "s/versionName.*$/versionName = \"$versionName\";/g;s/versionCode.*$/versionCode = \"$versionCode\";/g" $versionPath