Update display-key methods

src/algorand/AlgorandEngine.ts

@@ -708,17 +708,6 @@ export class AlgorandEngine extends CurrencyEngine<
     return edgeTransaction
   }
 
-  getDisplayPrivateSeed(privateKeys: JsonObject): string {
-    const algorandPrivateKeys = asAlgorandPrivateKeys(
-      this.currencyInfo.pluginId
-    )(privateKeys)
-    return algorandPrivateKeys.mnemonic
-  }
-
-  getDisplayPublicSeed(): string {
-    return this.walletInfo.keys.publicKey ?? ''
-  }
-
   engineGetActivationAssets = async (
     options: EdgeEngineGetActivationAssetsOptions
   ): Promise<EdgeGetActivationAssetsResults> => {

src/algorand/AlgorandTools.ts

@@ -20,7 +20,8 @@ import { getDenomInfo } from '../common/utils'
 import {
   AlgorandNetworkInfo,
   asAlgorandPrivateKeys,
-  asMaybeContractAddressLocation
+  asMaybeContractAddressLocation,
+  asSafeAlgorandWalletInfo
 } from './algorandTypes'
 
 const { isValidAddress, mnemonicFromSeed } = algosdk
@@ -37,6 +38,19 @@ export class AlgorandTools implements EdgeCurrencyTools {
     this.builtinTokens = builtinTokens
   }
 
+  async getDisplayPrivateKey(
+    privateWalletInfo: EdgeWalletInfo
+  ): Promise<string> {
+    const { pluginId } = this.currencyInfo
+    const keys = asAlgorandPrivateKeys(pluginId)(privateWalletInfo.keys)
+    return keys.mnemonic
+  }
+
+  async getDisplayPublicKey(publicWalletInfo: EdgeWalletInfo): Promise<string> {
+    const { keys } = asSafeAlgorandWalletInfo(publicWalletInfo)
+    return keys.publicKey
+  }
+
   async importPrivateKey(input: string): Promise<JsonObject> {
     const { pluginId } = this.currencyInfo
 

src/binance/BinanceEngine.ts

@@ -514,16 +514,6 @@ export class BinanceEngine extends CurrencyEngine<
       throw new Error(`Broadcast failed: ${e.message}`)
     }
   }
-
-  getDisplayPrivateSeed(privateKeys: JsonObject): string {
-    const bnbPrivateKey = asBnbPrivateKey(privateKeys)
-    return bnbPrivateKey.binanceMnemonic
-  }
-
-  getDisplayPublicSeed(): string {
-    const { keys } = this.walletInfo
-    return keys.publicKey
-  }
 }
 
 export async function makeCurrencyEngine(

src/binance/BinanceTools.ts

@@ -16,7 +16,11 @@ import {
 import { PluginEnvironment } from '../common/innerPlugin'
 import { encodeUriCommon, parseUriCommon } from '../common/uriHelpers'
 import { getDenomInfo } from '../common/utils'
-import { BinanceNetworkInfo } from './binanceTypes'
+import {
+  asBnbPrivateKey,
+  asSafeBnbWalletInfo,
+  BinanceNetworkInfo
+} from './binanceTypes'
 
 const {
   checkAddress,
@@ -39,6 +43,18 @@ export class BinanceTools implements EdgeCurrencyTools {
     this.networkInfo = networkInfo
   }
 
+  async getDisplayPrivateKey(
+    privateWalletInfo: EdgeWalletInfo
+  ): Promise<string> {
+    const keys = asBnbPrivateKey(privateWalletInfo.keys)
+    return keys.binanceMnemonic
+  }
+
+  async getDisplayPublicKey(publicWalletInfo: EdgeWalletInfo): Promise<string> {
+    const { keys } = asSafeBnbWalletInfo(publicWalletInfo)
+    return keys.publicKey
+  }
+
   // will actually use MNEMONIC version of private key
   async importPrivateKey(mnemonic: string): Promise<Object> {
     const isValid = validateMnemonic(mnemonic)

src/common/CurrencyEngine.ts

@@ -1076,14 +1076,6 @@ export class CurrencyEngine<
   // Virtual functions to be override by extension:
   //
 
-  getDisplayPrivateSeed(privateKeys: JsonObject): string | null {
-    throw new Error('not implemented')
-  }
-
-  getDisplayPublicSeed(): string | null {
-    throw new Error('not implemented')
-  }
-
   async resyncBlockchain(): Promise<void> {
     throw new Error('not implemented')
   }

src/eos/EosEngine.ts

@@ -1150,31 +1150,6 @@ export class EosEngine extends CurrencyEngine<EosTools, SafeEosWalletInfo> {
       throw err
     }
   }
-
-  getDisplayPrivateSeed(privateKeys: JsonObject): string {
-    const eosPrivateKeys = asEosPrivateKeys(privateKeys)
-    let out = ''
-    // usage of eosOwnerKey must be protected by conditional
-    // checking for its existence
-    out += 'owner key\n' + String(eosPrivateKeys.eosOwnerKey) + '\n\n'
-    out += 'active key\n' + String(eosPrivateKeys.eosKey) + '\n\n'
-    return out
-  }
-
-  getDisplayPublicSeed(): string {
-    let out = ''
-    if (this.walletInfo.keys?.ownerPublicKey != null) {
-      out +=
-        'owner publicKey\n' +
-        String(this.walletInfo.keys.ownerPublicKey) +
-        '\n\n'
-    }
-    if (this.walletInfo.keys?.publicKey != null) {
-      out +=
-        'active publicKey\n' + String(this.walletInfo.keys.publicKey) + '\n\n'
-    }
-    return out
-  }
 }
 
 export async function makeCurrencyEngine(

src/eos/EosTools.ts

@@ -30,7 +30,11 @@ import {
   asGetActivationCost,
   asGetActivationSupportedCurrencies
 } from './eosSchema'
-import { EosNetworkInfo } from './eosTypes'
+import {
+  asEosPrivateKeys,
+  asSafeEosWalletInfo,
+  EosNetworkInfo
+} from './eosTypes'
 
 export function checkAddress(address: string): boolean {
   return Name.pattern.test(address)
@@ -63,6 +67,31 @@ export class EosTools implements EdgeCurrencyTools {
     this.networkInfo = networkInfo
   }
 
+  async getDisplayPrivateKey(
+    privateWalletInfo: EdgeWalletInfo
+  ): Promise<string> {
+    const keys = asEosPrivateKeys(privateWalletInfo.keys)
+    let out = ''
+    // usage of eosOwnerKey must be protected by conditional
+    // checking for its existence
+    out += 'owner key\n' + String(keys.eosOwnerKey) + '\n\n'
+    out += 'active key\n' + String(keys.eosKey) + '\n\n'
+    return out
+  }
+
+  async getDisplayPublicKey(publicWalletInfo: EdgeWalletInfo): Promise<string> {
+    const { keys } = asSafeEosWalletInfo(publicWalletInfo)
+
+    let out = ''
+    if (keys?.ownerPublicKey != null) {
+      out += 'owner publicKey\n' + String(keys.ownerPublicKey) + '\n\n'
+    }
+    if (keys?.publicKey != null) {
+      out += 'active publicKey\n' + String(keys.publicKey) + '\n\n'
+    }
+    return out
+  }
+
   async importPrivateKey(privateKey: string): Promise<Object> {
     const strippedPrivateKey = privateKey.replace(/ /g, '') // should be in WIF format
     if (strippedPrivateKey.length !== 51) {

src/ethereum/EthereumEngine.ts

@@ -1325,17 +1325,6 @@ export class EthereumEngine extends CurrencyEngine<
     }
   }
 
-  getDisplayPrivateSeed(privateKeys: JsonObject): string {
-    const ethereumPrivateKeys = asEthereumPrivateKeys(
-      this.currencyInfo.pluginId
-    )(privateKeys)
-    return ethereumPrivateKeys.privateKey
-  }
-
-  getDisplayPublicSeed(): string | null {
-    return this.walletInfo.keys.publicKey
-  }
-
   // Overload saveTx to mutate replaced transactions by RBF
   // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
   async saveTx(edgeTransaction: EdgeTransaction) {

src/ethereum/EthereumTools.ts

@@ -20,7 +20,11 @@ import { asMaybeContractLocation, validateToken } from '../common/tokenHelpers'
 import { encodeUriCommon, parseUriCommon } from '../common/uriHelpers'
 import { biggyScience, getDenomInfo } from '../common/utils'
 import { ethereumPlugins } from './ethereumInfos'
-import { EthereumNetworkInfo } from './ethereumTypes'
+import {
+  asEthereumPrivateKeys,
+  asSafeEthWalletInfo,
+  EthereumNetworkInfo
+} from './ethereumTypes'
 
 export class EthereumTools implements EdgeCurrencyTools {
   builtinTokens: EdgeTokenMap
@@ -36,6 +40,19 @@ export class EthereumTools implements EdgeCurrencyTools {
     this.networkInfo = networkInfo
   }
 
+  async getDisplayPrivateKey(
+    privateWalletInfo: EdgeWalletInfo
+  ): Promise<string> {
+    const { pluginId } = this.currencyInfo
+    const keys = asEthereumPrivateKeys(pluginId)(privateWalletInfo.keys)
+    return keys.privateKey
+  }
+
+  async getDisplayPublicKey(publicWalletInfo: EdgeWalletInfo): Promise<string> {
+    const { keys } = asSafeEthWalletInfo(publicWalletInfo)
+    return keys.publicKey
+  }
+
   async importPrivateKey(userInput: string): Promise<Object> {
     const { pluginId } = this.currencyInfo
     const { pluginMnemonicKeyName, pluginRegularKeyName } = this.networkInfo

src/fio/FioEngine.ts

@@ -1991,15 +1991,6 @@ export class FioEngine extends CurrencyEngine<FioTools, SafeFioWalletInfo> {
   async getFreshAddress(options: any): Promise<EdgeFreshAddress> {
     return { publicAddress: this.walletInfo.keys.publicKey }
   }
-
-  getDisplayPrivateSeed(privateKeys: JsonObject): string {
-    const fioPrivateKeys = asFioPrivateKeys(privateKeys)
-    return fioPrivateKeys.fioKey
-  }
-
-  getDisplayPublicSeed(): string {
-    return this.walletInfo.keys.publicKey
-  }
 }
 
 export async function makeCurrencyEngine(

src/fio/FioTools.ts

@@ -26,7 +26,11 @@ import {
 import { DEFAULT_APR, FIO_REG_API_ENDPOINTS } from './fioConst'
 import { fioApiErrorCodes, FioError } from './fioError'
 import { currencyInfo } from './fioInfo'
-import { FioNetworkInfo } from './fioTypes'
+import {
+  asFioPrivateKeys,
+  asSafeFioWalletInfo,
+  FioNetworkInfo
+} from './fioTypes'
 
 const FIO_CURRENCY_CODE = 'FIO'
 const FIO_TYPE = 'fio'
@@ -74,6 +78,18 @@ export class FioTools implements EdgeCurrencyTools {
     }
   }
 
+  async getDisplayPrivateKey(
+    privateWalletInfo: EdgeWalletInfo
+  ): Promise<string> {
+    const keys = asFioPrivateKeys(privateWalletInfo.keys)
+    return keys.fioKey
+  }
+
+  async getDisplayPublicKey(publicWalletInfo: EdgeWalletInfo): Promise<string> {
+    const { keys } = asSafeFioWalletInfo(publicWalletInfo)
+    return keys.publicKey
+  }
+
   async importPrivateKey(userInput: string): Promise<Object> {
     const { pluginId } = this.currencyInfo
     const keys = {}

src/hedera/HederaEngine.ts

@@ -544,25 +544,6 @@ export class HederaEngine extends CurrencyEngine<
   getBlockHeight(): number {
     return Math.floor(Date.now() / 1000)
   }
-
-  getDisplayPrivateSeed(privateKeys: JsonObject): string {
-    const hederaPrivateKeys = asHederaPrivateKeys(this.currencyInfo.pluginId)(
-      privateKeys
-    )
-    return hederaPrivateKeys.mnemonic ?? hederaPrivateKeys.privateKey
-  }
-
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-  getDisplayPublicSeed() {
-    if (
-      // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
-      this.walletInfo.keys != null &&
-      this.walletInfo.keys.publicKey != null
-    ) {
-      return this.walletInfo.keys.publicKey
-    }
-    return ''
-  }
 }
 
 function hashToTxid(hash: Uint8Array): string {

src/hedera/HederaTools.ts

@@ -16,7 +16,12 @@ import {
 import { PluginEnvironment } from '../common/innerPlugin'
 import { encodeUriCommon, parseUriCommon } from '../common/uriHelpers'
 import { getDenomInfo, getFetchCors } from '../common/utils'
-import { asGetActivationCost, HederaNetworkInfo } from './hederaTypes'
+import {
+  asGetActivationCost,
+  asHederaPrivateKeys,
+  asSafeHederaWalletInfo,
+  HederaNetworkInfo
+} from './hederaTypes'
 import { createChecksum, validAddress } from './hederaUtils'
 
 // if users want to import their mnemonic phrase in e.g. MyHbarWallet.com
@@ -42,6 +47,19 @@ export class HederaTools implements EdgeCurrencyTools {
     this.networkInfo = networkInfo
   }
 
+  async getDisplayPrivateKey(
+    privateWalletInfo: EdgeWalletInfo
+  ): Promise<string> {
+    const { pluginId } = this.currencyInfo
+    const keys = asHederaPrivateKeys(pluginId)(privateWalletInfo.keys)
+    return keys.mnemonic ?? keys.privateKey
+  }
+
+  async getDisplayPublicKey(publicWalletInfo: EdgeWalletInfo): Promise<string> {
+    const { keys } = asSafeHederaWalletInfo(publicWalletInfo)
+    return keys.publicKey
+  }
+
   async createPrivateKey(walletType: string): Promise<Object> {
     if (walletType !== this.currencyInfo.walletType) {
       throw new Error('InvalidWalletType')

src/polkadot/PolkadotEngine.ts

@@ -476,17 +476,6 @@ export class PolkadotEngine extends CurrencyEngine<
 
     return edgeTransaction
   }
-
-  getDisplayPrivateSeed(privateKeys: JsonObject): string {
-    const polkadotPrivateKeys = asPolkapolkadotPrivateKeys(
-      this.currencyInfo.pluginId
-    )(privateKeys)
-    return polkadotPrivateKeys.mnemonic ?? polkadotPrivateKeys.privateKey
-  }
-
-  getDisplayPublicSeed(): string {
-    return this.walletInfo.keys.publicKey ?? ''
-  }
 }
 
 export async function makeCurrencyEngine(

src/polkadot/PolkadotTools.ts

@@ -18,7 +18,11 @@ import {
 import { PluginEnvironment } from '../common/innerPlugin'
 import { encodeUriCommon, parseUriCommon } from '../common/uriHelpers'
 import { getDenomInfo, isHex } from '../common/utils'
-import { PolkadotNetworkInfo } from './polkadotTypes'
+import {
+  asPolkapolkadotPrivateKeys,
+  asSafePolkadotWalletInfo,
+  PolkadotNetworkInfo
+} from './polkadotTypes'
 
 const { ed25519PairFromSeed, isAddress, mnemonicToMiniSecret } = utilCrypto
 
@@ -42,6 +46,19 @@ export class PolkadotTools implements EdgeCurrencyTools {
     this.polkadotApiSubscribers = new Set()
   }
 
+  async getDisplayPrivateKey(
+    privateWalletInfo: EdgeWalletInfo
+  ): Promise<string> {
+    const { pluginId } = this.currencyInfo
+    const keys = asPolkapolkadotPrivateKeys(pluginId)(privateWalletInfo.keys)
+    return keys.mnemonic ?? keys.privateKey
+  }
+
+  async getDisplayPublicKey(publicWalletInfo: EdgeWalletInfo): Promise<string> {
+    const { keys } = asSafePolkadotWalletInfo(publicWalletInfo)
+    return keys.publicKey
+  }
+
   async importPrivateKey(userInput: string): Promise<JsonObject> {
     const { pluginId } = this.currencyInfo
     if (validateMnemonic(userInput)) {