edge-currency-accountbased 2.2.4 → 2.4.0

package/lib/tron/TronEngine.js

@@ -17,6 +17,7 @@ var _tronweb = require('tronweb'); var _tronweb2 = _interopRequireDefault(_tronw
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 
 
 
@@ -481,15 +482,16 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
         const { currencyCode } = this.currencyInfo
 
         const edgeTransaction = {
-          txid,
-          date: Math.floor(timestamp / 1000),
-          currencyCode,
           blockHeight: blockNumber,
-          nativeAmount,
+          currencyCode,
+          date: Math.floor(timestamp / 1000),
           isSend: nativeAmount.startsWith('-'),
+          memos: [],
+          nativeAmount,
           networkFee: feeNativeAmount,
           ourReceiveAddresses: ourReceiveAddresses,
           signedTx: '',
+          txid,
           walletId: this.walletId
         }
 
@@ -518,15 +520,16 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
         const { currencyCode } = this.currencyInfo
 
         const edgeTransaction = {
-          txid,
-          date: Math.floor(timestamp / 1000),
-          currencyCode,
           blockHeight: blockNumber,
-          nativeAmount: _biggystring.mul.call(void 0, feeNativeAmount, '-1'),
+          currencyCode,
+          date: Math.floor(timestamp / 1000),
           isSend: true,
+          memos: [],
+          nativeAmount: _biggystring.mul.call(void 0, feeNativeAmount, '-1'),
           networkFee: feeNativeAmount,
           ourReceiveAddresses,
           signedTx: '',
+          txid,
           walletId: this.walletId
         }
 
@@ -554,15 +557,16 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
         const { currencyCode } = this.currencyInfo
 
         const edgeTransaction = {
-          txid,
-          date: Math.floor(timestamp / 1000),
-          currencyCode,
           blockHeight: blockNumber,
-          nativeAmount: _biggystring.mul.call(void 0, nativeAmount, '-1'),
+          currencyCode,
+          date: Math.floor(timestamp / 1000),
           isSend: true,
+          memos: [],
+          nativeAmount: _biggystring.mul.call(void 0, nativeAmount, '-1'),
           networkFee: feeNativeAmount,
           ourReceiveAddresses,
           signedTx: '',
+          txid,
           walletId: this.walletId
         }
 
@@ -591,15 +595,16 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
         const nativeAmount = _biggystring.sub.call(void 0, unfreezeAmount.toString(), feeNativeAmount)
 
         const edgeTransaction = {
-          txid,
-          date: Math.floor(timestamp / 1000),
-          currencyCode,
           blockHeight: blockNumber,
-          nativeAmount,
+          currencyCode,
+          date: Math.floor(timestamp / 1000),
           isSend: nativeAmount.startsWith('-'),
+          memos: [],
+          nativeAmount,
           networkFee: feeNativeAmount,
           ourReceiveAddresses,
           signedTx: '',
+          txid,
           walletId: this.walletId
         }
 
@@ -627,15 +632,16 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
         const { currencyCode } = this.currencyInfo
 
         const edgeTransaction = {
-          txid,
-          date: Math.floor(timestamp / 1000),
-          currencyCode,
           blockHeight: blockNumber,
-          nativeAmount: _biggystring.mul.call(void 0, nativeAmount, '-1'),
+          currencyCode,
+          date: Math.floor(timestamp / 1000),
+          memos: [],
           isSend: true,
+          nativeAmount: _biggystring.mul.call(void 0, nativeAmount, '-1'),
           networkFee: feeNativeAmount,
           ourReceiveAddresses,
           signedTx: '',
+          txid,
           walletId: this.walletId
         }
 
@@ -668,15 +674,16 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
         const nativeAmount = _biggystring.sub.call(void 0, unfreezeBalance.toString(), feeNativeAmount)
 
         const edgeTransaction = {
-          txid,
-          date: Math.floor(timestamp / 1000),
-          currencyCode,
           blockHeight: blockNumber,
-          nativeAmount,
+          currencyCode,
+          date: Math.floor(timestamp / 1000),
           isSend: nativeAmount.startsWith('-'),
+          memos: [],
+          nativeAmount,
           networkFee: feeNativeAmount,
           ourReceiveAddresses,
           signedTx: '',
+          txid,
           walletId: this.walletId
         }
 
@@ -740,15 +747,16 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
     }
 
     const edgeTransaction = {
-      txid,
-      date: Math.floor(timestamp / 1000),
-      currencyCode: metaToken.currencyCode,
       blockHeight,
-      nativeAmount,
+      currencyCode: metaToken.currencyCode,
+      date: Math.floor(timestamp / 1000),
       isSend: nativeAmount.startsWith('-'),
+      memos: [],
+      nativeAmount,
       networkFee: '0',
       ourReceiveAddresses,
       signedTx: '',
+      txid,
       walletId: this.walletId
     }
 
@@ -1106,20 +1114,21 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
     const networkFee = await this.calcTxFee({ unsignedTxHex: transactionHex })
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode: this.currencyInfo.currencyCode,
       blockHeight: 0,
-      nativeAmount: stakedAmount.nativeAmount,
+      currencyCode: this.currencyInfo.currencyCode,
+      date: 0,
       isSend: stakedAmount.nativeAmount.startsWith('-'),
+      memos: [],
+      metadata: {
+        notes: resource
+      },
+      nativeAmount: stakedAmount.nativeAmount,
       networkFee,
+      otherParams: txOtherParams,
       ourReceiveAddresses: [],
       signedTx: '',
-      otherParams: txOtherParams,
-      walletId: this.walletId,
-      metadata: {
-        notes: resource
-      }
+      txid: '',
+      walletId: this.walletId
     }
 
     return edgeTransaction
@@ -1148,20 +1157,21 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
     const networkFee = await this.calcTxFee({ unsignedTxHex: transactionHex })
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode: this.currencyInfo.currencyCode,
       blockHeight: 0,
-      nativeAmount: _biggystring.mul.call(void 0, nativeAmount, '-1'),
+      currencyCode: this.currencyInfo.currencyCode,
+      date: 0,
       isSend: true,
+      memos: [],
+      metadata: {
+        notes: resource
+      },
+      nativeAmount: _biggystring.mul.call(void 0, nativeAmount, '-1'),
       networkFee,
+      otherParams: txOtherParams,
       ourReceiveAddresses: [],
       signedTx: '',
-      otherParams: txOtherParams,
-      walletId: this.walletId,
-      metadata: {
-        notes: resource
-      }
+      txid: '',
+      walletId: this.walletId
     }
 
     return edgeTransaction
@@ -1195,20 +1205,21 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
     const networkFee = await this.calcTxFee({ unsignedTxHex: transactionHex })
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode: this.currencyInfo.currencyCode,
       blockHeight: 0,
-      nativeAmount: stakedAmount.nativeAmount,
+      currencyCode: this.currencyInfo.currencyCode,
+      date: 0,
       isSend: stakedAmount.nativeAmount.startsWith('-'),
+      memos: [],
+      metadata: {
+        notes: resource
+      },
+      nativeAmount: stakedAmount.nativeAmount,
       networkFee,
+      otherParams: txOtherParams,
       ourReceiveAddresses: [],
       signedTx: '',
-      otherParams: txOtherParams,
-      walletId: this.walletId,
-      metadata: {
-        notes: resource
-      }
+      txid: '',
+      walletId: this.walletId
     }
 
     return edgeTransaction
@@ -1251,6 +1262,8 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
   }
 
   async getMaxSpendable(spendInfo) {
+    spendInfo = _upgradeMemos.upgradeMemos.call(void 0, spendInfo, this.currencyInfo)
+    const { memos = [] } = spendInfo
     const balance = this.getBalance({
       currencyCode: spendInfo.currencyCode
     })
@@ -1259,8 +1272,8 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
       throw new Error('Error: only one output allowed')
     }
 
-    const { publicAddress, memo } = spendInfo.spendTargets[0]
-    const note = memo === '' ? undefined : memo
+    const { publicAddress } = spendInfo.spendTargets[0]
+    const note = _optionalChain([memos, 'access', _13 => _13[0], 'optionalAccess', _14 => _14.type]) === 'text' ? memos[0].value : undefined
 
     if (publicAddress == null || spendInfo.currencyCode == null) {
       throw new Error('Error: need recipient address and/or currencyCode')
@@ -1317,6 +1330,8 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
+
     // Check for other transaction types first
     if (edgeSpendInfoIn.otherParams != null) {
       let action
@@ -1338,6 +1353,7 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
     const { edgeSpendInfo, currencyCode } = super.makeSpendCheck(
       edgeSpendInfoIn
     )
+    const { memos = [] } = edgeSpendInfo
 
     const isTokenTransfer = currencyCode !== this.currencyInfo.currencyCode
 
@@ -1346,14 +1362,14 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
       throw new Error('Error: only one output allowed')
     }
 
-    const { nativeAmount, publicAddress, otherParams, memo } =
+    const { nativeAmount, publicAddress, otherParams } =
       edgeSpendInfo.spendTargets[0]
     if (publicAddress == null)
       throw new Error('makeSpend Missing publicAddress')
 
     if (nativeAmount == null) throw new (0, _types.NoAmountSpecifiedError)()
     const data =
-      _nullishCoalesce(_optionalChain([otherParams, 'optionalAccess', _13 => _13.data]), () => (
+      _nullishCoalesce(_optionalChain([otherParams, 'optionalAccess', _15 => _15.data]), () => (
       (currencyCode !== this.currencyInfo.currencyCode
         ? _tronUtils.encodeTRC20Transfer.call(void 0, publicAddress, nativeAmount)
         : undefined)))
@@ -1361,13 +1377,13 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
       ? this.allTokens.find(token => token.currencyCode === currencyCode)
       : undefined
 
-    const note = memo === '' ? undefined : memo
+    const note = _optionalChain([memos, 'access', _16 => _16[0], 'optionalAccess', _17 => _17.type]) === 'text' ? memos[0].value : undefined
 
     const txTransferParams = {
       currencyCode,
       toAddress: publicAddress,
       nativeAmount,
-      contractAddress: _optionalChain([metaToken, 'optionalAccess', _14 => _14.contractAddress]),
+      contractAddress: _optionalChain([metaToken, 'optionalAccess', _18 => _18.contractAddress]),
       data,
       note
     }
@@ -1381,8 +1397,8 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
     })
 
     const tokenOpts =
-      _optionalChain([metaToken, 'optionalAccess', _15 => _15.contractAddress]) != null && data != null
-        ? { contractAddress: _optionalChain([metaToken, 'optionalAccess', _16 => _16.contractAddress]), data }
+      _optionalChain([metaToken, 'optionalAccess', _19 => _19.contractAddress]) != null && data != null
+        ? { contractAddress: _optionalChain([metaToken, 'optionalAccess', _20 => _20.contractAddress]), data }
         : undefined
 
     const totalFeeSUN = await this.calcTxFee({
@@ -1422,16 +1438,17 @@ const NETWORKFEES_POLL_MILLISECONDS = 60 * 10 * 1000
     // **********************************
     // Create the unsigned EdgeTransaction
     const edgeTransaction = {
-      txid: '', // txid
-      date: 0, // date
-      currencyCode, // currencyCode
       blockHeight: 0, // blockHeight
-      nativeAmount: _biggystring.mul.call(void 0, edgeNativeAmount, '-1'), // nativeAmount
+      currencyCode, // currencyCode
+      date: 0, // date
       isSend: true,
+      memos,
+      nativeAmount: _biggystring.mul.call(void 0, edgeNativeAmount, '-1'), // nativeAmount
       networkFee, // networkFee
+      otherParams: txOtherParams, // otherParams
       ourReceiveAddresses: [], // ourReceiveAddresses
       signedTx: '', // signedTx
-      otherParams: txOtherParams, // otherParams
+      txid: '', // txid
       walletId: this.walletId
     }
 

package/lib/tron/tronInfo.js

@@ -110,21 +110,16 @@ const builtinTokens = {
 }; exports.networkInfo = networkInfo
 
  const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'TRX',
   displayName: 'Tron',
   pluginId: 'tron',
   walletType: 'wallet:tron',
 
-  defaultSettings: {},
-
-  memoType: 'text',
-
+  // Explorers:
   addressExplorer: 'https://tronscan.org/#/address/%s',
   transactionExplorer: 'https://tronscan.org/#/transaction/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'TRX',
       multiplier: '1000000',
@@ -132,7 +127,13 @@ const builtinTokens = {
     }
   ],
 
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+  // https://developers.tron.network/v3.7/docs/how-to-build-a-transaction-locally
+  memoOptions: [{ type: 'text', memoName: 'data', maxLength: 10 }],
+
+  // Deprecated:
+  defaultSettings: {},
+  memoType: 'text',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const tron = _innerPlugin.makeOuterPlugin({

package/lib/zcash/ZcashEngine.js

@@ -8,10 +8,13 @@
 
 
 
+
+
 var _types = require('edge-core-js/types');
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 var _utils = require('../common/utils');
 
 
@@ -42,11 +45,14 @@ var _zcashTypes = require('./zcashTypes');
   
   
   
-  
-  
 
 
 
+  // Synchronizer management
+  
+  
+  
+
   constructor(
     env,
     tools,
@@ -60,6 +66,8 @@ var _zcashTypes = require('./zcashTypes');
     this.networkInfo = networkInfo
     this.makeSynchronizer = makeSynchronizer
     this.queryMutex = false
+
+    this.started = false
   }
 
   setOtherData(raw) {
@@ -67,7 +75,7 @@ var _zcashTypes = require('./zcashTypes');
   }
 
   initData() {
-    const { birthdayHeight, alias } = this.initializer
+    const { birthdayHeight } = this.initializer
 
     // walletLocalData
     if (this.otherData.blockRange.first === 0) {
@@ -78,7 +86,6 @@ var _zcashTypes = require('./zcashTypes');
     }
 
     // Engine variables
-    this.alias = alias
     this.initialNumBlocksToDownload = -1
     this.synchronizerStatus = 'DISCONNECTED'
     this.availableZatoshi = '0'
@@ -86,6 +93,7 @@ var _zcashTypes = require('./zcashTypes');
   }
 
   initSubscriptions() {
+    if (this.synchronizer == null) return
     this.synchronizer.on('update', async payload => {
       const { lastDownloadedHeight, scanProgress, networkBlockHeight } = payload
       this.onUpdateBlockHeight(networkBlockHeight)
@@ -175,10 +183,8 @@ var _zcashTypes = require('./zcashTypes');
   }
 
   async startEngine() {
-    this.initData()
-    this.synchronizer = await this.makeSynchronizer(this.initializer)
-    await this.synchronizer.start()
-    this.initSubscriptions()
+    this.engineOn = true
+    this.started = true
     await super.startEngine()
   }
 
@@ -188,9 +194,9 @@ var _zcashTypes = require('./zcashTypes');
   }
 
   async queryBalance() {
-    if (!this.isSynced()) return
+    if (!this.isSynced() || this.synchronizer == null) return
     try {
-      const balances = await this.synchronizer.getShieldedBalance()
+      const balances = await this.synchronizer.getBalance()
       if (balances.totalZatoshi === '-1') return
       this.availableZatoshi = balances.availableZatoshi
       this.updateBalance(this.currencyInfo.currencyCode, balances.totalZatoshi)
@@ -201,6 +207,7 @@ var _zcashTypes = require('./zcashTypes');
   }
 
   async queryTransactions() {
+    if (this.synchronizer == null) return
     try {
       let first = this.otherData.blockRange.first
       let last = this.otherData.blockRange.last
@@ -254,24 +261,62 @@ var _zcashTypes = require('./zcashTypes');
       ourReceiveAddresses.push(this.walletInfo.keys.publicKey)
     }
 
+    const memos = []
+    if (tx.memo != null) {
+      memos.push({
+        type: 'text',
+        value: tx.memo
+      })
+    }
+
     const edgeTransaction = {
-      txid: tx.rawTransactionId,
-      date: tx.blockTimeInSeconds,
-      currencyCode: this.currencyInfo.currencyCode,
       blockHeight: tx.minedHeight,
-      nativeAmount: netNativeAmount,
+      currencyCode: this.currencyInfo.currencyCode,
+      date: tx.blockTimeInSeconds,
       isSend: netNativeAmount.startsWith('-'),
+      memos,
+      nativeAmount: netNativeAmount,
       networkFee: this.networkInfo.defaultNetworkFee,
+      otherParams: {},
       ourReceiveAddresses, // blank if you sent money otherwise array of addresses that are yours in this transaction
       signedTx: '',
-      otherParams: {},
+      txid: tx.rawTransactionId,
       walletId: this.walletId
     }
     this.addTransaction(this.currencyInfo.currencyCode, edgeTransaction)
   }
 
+  async syncNetwork(opts) {
+    if (!this.started) return 1000
+
+    const zcashPrivateKeys = _zcashTypes.asZcashPrivateKeys.call(void 0, this.currencyInfo.pluginId)(
+      _optionalChain([opts, 'optionalAccess', _ => _.privateKeys])
+    )
+
+    const { rpcNode } = this.networkInfo
+    this.initializer = {
+      mnemonicSeed: zcashPrivateKeys.mnemonic,
+      birthdayHeight: zcashPrivateKeys.birthdayHeight,
+      alias: this.walletInfo.keys.publicKey.slice(0, 99),
+      ...rpcNode
+    }
+
+    this.synchronizer = await this.makeSynchronizer(this.initializer)
+    this.initData()
+    this.initSubscriptions()
+
+    return await new Promise(resolve => {
+      this.stopSyncing = resolve
+    })
+  }
+
   async killEngine() {
-    await this.synchronizer.stop()
+    this.started = false
+    if (this.stopSyncing != null) {
+      await this.stopSyncing(1000)
+      this.stopSyncing = undefined
+    }
+    await _optionalChain([this, 'access', _2 => _2.synchronizer, 'optionalAccess', _3 => _3.stop, 'call', _4 => _4()])
     await super.killEngine()
   }
 
@@ -284,9 +329,11 @@ var _zcashTypes = require('./zcashTypes');
     await super.killEngine()
     await this.clearBlockchainCache()
     await this.startEngine()
-    this.synchronizer
-      .rescan(this.walletInfo.keys.birthdayHeight)
-      .catch((e) => this.warn('resyncBlockchain failed: ', e))
+    _optionalChain([this, 'access', _5 => _5.synchronizer
+, 'optionalAccess', _6 => _6.rescan, 'call', _7 => _7()
+, 'access', _8 => _8.catch, 'call', _9 => _9((e) => this.warn('resyncBlockchain failed: ', e))])
+    this.initData()
+    this.synchronizerStatus = 'SYNCING'
   }
 
   async getMaxSpendable() {
@@ -300,8 +347,10 @@ var _zcashTypes = require('./zcashTypes');
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     if (!this.isSynced()) throw new Error('Cannot spend until wallet is synced')
     const { edgeSpendInfo, currencyCode } = this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
     const spendTarget = edgeSpendInfo.spendTargets[0]
     const { publicAddress, nativeAmount } = spendTarget
 
@@ -330,27 +379,19 @@ var _zcashTypes = require('./zcashTypes');
     // **********************************
     // Create the unsigned EdgeTransaction
 
-    const spendTargets = edgeSpendInfo.spendTargets.map(si => ({
-      uniqueIdentifier: si.uniqueIdentifier,
-      memo: si.memo,
-      nativeAmount: _nullishCoalesce(si.nativeAmount, () => ( '0')),
-      currencyCode,
-      publicAddress
-    }))
-
     const txNativeAmount = _biggystring.mul.call(void 0, totalTxAmount, '-1')
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode,
       blockHeight: 0,
-      nativeAmount: txNativeAmount,
+      currencyCode,
+      date: 0,
       isSend: true,
+      memos,
+      nativeAmount: txNativeAmount,
       networkFee: this.networkInfo.defaultNetworkFee,
       ourReceiveAddresses: [],
       signedTx: '',
-      spendTargets,
+      txid: '',
       walletId: this.walletId
     }
 
@@ -366,8 +407,10 @@ var _zcashTypes = require('./zcashTypes');
     edgeTransaction,
     opts
   ) {
+    if (this.synchronizer == null) throw new Error('Synchronizer undefined')
+    const { memos } = edgeTransaction
     const zcashPrivateKeys = _zcashTypes.asZcashPrivateKeys.call(void 0, this.pluginId)(
-      _optionalChain([opts, 'optionalAccess', _ => _.privateKeys])
+      _optionalChain([opts, 'optionalAccess', _10 => _10.privateKeys])
     )
     if (
       edgeTransaction.spendTargets == null ||
@@ -375,6 +418,7 @@ var _zcashTypes = require('./zcashTypes');
     )
       throw new Error('Invalid spend targets')
 
+    const memo = _optionalChain([memos, 'access', _11 => _11[0], 'optionalAccess', _12 => _12.type]) === 'text' ? memos[0].value : ''
     const spendTarget = edgeTransaction.spendTargets[0]
     const txParams = {
       zatoshi: _biggystring.sub.call(void 0, 
@@ -382,9 +426,9 @@ var _zcashTypes = require('./zcashTypes');
         edgeTransaction.networkFee
       ),
       toAddress: spendTarget.publicAddress,
-      memo: _nullishCoalesce(_nullishCoalesce(spendTarget.memo, () => ( spendTarget.uniqueIdentifier)), () => ( '')),
+      memo,
       fromAccountIndex: 0,
-      spendingKey: zcashPrivateKeys.spendKey
+      mnemonicSeed: zcashPrivateKeys.mnemonic
     }
 
     try {
@@ -400,20 +444,15 @@ var _zcashTypes = require('./zcashTypes');
     return edgeTransaction
   }
 
-  async loadEngine() {
-    const { walletInfo } = this
-    await super.loadEngine()
-    this.engineOn = true
-
-    const { rpcNode } = this.networkInfo
-    this.initializer = {
-      fullViewingKey: walletInfo.keys.unifiedViewingKeys,
-      birthdayHeight: walletInfo.keys.birthdayHeight,
-      alias: walletInfo.keys.publicKey,
-      ...rpcNode
+  async getFreshAddress() {
+    if (this.synchronizer == null) throw new Error('Synchronizer undefined')
+    const unifiedAddress = await this.synchronizer.deriveUnifiedAddress()
+    return {
+      publicAddress: unifiedAddress
     }
   }
 } exports.ZcashEngine = ZcashEngine;
+
  async function makeCurrencyEngine(
   env,
   tools,
@@ -421,8 +460,7 @@ var _zcashTypes = require('./zcashTypes');
   opts
 ) {
   const safeWalletInfo = _zcashTypes.asSafeZcashWalletInfo.call(void 0, walletInfo)
-  const { makeSynchronizer } =
-    env.nativeIo['edge-currency-accountbased'][env.networkInfo.nativeSdk]
+  const { makeSynchronizer } = env.nativeIo['edge-currency-accountbased'].zcash
 
   const engine = new ZcashEngine(
     env,