edge-currency-accountbased 0.22.21 → 0.23.0

package/lib/fio/fioTypes.js

@@ -1,4 +1,19 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); const fioOtherMethodNames = [
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+
+
+
+
+
+
+
+var _cleaners = require('cleaners');
+
+var _types = require('../common/types');
+var _fioConst = require('./fioConst');
+
+
+ const fioOtherMethodNames = [
   'getConnectedPublicAddress',
   'isFioAddressValid',
   'validateAccount',
@@ -12,4 +27,168 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ; exports.fioOtherMethodNames = fioOtherMethodNames
+
+ const asFioAction = _cleaners.asObject.call(void 0, {
+  name: _cleaners.asString,
+  params: _cleaners.asObject.call(void 0, _cleaners.asUnknown)
+}); exports.asFioAction = asFioAction
+
+ const asFioTxParams = _cleaners.asObject.call(void 0, {
+  action: _cleaners.asString,
+  account: _cleaners.asString,
+  data: _cleaners.asObject.call(void 0, _cleaners.asUnknown)
+}); exports.asFioTxParams = asFioTxParams
+
+
+
+ const asFioSignedTx = _cleaners.asObject.call(void 0, {
+  compression: _cleaners.asNumber,
+  packed_context_free_data: _cleaners.asString,
+  packed_trx: _cleaners.asString,
+  signatures: _cleaners.asArray.call(void 0, _cleaners.asString)
+}); exports.asFioSignedTx = asFioSignedTx
+
+ const asFioFee = _cleaners.asObject.call(void 0, { fee: _cleaners.asNumber }); exports.asFioFee = asFioFee
+
+
+
+
+
+
+
+ const asFioAddressParam = _cleaners.asObject.call(void 0, {
+  fioAddress: _cleaners.asString
+}); exports.asFioAddressParam = asFioAddressParam
+
+ const asFioDomainParam = _cleaners.asObject.call(void 0, {
+  fioDomain: _cleaners.asString
+}); exports.asFioDomainParam = asFioDomainParam
+
+ const asFioTransferDomainParams = _cleaners.asObject.call(void 0, {
+  fioDomain: _cleaners.asString
+}); exports.asFioTransferDomainParams = asFioTransferDomainParams
+
+ const asFioConnectAddressesParams = _cleaners.asObject.call(void 0, {
+  fioAddress: _cleaners.asString,
+  publicAddresses: _cleaners.asArray.call(void 0, 
+    _cleaners.asObject.call(void 0, {
+      token_code: _cleaners.asString,
+      chain_code: _cleaners.asString,
+      public_address: _cleaners.asString
+    })
+  )
+}); exports.asFioConnectAddressesParams = asFioConnectAddressesParams
+
+ const asFioAddBundledTransactions = _cleaners.asObject.call(void 0, {
+  fioAddress: _cleaners.asString,
+  bundleSets: _cleaners.asNumber
+}); exports.asFioAddBundledTransactions = asFioAddBundledTransactions
+
+ const asSetFioDomainVisibility = _cleaners.asObject.call(void 0, {
+  fioDomain: _cleaners.asString,
+  isPublic: _cleaners.asBoolean
+}); exports.asSetFioDomainVisibility = asSetFioDomainVisibility
+
+ const asRejectFundsRequest = _cleaners.asObject.call(void 0, {
+  payerFioAddress: _cleaners.asString,
+  fioRequestId: _cleaners.asNumber
+}); exports.asRejectFundsRequest = asRejectFundsRequest
+
+ const asCancelFundsRequest = _cleaners.asObject.call(void 0, {
+  fioAddress: _cleaners.asString,
+  fioRequestId: _cleaners.asNumber
+}); exports.asCancelFundsRequest = asCancelFundsRequest
+
+ const asFioRecordObtData = _cleaners.asObject.call(void 0, {
+  payerFioAddress: _cleaners.asString,
+  payeeFioAddress: _cleaners.asString,
+  payerPublicAddress: _cleaners.asString,
+  payeePublicAddress: _cleaners.asString,
+  amount: _cleaners.asString,
+  tokenCode: _cleaners.asString,
+  chainCode: _cleaners.asString,
+  obtId: _cleaners.asString,
+  memo: _cleaners.asString,
+  status: _cleaners.asOptional.call(void 0, 
+    _cleaners.asValue.call(void 0, 'cancelled', 'rejected', 'requested', 'sent_to_blockchain')
+  ),
+  fioRequestId: _cleaners.asOptional.call(void 0, _cleaners.asNumber)
+}); exports.asFioRecordObtData = asFioRecordObtData
+
+ const asFioRequestFundsParams = _cleaners.asObject.call(void 0, {
+  payerFioAddress: _cleaners.asString,
+  payerFioPublicKey: _cleaners.asString,
+  payeeFioAddress: _cleaners.asString,
+  payeeTokenPublicAddress: _cleaners.asString,
+  amount: _cleaners.asString,
+  chainCode: _cleaners.asString,
+  tokenCode: _cleaners.asString,
+  memo: _cleaners.asString
+}); exports.asFioRequestFundsParams = asFioRequestFundsParams
+
+ const asFioBroadcastResult = _cleaners.asObject.call(void 0, {
+  block_num: _cleaners.asNumber,
+  block_time: _cleaners.asString,
+  transaction_id: _cleaners.asString
+}).withRest; exports.asFioBroadcastResult = asFioBroadcastResult
+
+ const asFioEmptyResponse = _cleaners.asObject.call(void 0, {
+  message: _cleaners.asString
+}); exports.asFioEmptyResponse = asFioEmptyResponse
+
+ const asGetFioRequestsResponse = _cleaners.asObject.call(void 0, {
+  requests: _cleaners.asArray.call(void 0, _fioConst.asEncryptedFioRequest),
+  more: _cleaners.asNumber
+}); exports.asGetFioRequestsResponse = asGetFioRequestsResponse
+
+ const asObtData = _cleaners.asObject.call(void 0, {
+  payer_fio_address: _cleaners.asString,
+  payee_fio_address: _cleaners.asString,
+  payer_fio_public_key: _cleaners.asString,
+  payee_fio_public_key: _cleaners.asString,
+  content: _cleaners.asString,
+  fio_request_id: _cleaners.asNumber,
+  status: _cleaners.asString,
+  time_stamp: _cleaners.asString
+}); exports.asObtData = asObtData
+
+
+
+ const asGetObtDataResponse = _cleaners.asObject.call(void 0, {
+  obt_data_records: _cleaners.asArray.call(void 0, exports.asObtData),
+  more: _cleaners.asNumber
+}); exports.asGetObtDataResponse = asGetObtDataResponse
+
+
+ const asSafeFioWalletInfo = _types.asWalletInfo.call(void 0, 
+  _cleaners.asObject.call(void 0, {
+    publicKey: _cleaners.asString
+  })
+); exports.asSafeFioWalletInfo = asSafeFioWalletInfo
+
+
+ const asFioPrivateKeys = _cleaners.asObject.call(void 0, {
+  fioKey: _cleaners.asString
+}); exports.asFioPrivateKeys = asFioPrivateKeys

package/lib/hedera/hederaEngine.js

@@ -11,6 +11,7 @@ var _biggystring = require('biggystring');
 
 
 
+
 var _types = require('edge-core-js/types');
 var _rfc4648 = require('rfc4648');
 
@@ -27,11 +28,17 @@ var _utils = require('../common/utils');
 
 
 
+
+
+
 var _hederaTypes = require('./hederaTypes');
 
 const GENESIS = '1535068800' // '2018-08-24T00:00:00.000Z'
 
- class HederaEngine extends _engine.CurrencyEngine {
+ class HederaEngine extends _engine.CurrencyEngine
+
+
+ {
   
   
   
@@ -191,7 +198,7 @@ const GENESIS = '1535068800' // '2018-08-24T00:00:00.000Z'
       )
       const { accounts } = _hederaTypes.asGetHederaAccount.call(void 0, await response.json())
       for (const account of accounts) {
-        if (this.walletInfo.keys.publicKey.indexOf(account.key.key) >= 0) {
+        if (this.walletInfo.keys.publicKey.includes(account.key.key)) {
           accountId = account.account
         }
       }
@@ -485,7 +492,13 @@ const GENESIS = '1535068800' // '2018-08-24T00:00:00.000Z'
     return edgeTransaction
   }
 
-  async signTx(edgeTransaction) {
+  async signTx(
+    edgeTransaction,
+    privateKeys
+  ) {
+    const hederaPrivateKeys = _hederaTypes.asHederaPrivateKeys.call(void 0, this.currencyInfo.pluginId)(
+      privateKeys
+    )
     if (
       edgeTransaction.otherParams == null ||
       edgeTransaction.otherParams.transferTx == null
@@ -493,7 +506,7 @@ const GENESIS = '1535068800' // '2018-08-24T00:00:00.000Z'
       throw new Error('missing otherParam transferTx')
     }
 
-    const privateKey = this.walletInfo.keys[`${this.currencyInfo.pluginId}Key`]
+    const privateKey = hederaPrivateKeys.privateKey
 
     if (privateKey == null) {
       throw new Error('missing privateKey in walletInfo')
@@ -546,13 +559,11 @@ const GENESIS = '1535068800' // '2018-08-24T00:00:00.000Z'
     return Math.floor(Date.now() / 1000)
   }
 
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-  getDisplayPrivateSeed() {
-    return (
-      _nullishCoalesce(_nullishCoalesce(this.walletInfo.keys[`${this.currencyInfo.pluginId}Mnemonic`], () => (
-      this.walletInfo.keys[`${this.currencyInfo.pluginId}Key`])), () => (
-      ''))
+  getDisplayPrivateSeed(privateKeys) {
+    const hederaPrivateKeys = _hederaTypes.asHederaPrivateKeys.call(void 0, this.currencyInfo.pluginId)(
+      privateKeys
     )
+    return _nullishCoalesce(hederaPrivateKeys.mnemonic, () => ( hederaPrivateKeys.privateKey))
   }
 
   // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
@@ -575,9 +586,10 @@ const GENESIS = '1535068800' // '2018-08-24T00:00:00.000Z'
   opts
 ) {
   const { io } = env
-  const engine = new HederaEngine(env, tools, walletInfo, opts, io)
+  const safeWalletInfo = _hederaTypes.asSafeHederaWalletInfo.call(void 0, walletInfo)
+  const engine = new HederaEngine(env, tools, safeWalletInfo, opts, io)
 
-  await engine.loadEngine(tools, walletInfo, opts)
+  await engine.loadEngine(tools, safeWalletInfo, opts)
 
   return engine
 } exports.makeCurrencyEngine = makeCurrencyEngine;

package/lib/hedera/hederaTypes.js

@@ -6,8 +6,12 @@
 
 
 
+
+
 var _cleaners = require('cleaners');
 
+var _types = require('../common/types');
+
 
 
 
@@ -84,3 +88,36 @@ var _cleaners = require('cleaners');
   status: _cleaners.asString,
   account_id: _cleaners.asOptional.call(void 0, _cleaners.asString)
 }); exports.asCheckAccountCreationStatus = asCheckAccountCreationStatus
+
+
+ const asSafeHederaWalletInfo = _types.asSafeCommonWalletInfo; exports.asSafeHederaWalletInfo = asSafeHederaWalletInfo
+
+
+
+
+
+ const asHederaPrivateKeys = (
+  pluginId
+) =>
+  _cleaners.asCodec.call(void 0, 
+    (value) => {
+      const from = _cleaners.asObject.call(void 0, {
+        [`${pluginId}Mnemonic`]: _cleaners.asOptional.call(void 0, _cleaners.asString),
+        [`${pluginId}Key`]: _cleaners.asString
+      })(value)
+      const to = {
+        mnemonic: from[`${pluginId}Mnemonic`],
+        privateKey: from[`${pluginId}Key`]
+      }
+      return _cleaners.asObject.call(void 0, {
+        mnemonic: _cleaners.asOptional.call(void 0, _cleaners.asString),
+        privateKey: _cleaners.asString
+      })(to)
+    },
+    hbarPrivateKey => {
+      return {
+        [`${pluginId}Mnemonic`]: hbarPrivateKey.mnemonic,
+        [`${pluginId}Key`]: hbarPrivateKey.privateKey
+      }
+    }
+  ); exports.asHederaPrivateKeys = asHederaPrivateKeys

package/lib/polkadot/polkadotEngine.js

@@ -12,6 +12,7 @@ var _biggystring = require('biggystring');
 
 
 var _types = require('edge-core-js/types');
+var _rfc4648 = require('rfc4648');
 
 var _engine = require('../common/engine');
 
@@ -32,6 +33,9 @@ var _utils = require('../common/utils');
 
 
 
+
+
+
 var _polkadotTypes = require('./polkadotTypes');
 
 const ACCOUNT_POLL_MILLISECONDS = 5000
@@ -40,7 +44,10 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
 
 const queryTxMutex = _utils.makeMutex.call(void 0, )
 
- class PolkadotEngine extends _engine.CurrencyEngine {
+ class PolkadotEngine extends _engine.CurrencyEngine
+
+
+ {
   
   
   
@@ -98,7 +105,7 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
 
   async queryBalance() {
     const response = await this.api.query.system.account(
-      this.walletInfo.keys.publicKey 
+      this.walletInfo.keys.publicKey
     )
     this.nonce = response.nonce.toNumber()
     this.updateBalance(
@@ -379,7 +386,13 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
     return edgeTransaction
   }
 
-  async signTx(edgeTransaction) {
+  async signTx(
+    edgeTransaction,
+    privateKeys
+  ) {
+    const polkadotPrivateKeys = _polkadotTypes.asPolkapolkadotPrivateKeys.call(void 0, 
+      this.currencyInfo.pluginId
+    )(privateKeys)
     const { publicAddress } = _utils.getOtherParams.call(void 0, edgeTransaction)
     if (publicAddress == null)
       throw new Error('Missing publicAddress from makeSpend')
@@ -417,9 +430,12 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
 
     if (this.keypair == null) {
       this.keypair = new (0, _api.Keyring)({ ss58Format: 0 })
-      this.keypair.addFromUri(
-        this.walletInfo.keys[`${this.currencyInfo.pluginId}Mnemonic`]
-      )
+      if (polkadotPrivateKeys.mnemonic != null) {
+        this.keypair.addFromUri(polkadotPrivateKeys.mnemonic)
+      } else {
+        const uint8Array = _rfc4648.base16.parse(polkadotPrivateKeys.privateKey)
+        this.keypair.addFromSeed(uint8Array)
+      }
     }
 
     const signedPayload = extrinsicPayload.sign(
@@ -455,8 +471,11 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
     return edgeTransaction
   }
 
-  getDisplayPrivateSeed() {
-    return _nullishCoalesce(this.walletInfo.keys[`${this.currencyInfo.pluginId}Mnemonic`], () => ( ''))
+  getDisplayPrivateSeed(privateKeys) {
+    const polkadotPrivateKeys = _polkadotTypes.asPolkapolkadotPrivateKeys.call(void 0, 
+      this.currencyInfo.pluginId
+    )(privateKeys)
+    return _nullishCoalesce(polkadotPrivateKeys.mnemonic, () => ( polkadotPrivateKeys.privateKey))
   }
 
   getDisplayPublicSeed() {
@@ -470,10 +489,11 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
   walletInfo,
   opts
 ) {
-  const engine = new PolkadotEngine(env, tools, walletInfo, opts)
+  const safeWalletInfo = _polkadotTypes.asSafePolkadotWalletInfo.call(void 0, walletInfo)
+  const engine = new PolkadotEngine(env, tools, safeWalletInfo, opts)
 
   // Do any async initialization necessary for the engine
-  await engine.loadEngine(tools, walletInfo, opts)
+  await engine.loadEngine(tools, safeWalletInfo, opts)
 
   return engine
 } exports.makeCurrencyEngine = makeCurrencyEngine;

package/lib/polkadot/polkadotTypes.js

@@ -7,8 +7,12 @@
 
 
 
+
+
 var _cleaners = require('cleaners');
 
+var _types = require('../common/types');
+
 
 
 
@@ -53,3 +57,36 @@ var _cleaners = require('cleaners');
   count: _cleaners.asNumber,
   transfers: _cleaners.asMaybe.call(void 0, _cleaners.asArray.call(void 0, exports.asTransfer), [])
 }); exports.asTransactions = asTransactions
+
+
+ const asSafePolkadotWalletInfo = _types.asSafeCommonWalletInfo; exports.asSafePolkadotWalletInfo = asSafePolkadotWalletInfo
+
+
+
+
+
+ const asPolkapolkadotPrivateKeys = (
+  pluginId
+) =>
+  _cleaners.asCodec.call(void 0, 
+    (value) => {
+      const from = _cleaners.asObject.call(void 0, {
+        [`${pluginId}Mnemonic`]: _cleaners.asOptional.call(void 0, _cleaners.asString),
+        [`${pluginId}Key`]: _cleaners.asString
+      })(value)
+      const to = {
+        mnemonic: from[`${pluginId}Mnemonic`],
+        privateKey: from[`${pluginId}Key`]
+      }
+      return _cleaners.asObject.call(void 0, {
+        mnemonic: _cleaners.asOptional.call(void 0, _cleaners.asString),
+        privateKey: _cleaners.asString
+      })(to)
+    },
+    privateKeys => {
+      return {
+        [`${pluginId}Mnemonic`]: privateKeys.mnemonic,
+        [`${pluginId}Key`]: privateKeys.privateKey
+      }
+    }
+  ); exports.asPolkapolkadotPrivateKeys = asPolkapolkadotPrivateKeys

package/lib/solana/solanaEngine.js

@@ -12,6 +12,7 @@ var _cleaners = require('cleaners');
 
 
 var _types = require('edge-core-js/types');
+var _rfc4648 = require('rfc4648');
 
 var _engine = require('../common/engine');
 
@@ -31,6 +32,9 @@ var _utils = require('../common/utils');
 
 
 
+
+
+
 var _solanaTypes = require('./solanaTypes');
 
 const {
@@ -45,7 +49,10 @@ const ACCOUNT_POLL_MILLISECONDS = 5000
 const BLOCKCHAIN_POLL_MILLISECONDS = 20000
 const TRANSACTION_POLL_MILLISECONDS = 3000
 
- class SolanaEngine extends _engine.CurrencyEngine {
+ class SolanaEngine extends _engine.CurrencyEngine
+
+
+ {
   
   
   
@@ -382,18 +389,19 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
     return edgeTransaction
   }
 
-  async signTx(edgeTransaction) {
+  async signTx(
+    edgeTransaction,
+    privateKeys
+  ) {
+    const solanaPrivateKeys = _solanaTypes.asSolanaPrivateKeys.call(void 0, this.currencyInfo.pluginId)(
+      privateKeys
+    )
     const { unsignedSerializedSolTx } = _utils.getOtherParams.call(void 0, edgeTransaction)
     if (unsignedSerializedSolTx == null)
       throw new Error('Missing unsignedSerializedSolTx')
 
     const keypair = Keypair.fromSecretKey(
-      Uint8Array.from(
-        Buffer.from(
-          this.walletInfo.keys[`${this.currencyInfo.pluginId}Key`],
-          'hex'
-        )
-      )
+      Uint8Array.from(_rfc4648.base16.parse(solanaPrivateKeys.privateKey))
     )
 
     const solTx = Transaction.from(unsignedSerializedSolTx)
@@ -426,26 +434,15 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
     return edgeTransaction
   }
 
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-  getDisplayPrivateSeed() {
-    if (
-      // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions, @typescript-eslint/prefer-optional-chain
-      this.walletInfo.keys &&
-      // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-      this.walletInfo.keys[`${this.currencyInfo.pluginId}Mnemonic`]
-    ) {
-      return this.walletInfo.keys[`${this.currencyInfo.pluginId}Mnemonic`]
-    }
-    return ''
+  getDisplayPrivateSeed(privateKeys) {
+    const solanaPrivateKeys = _solanaTypes.asSolanaPrivateKeys.call(void 0, this.currencyInfo.pluginId)(
+      privateKeys
+    )
+    return solanaPrivateKeys.mnemonic
   }
 
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
   getDisplayPublicSeed() {
-    // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions, @typescript-eslint/prefer-optional-chain
-    if (this.walletInfo.keys && this.walletInfo.keys.publicKey) {
-      return this.walletInfo.keys.publicKey
-    }
-    return ''
+    return this.walletInfo.keys.publicKey
   }
 } exports.SolanaEngine = SolanaEngine;
 
@@ -455,10 +452,11 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
   walletInfo,
   opts
 ) {
-  const engine = new SolanaEngine(env, tools, walletInfo, opts)
+  const safeWalletInfo = _solanaTypes.asSafeSolanaWalletInfo.call(void 0, walletInfo)
+  const engine = new SolanaEngine(env, tools, safeWalletInfo, opts)
 
   // Do any async initialization necessary for the engine
-  await engine.loadEngine(tools, walletInfo, opts)
+  await engine.loadEngine(tools, safeWalletInfo, opts)
 
   return engine
 } exports.makeCurrencyEngine = makeCurrencyEngine;

package/lib/solana/solanaTypes.js

@@ -6,8 +6,12 @@
 
 
 
+
+
 var _cleaners = require('cleaners');
 
+var _types = require('../common/types');
+
 
 
 
@@ -62,3 +66,36 @@ var _cleaners = require('cleaners');
     })
   })
 }); exports.asRecentBlockHash = asRecentBlockHash
+
+
+ const asSafeSolanaWalletInfo = _types.asSafeCommonWalletInfo; exports.asSafeSolanaWalletInfo = asSafeSolanaWalletInfo
+
+
+
+
+
+ const asSolanaPrivateKeys = (
+  pluginId
+) =>
+  _cleaners.asCodec.call(void 0, 
+    (value) => {
+      const from = _cleaners.asObject.call(void 0, {
+        [`${pluginId}Mnemonic`]: _cleaners.asString,
+        [`${pluginId}Key`]: _cleaners.asString
+      })(value)
+      const to = {
+        mnemonic: from[`${pluginId}Mnemonic`],
+        privateKey: from[`${pluginId}Key`]
+      }
+      return _cleaners.asObject.call(void 0, {
+        mnemonic: _cleaners.asString,
+        privateKey: _cleaners.asString
+      })(to)
+    },
+    hbarPrivateKey => {
+      return {
+        [`${pluginId}Mnemonic`]: hbarPrivateKey.mnemonic,
+        [`${pluginId}Key`]: hbarPrivateKey.privateKey
+      }
+    }
+  ); exports.asSolanaPrivateKeys = asSolanaPrivateKeys