Merge branch 'addingKeysFix' of https://github.com/leolambo/bitcore

Author: kajoseph

packages/bitcore-wallet-client/src/lib/key.ts

@@ -299,7 +299,8 @@ export class Key {
     }
     if (this.#mnemonicEncrypted) {
       this.#validatePassword(opts.password);
-      this.#addKeyFromMnemonic(algo, this.#mnemonicEncrypted, opts);
+      const mnemonic = sjcl.decrypt(opts.password, this.#mnemonicEncrypted);
+      this.#addKeyFromMnemonic(algo, mnemonic, opts);
       return;
     }
     if (this.#hasExistingPrivateKey(existingAlgo)) {

packages/bitcore-wallet-service/src/lib/chain/sol/index.ts

@@ -220,12 +220,12 @@ export class SolChain implements IChain {
     return null;
   }
 
-  selectTxInputs(server, txp, wallet, _opts, cb) {
+  selectTxInputs(server, txp, wallet, opts, cb) {
     server.getBalance({ wallet }, (err, balance) => {
       if (err) return cb(err);
       const { totalAmount, availableAmount } = balance;
       // calculate how much space is needed to find rent amount
-      const minRentException = Defaults.MIN_SOL_BALANCE;
+      const minRentException = opts.tokenAddress ? 0 : Defaults.MIN_SOL_BALANCE;
       if (totalAmount - minRentException < txp.getTotalAmount()) {
         return cb(Errors.INSUFFICIENT_FUNDS);
       } else if (availableAmount < txp.getTotalAmount()) {