Merge pull request #119 from blockchain/development

Development

Author: riaanjvos

src/main/java/info/blockchain/wallet/multiaddress/MultiAddressFactory.java

@@ -59,7 +59,7 @@ private MultiAddress getMultiAddress(List<String> allActive, String onlyShow, in
 
         if (onlyShow!=null && onlyShow.equals(MULTI_ADDRESS_ALL)) {
 
-            Response<MultiAddress> call = blockExplorer.getMultiAddress(allActive, null, BlockExplorer.TX_FILTER_ALL, limit, offset).execute();
+            Response<MultiAddress> call = blockExplorer.getMultiAddress(allActive, null, BlockExplorer.TX_FILTER_REMOVE_UNSPENDABLE, limit, offset).execute();
 
             if(call.isSuccessful()) {
                 return call.body();
@@ -68,7 +68,7 @@ private MultiAddress getMultiAddress(List<String> allActive, String onlyShow, in
             }
 
         } else {
-            Response<MultiAddress> call = blockExplorer.getMultiAddress(allActive, onlyShow, BlockExplorer.TX_FILTER_ALL, limit, offset).execute();
+            Response<MultiAddress> call = blockExplorer.getMultiAddress(allActive, onlyShow, BlockExplorer.TX_FILTER_REMOVE_UNSPENDABLE, limit, offset).execute();
 
             if(call.isSuccessful()) {
                 return call.body();

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

@@ -68,7 +68,7 @@ public BigInteger getImportedAddressesBalance() {
 
     public void updateAllBalances(List<String> legacyAddressList, List<String> allAccountsAndAddresses) throws ServerConnectionException, IOException {
         Call<HashMap<String, Balance>> call = blockExplorer.getBalance(allAccountsAndAddresses,
-            BlockExplorer.TX_FILTER_ALL);
+            BlockExplorer.TX_FILTER_REMOVE_UNSPENDABLE);
 
 
         log.info("Fetching wallet balances");
@@ -104,6 +104,6 @@ public void updateAllBalances(List<String> legacyAddressList, List<String> allAc
     }
 
     public Call<HashMap<String, Balance>> getBalanceOfAddresses(List<String> addresses) {
-        return blockExplorer.getBalance(addresses, BlockExplorer.TX_FILTER_ALL);
+        return blockExplorer.getBalance(addresses, BlockExplorer.TX_FILTER_REMOVE_UNSPENDABLE);
     }
 }

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

@@ -235,8 +235,9 @@ public void initializeAndDecrypt(@Nonnull String sharedKey, @Nonnull String guid
         Response<ResponseBody> exe = call.execute();
 
         if(exe.isSuccessful()){
-            walletBaseBody = WalletBase.fromJson(exe.body().string());
-            walletBaseBody.decryptPayload(this.password);
+            final WalletBase walletBase = WalletBase.fromJson(exe.body().string());
+            walletBase.decryptPayload(this.password);
+            walletBaseBody = walletBase;
         } else {
             log.warn("Fetching wallet data failed with provided credentials");
             String errorMessage = exe.errorBody().string();

src/main/java/info/blockchain/wallet/payload/data/HDWallet.java

@@ -374,7 +374,7 @@ private static int getDeterminedSize(int walletSize, int trySize, int currentGap
         }
 
         Response<HashMap<String, Balance>> exe = blockExplorer
-            .getBalance(xpubs, BlockExplorer.TX_FILTER_ALL).execute();
+            .getBalance(xpubs, BlockExplorer.TX_FILTER_REMOVE_UNSPENDABLE).execute();
 
         if(!exe.isSuccessful()) {
             throw new Exception(exe.code() + " " + exe.errorBody().string());
@@ -405,7 +405,7 @@ public static boolean hasTransactions(BlockExplorer blockExplorer, String xpub)
         throws Exception {
 
         Response<HashMap<String, Balance>> exe = blockExplorer
-            .getBalance(Arrays.asList(xpub), BlockExplorer.TX_FILTER_ALL).execute();
+            .getBalance(Arrays.asList(xpub), BlockExplorer.TX_FILTER_REMOVE_UNSPENDABLE).execute();
 
         if (!exe.isSuccessful()) {
             throw new Exception(exe.code() + " " + exe.errorBody().string());

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

@@ -121,7 +121,7 @@ private ECKey determineKey(String hash) throws Exception {
             list.add(compressedAddress);
 
             BlockExplorer blockExplorer = new BlockExplorer(BlockchainFramework.getRetrofitServerInstance(), BlockchainFramework.getApiCode());
-            Call<HashMap<String, Balance>> call = blockExplorer.getBalance(list, BlockExplorer.TX_FILTER_ALL);
+            Call<HashMap<String, Balance>> call = blockExplorer.getBalance(list, BlockExplorer.TX_FILTER_REMOVE_UNSPENDABLE);
 
             Response<HashMap<String, Balance>> exe = call.execute();