Merge pull request #379 from tronprotocol/master

merge master to develop

Author: skipjack8

README.md

@@ -29,6 +29,8 @@ soliditynode = {
     "solidity ip : port"
   ]
 } // NOTE: solidity node is optional
+
+blockNumberStartToScan = 22690588 // NOTE: this field is optional
 ```
 
 ### Run a web wallet
@@ -1535,7 +1537,14 @@ d  :2fd028965d3b455579ab28
 
 ## How to transfer shielded TRC20 token
 
-when you begin to transfer TRC20 token to shielded address, you must have a shielded address. The
+If you want to try to transfer shielded TRC20 token, you'd better set the `blockNumberStartToScan` field in `config.conf` file.
+This field is used to set the starting block that the wallet needs to scan. If you ignore this field, or set it to 0, 
+the notes you receive will probably take a long time to show up in the wallet. It is recommended that this field is 
+set to the block number in which the earliest relevant shielded contract was created. If the exact number is not known, 
+this field can be set as follows. If used in mainnet, please set 22690588. If used in Nile testnet, please set 6380000. 
+Otherwise, please set 0.
+
+When you begin to transfer TRC20 token to shielded address, you must have a shielded address. The
  following commands help to generate shielded account.
 
 ### GetSpendingKey
@@ -1869,6 +1878,8 @@ type
 
 List the note scanned by the local cache address, and the `Scaling Factor`.
 
+**NOTE** When you load shielded wallet, the wallet will scan blocks to find the notes others send to you in the backend. This will take a long time, so when you run `ListShieldedTRC20Note`, your notes will not be displayed immediately.
+
 Example:
 
 ```console

src/main/java/org/tron/core/zen/ShieldedTRC20Wrapper.java

@@ -1,6 +1,7 @@
 package org.tron.core.zen;
 
 import com.google.protobuf.ByteString;
+import com.typesafe.config.Config;
 import io.netty.util.internal.StringUtil;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,6 +12,7 @@
 import org.tron.common.utils.ByteArray;
 import org.tron.common.utils.ByteUtil;
 import org.tron.common.utils.Utils;
+import org.tron.core.config.Configuration;
 import org.tron.core.exception.CipherException;
 import org.tron.core.exception.ZksnarkException;
 import org.tron.core.zen.address.KeyIo;
@@ -62,9 +64,22 @@ public class ShieldedTRC20Wrapper {
   @Getter
   @Setter
   public List<ShieldedTRC20NoteInfo> spendUtxoList = new ArrayList<>();
+  @Getter
+  @Setter
+  public static long defaultBlockNumberToScan = 0;
 
   private boolean loadShieldedStatus = false;
 
+  static {
+    Config config = Configuration.getByPath("config.conf");
+    if (config.hasPath("blockNumberStartToScan")) {
+      try {
+        defaultBlockNumberToScan = config.getLong("blockNumberStartToScan");
+      } catch (Exception e) {
+      }
+    }
+  }
+
   private ShieldedTRC20Wrapper() {
     thread = new Thread(new scanIvkRunable());
   }
@@ -206,7 +221,7 @@ private void resetShieldedTRC20Note() throws ZksnarkException {
       byte[] key = ByteUtil.merge(entry.getValue().getIvk(),
           entry.getValue().getFullViewingKey().getAk(),
           entry.getValue().getFullViewingKey().getNk());
-      ivkMapScanBlockNum.put(ByteArray.toHexString(key), 0L);
+      ivkMapScanBlockNum.put(ByteArray.toHexString(key), defaultBlockNumberToScan);
     }
 
     utxoMapNote.clear();
@@ -234,8 +249,8 @@ private void scanBlockByIvk() throws CipherException {
         long start = entry.getValue();
         long end = start;
         while (end < blockNum) {
-          if (blockNum - start > 1000) {
-            end = start + 1000;
+          if (blockNum - start > 200) { // scan 200 blocks at a time
+            end = start + 200;
           } else {
             end = blockNum;
           }
@@ -293,10 +308,10 @@ private void scanBlockByIvk() throws CipherException {
             }
           }
           start = end;
+          ivkMapScanBlockNum.put(entry.getKey(), start);
+          updateIvkAndBlockNumFile();
         }
-        ivkMapScanBlockNum.put(entry.getKey(), blockNum);
       }
-      updateIvkAndBlockNumFile();
     }
   }
 
@@ -369,7 +384,7 @@ public boolean addNewShieldedTRC20Address(final ShieldedAddressInfo addressInfo,
                                             boolean newAddress)
       throws CipherException, ZksnarkException {
     appendAddressInfoToFile(addressInfo);
-    long blockNum = 0;
+    long blockNum = defaultBlockNumberToScan;
     if (newAddress) {
       try {
         Block block = WalletApi.getBlock(-1);

src/main/java/org/tron/walletcli/Client.java

@@ -2112,7 +2112,7 @@ private void deployContract(String[] parameter)
       if (isHex) {
         codeStr += argsStr;
       } else {
-        codeStr += Hex.toHexString(AbiUtil.encodeInput(constructorStr, argsStr));
+        codeStr += AbiUtil.parseMethod(constructorStr, argsStr);
       }
     }
     long value = 0;

src/main/resources/config.conf

@@ -15,3 +15,9 @@ fullnode = {
 #}
 
 RPC_version = 2
+
+# This field used in shielded transaction. It is recommended that this field is set to the block
+# number in which the earliest relevant shielded contract was created. If the exact number is not
+# known, this field can be set as follows. If used in mainnet, please set 22690588. If used in Nile
+# testnet, please set 6380000. Otherwise, please set 0.
+blockNumberStartToScan = 22690588