Merge pull request #112 from blockchain/development

Development

Author: ditn

src/main/java/info/blockchain/wallet/payload/PayloadManager.java

@@ -44,7 +44,7 @@
 import java.math.BigInteger;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -170,7 +170,7 @@ public Wallet recoverFromMnemonic(@Nonnull String mnemonic, @Nonnull String defa
 
         Wallet walletBody = new Wallet();
         HDWallet hdWallet = HDWallet.recoverFromMnemonic(mnemonic, defaultAccountName);
-        walletBody.setHdWallets(Arrays.asList(hdWallet));
+        walletBody.setHdWallets(Collections.singletonList(hdWallet));
 
         walletBaseBody.setWalletBody(walletBody);
 
@@ -349,16 +349,35 @@ private void saveNewWallet(String email) throws Exception {
     }
 
     /**
-     * Saves wallet to server
+     * Saves wallet to server and forces the upload of the user's addresses to allow notifications
+     * to work correctly.
+     *
+     * @return True if save successful
+     */
+    public boolean saveAndSyncPubKeys() throws
+            HDWalletException,
+            EncryptionException,
+            NoSuchAlgorithmException,
+            IOException {
+        return save(true);
+    }
+
+    /**
+     * Saves wallet to server.
+     *
      * @return True if save successful
-     * @throws HDWalletException
-     * @throws NoSuchAlgorithmException
-     * @throws EncryptionException
-     * @throws IOException
      */
-    public boolean save()
-        throws HDWalletException, NoSuchAlgorithmException,
-        EncryptionException, IOException {
+    public boolean save() throws
+            HDWalletException,
+            EncryptionException,
+            NoSuchAlgorithmException,
+            IOException {
+        return save(false);
+    }
+
+    private boolean save(boolean forcePubKeySync)
+            throws HDWalletException, NoSuchAlgorithmException,
+            EncryptionException, IOException {
 
         validateSave();
         log.info("Saving wallet");
@@ -371,28 +390,48 @@ public boolean save()
 
         //Save to server
         List<String> syncAddresses = null;
-        if(walletBaseBody.isSyncPubkeys()) {
-            syncAddresses = Tools.filterLegacyAddress(
-                LegacyAddress.NORMAL_ADDRESS,
-                walletBaseBody.getWalletBody().getLegacyAddressList());
+        if (walletBaseBody.isSyncPubkeys() || forcePubKeySync) {
+            syncAddresses = new ArrayList<>();
+
+            /*
+              This matches what iOS is doing, but it seems to be massive overkill for mobile
+              devices. I'm also filtering out archived accounts here because I don't see the point
+              in sending them.
+             */
+            for (Account account : getPayload().getHdWallets().get(0).getAccounts()) {
+                if (!account.isArchived()) {
+                    HDAccount hdAccount =
+                            getPayload().getHdWallets().get(0).getHDAccountFromAccountBody(account);
+                    int nextIndex = getNextReceiveAddressIndex(account);
+
+                    syncAddresses.addAll(
+                            Tools.getReceiveAddressList(hdAccount, nextIndex, nextIndex + 20));
+                }
+            }
+
+            syncAddresses.addAll(
+                    Tools.filterLegacyAddress(
+                            LegacyAddress.NORMAL_ADDRESS,
+                            walletBaseBody.getWalletBody().getLegacyAddressList()));
         }
+
         Call<ResponseBody> call = walletApi.updateWallet(
-            walletBaseBody.getWalletBody().getGuid(),
-            walletBaseBody.getWalletBody().getSharedKey(),
-            syncAddresses,
-            payloadWrapper.toJson(),
-            newPayloadChecksum,
-            oldPayloadChecksum,
-            BlockchainFramework.getDevice());
+                walletBaseBody.getWalletBody().getGuid(),
+                walletBaseBody.getWalletBody().getSharedKey(),
+                syncAddresses,
+                payloadWrapper.toJson(),
+                newPayloadChecksum,
+                oldPayloadChecksum,
+                BlockchainFramework.getDevice());
 
         Response<ResponseBody> exe = call.execute();
-        if(exe.isSuccessful()) {
+        if (exe.isSuccessful()) {
             //set new checksum
             walletBaseBody.setPayloadChecksum(newPayloadChecksum);
 
             return true;
-        } else{
-            log.error("Save unsuccessful");
+        } else {
+            log.error("Save unsuccessful: " + exe.errorBody().string());
             return false;
         }
     }

src/main/java/info/blockchain/wallet/util/Tools.java

@@ -1,15 +1,11 @@
 package info.blockchain.wallet.util;
 
 import com.google.common.primitives.UnsignedBytes;
+
 import info.blockchain.wallet.api.PersistentUrls;
 import info.blockchain.wallet.bip44.HDAccount;
 import info.blockchain.wallet.payload.data.LegacyAddress;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import javax.annotation.Nonnull;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.bitcoinj.core.AddressFormatException;
 import org.bitcoinj.core.Base58;
@@ -19,6 +15,14 @@
 import org.bitcoinj.core.TransactionOutput;
 import org.bitcoinj.params.MainNetParams;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
 public class Tools {
 
     public static Transaction applyBip69 (Transaction transaction) {
@@ -136,4 +140,23 @@ public static List<String> getAddressList(int chain, String xpub, int startIndex
 
         return list;
     }
+
+    /**
+     * Returns a list of receive addresses between two points on the chain.
+     *
+     * @param account    The {@link HDAccount} that you wish to derive addresses from
+     * @param startIndex The starting index, probably the next available index
+     * @param endIndex   The finishing index, an arbitrary number away from the starting point
+     * @return A non-null List of addresses as Strings
+     */
+    public static List<String> getReceiveAddressList(HDAccount account, int startIndex, int endIndex) {
+        List<String> list = new ArrayList<>();
+
+        for (int i = startIndex; i < endIndex; i++) {
+            list.add(account.getReceive().getAddressAt(i).getAddressString());
+        }
+
+        return list;
+    }
+
 }