[Bitcore] Solana Support

packages/bitcore-client/src/wallet.ts

@@ -1,5 +1,5 @@
 import * as Bcrypt from 'bcrypt';
-import { BitcoreLib, BitcoreLibCash, BitcoreLibDoge, BitcoreLibLtc, Deriver, ethers, Transactions, Web3, xrpl } from 'crypto-wallet-core';
+import { BitcoreLib, BitcoreLibCash, BitcoreLibDoge, BitcoreLibLtc, Deriver, ethers, SolWeb3, Transactions, Web3, xrpl } from 'crypto-wallet-core';
 import 'source-map-support/register';
 import { Client } from './client';
 import { Encryption } from './encryption';
@@ -18,7 +18,8 @@ const chainLibs = {
   ARB: { Web3, ethers },
   BASE: { Web3, ethers },
   OP: { Web3, ethers },
-  XRP: xrpl
+  XRP: xrpl,
+  SOL: SolWeb3
 };
 
 export interface KeyImport {
@@ -196,7 +197,7 @@ export class Wallet {
     let alreadyExists;
     try {
       alreadyExists = await this.loadWallet({ storage, name, storageType });
-    } catch (err) {}
+    } catch (err) { }
     if (alreadyExists) {
       throw new Error('Wallet already exists');
     }
@@ -285,6 +286,10 @@ export class Wallet {
     return ['ETH', 'MATIC', 'ARB', 'OP', 'BASE'].includes(this.chain?.toUpperCase());
   }
 
+  isSvmChain() {
+    return ['SOL'].includes(this.chain?.toUpperCase());
+  }
+
   lock() {
     this.unlocked = undefined;
     return this;
@@ -301,6 +306,7 @@ export class Wallet {
       const encMasterKey = this.masterKey;
       const masterKeyStr = await Encryption.decryptPrivateKey(encMasterKey, this.pubKey, encryptionKey);
       masterKey = JSON.parse(masterKeyStr);
+      masterKey = masterKey?.privateKey || masterKey;
     }
     this.unlocked = {
       encryptionKey,
@@ -454,7 +460,7 @@ export class Wallet {
     if (!this.tokens) {
       return;
     }
-    this.tokens = this.tokens.filter(tok => 
+    this.tokens = this.tokens.filter(tok =>
       (tok.name && tok.name !== tokenName) ||
       /* legacy object */ (!tok.name && tok.symbol !== tokenName)
     );
@@ -785,7 +791,7 @@ export class Wallet {
         console.log(`Bumping fee rate to ${params.feeRate} sats/byte`);
       }
 
-    // EVM chains
+      // EVM chains
     } else {
       const { nonce, gasLimit, gasPrice, to, data, value, chainId, type } = existingTx;
       // converting gasLimit and value with toString avoids a bigNumber warning
@@ -796,7 +802,7 @@ export class Wallet {
       params.chainId = chainId;
       params.type = type;
       params.recipients = [{ address: to, amount: value.toString() }];
-      
+
       // TODO fix type2 support
       if (false && existingTx.type === 2) {
         if (feeRate) {
@@ -806,15 +812,15 @@ export class Wallet {
           // params.maxGasFee = (await wallet.getNetworkFee({ target: feeTarget })).feerate;
           // console.log(`Bumping max gas price to ${Web3.utils.fromWei(params.maxGasFee.toString(), 'gwei')} gwei`);
         }
-        if (feePriority) {    
+        if (feePriority) {
           params.maxPriorityFee = Web3.utils.toWei(feePriority.toString(), 'gwei');
         } else {
           // TODO placeholder until for type2 support is merged in another PR
           // params.maxPriorityFee = existingTx.maxPriorityFeePerGas;
           // console.log(`Bumping max priority fee to ${Web3.utils.fromWei(params.maxPriorityFee.toString(), 'gwei')} gwei`);
         }
 
-      // type 0
+        // type 0
       } else {
         if (feeRate) {
           params.gasPrice = Web3.utils.toWei(feeRate.toString(), 'gwei');
@@ -823,7 +829,7 @@ export class Wallet {
           console.log(`Bumping gas price to ${Web3.utils.fromWei(params.gasPrice.toString(), 'gwei')} gwei`);
         }
       }
-      
+
     }
 
     const tx: string = await this.newTx(params);
@@ -862,7 +868,7 @@ export const AddressTypes = {
     // witnesspubkeyhash
     witnesspubkeyhash: 'witnesspubkeyhash',
     p2wpkh: 'witnesspubkeyhash',
-    
+
     // taproot
     taproot: 'taproot',
     p2tr: 'taproot'