Merge pull request #107 from blockchain/add-or-import

Add or import
blockchain · Feb 8, 2016 · 936f3ef · 936f3ef
2 parents 4a5e36e + 7e3b7cf
commit 936f3ef
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/blockchain-wallet.js b/src/blockchain-wallet.js
@@ -475,7 +475,17 @@ Wallet.prototype.addKeyToLegacyAddress = function (privateKey, addr, secPass, bi
   var modifyAddress = function (newKey) {
     var watchOnlyKey = this._addresses[addr];
     if (newKey.address !== watchOnlyKey.address) {
-      throw 'addressDoesNotMatchWithTheKey'
+      if (!this.containsLegacyAddress(newKey.address)) {
+        console.log(newKey)
+        return this.importLegacyAddress(privateKey, null, secPass, bipPass);
+      } else {
+         if (this.key(newKey.address).isWatchOnly) {
+           watchOnlyKey = this._addresses[newKey.address];
+         }  else {
+          throw 'privateKeyOfAnotherNonWatchOnlyAddress'
+         }
+      }
+
     }
     watchOnlyKey._priv = newKey._priv;
     if (this.isDoubleEncrypted) {