edge-currency-accountbased 2.2.3 → 2.3.0

package/lib/ethereum/info/zksyncInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   '3355df6d4c9c3035724fd0e3914de96a5a83aaf4': {
@@ -74,28 +75,29 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'ETH',
   displayName: 'zkSync',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'zksync',
   walletType: 'wallet:zksync',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://explorer.zksync.io/address/%s',
   transactionExplorer: 'https://explorer.zksync.io/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'ETH',
       multiplier: '1000000000000000000',
       symbol: 'Ξ'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const zksync = _innerPlugin.makeOuterPlugin({

package/lib/filecoin/FilecoinEngine.js

@@ -23,6 +23,7 @@ var _types = require('edge-core-js/types');
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 
 
 
@@ -51,6 +52,7 @@ const CHECK_TRANSACTION_INTERVAL = 15000
   
   
   
+  
 
   // Backends:
   
@@ -68,6 +70,10 @@ const CHECK_TRANSACTION_INTERVAL = 15000
     const { networkInfo } = env
     this.address = _izarifilecoin.Address.fromString(walletInfo.keys.address)
     this.availableAttoFil = '0'
+    this.isScanning = false
+    this.networkInfo = networkInfo
+    this.pluginId = this.currencyInfo.pluginId
+
     this.filRpc = new (0, _izarifilecoin.RPC)(env.networkInfo.rpcNode.networkName, {
       url: env.networkInfo.rpcNode.url,
       token: env.currencyInfo.currencyCode
@@ -75,9 +81,6 @@ const CHECK_TRANSACTION_INTERVAL = 15000
     this.filfoxApi = new (0, _Filfox.Filfox)(env.networkInfo.filfoxUrl, env.io.fetchCors)
     this.filscanApi = new (0, _Filscan.Filscan)(env.networkInfo.filscanUrl, env.io.fetchCors)
     this.rpcExtra = new (0, _RpcExtra.RpcExtra)(env.networkInfo.rpcNode.url, env.io.fetchCors)
-
-    this.networkInfo = networkInfo
-    this.pluginId = this.currencyInfo.pluginId
   }
 
   setOtherData(raw) {
@@ -85,9 +88,7 @@ const CHECK_TRANSACTION_INTERVAL = 15000
   }
 
   initData() {
-    // Initialize walletLocalData:
-    // ...
-
+    this.tokenCheckTransactionsStatus[this.currencyInfo.currencyCode] = 0
     // Engine variables
     this.availableAttoFil = '0'
   }
@@ -161,7 +162,9 @@ const CHECK_TRANSACTION_INTERVAL = 15000
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     const { edgeSpendInfo, currencyCode } = this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
     const spendTarget = edgeSpendInfo.spendTargets[0]
     const { publicAddress, nativeAmount } = spendTarget
 
@@ -189,19 +192,20 @@ const CHECK_TRANSACTION_INTERVAL = 15000
     }
 
     const networkFee = _biggystring.mul.call(void 0, txJson.GasLimit.toString(), txJson.GasPremium) // TODO: Include base fee and burn fee somehow?
-    const totalTxAmount = _biggystring.add.call(void 0, nativeAmount, networkFee)
+    const txNativeAmount = _biggystring.mul.call(void 0, _biggystring.add.call(void 0, nativeAmount, networkFee), '-1')
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode,
       blockHeight: 0,
-      nativeAmount: `-${totalTxAmount}`,
-      isSend: nativeAmount.startsWith('-'),
+      currencyCode,
+      date: 0,
+      isSend: true,
+      memos,
+      nativeAmount: txNativeAmount,
       networkFee,
-      ourReceiveAddresses: [],
       otherParams,
+      ourReceiveAddresses: [],
       signedTx: '',
+      txid: '',
       walletId: this.walletId
     }
 
@@ -230,6 +234,8 @@ const CHECK_TRANSACTION_INTERVAL = 15000
       sigJson: signature.toJSON()
     }
 
+    edgeTransaction.date = Date.now() / 1000
+
     return edgeTransaction
   }
 
@@ -297,52 +303,71 @@ const CHECK_TRANSACTION_INTERVAL = 15000
   }
 
   async checkTransactions() {
-    const addressString = this.address.toString()
-
-    const handleScanProgress = (progress) => {
-      const currentProgress =
-        this.tokenCheckTransactionsStatus[this.currencyInfo.currencyCode]
-      const newProgress = progress
-
-      if (
-        // Only send event if we haven't completed sync
-        currentProgress < 1 &&
-        // Avoid thrashing
-        (newProgress >= 1 || newProgress > currentProgress * 1.1)
-      ) {
-        this.tokenCheckTransactionsStatus[this.currencyInfo.currencyCode] =
-          newProgress
-        this.updateOnAddressesChecked()
+    // We shouldn't start scanning if scanning is already happening:
+    if (this.isScanning) return
+    try {
+      this.isScanning = true
+
+      const addressString = this.address.toString()
+
+      const handleScanProgress = (progress) => {
+        const currentProgress =
+          this.tokenCheckTransactionsStatus[this.currencyInfo.currencyCode]
+        const newProgress = progress
+
+        if (
+          // Only send event if we haven't completed sync
+          currentProgress < 1 &&
+          // Avoid thrashing
+          (newProgress >= 1 || newProgress > currentProgress * 1.1)
+        ) {
+          this.tokenCheckTransactionsStatus[this.currencyInfo.currencyCode] =
+            newProgress
+          this.updateOnAddressesChecked()
+        }
       }
-    }
 
-    const handleScan = ({
-      tx,
-      progress
-    }
+      const handleScan = ({
+        tx,
+        progress
+      }
 
 
 ) => {
-      this.addTransaction(this.currencyInfo.currencyCode, tx)
-      this.onUpdateTransactions()
+        this.addTransaction(this.currencyInfo.currencyCode, tx)
+        this.onUpdateTransactions()
+
+        // Progress the block-height if the message's height is greater than
+        // last poll for block-height.
+        if (this.walletLocalData.blockHeight < tx.blockHeight) {
+          this.onUpdateBlockHeight(tx.blockHeight)
+        }
 
-      // Progress the block-height if the message's height is greater than
-      // last poll for block-height.
-      if (this.walletLocalData.blockHeight < tx.blockHeight) {
-        this.onUpdateBlockHeight(tx.blockHeight)
+        handleScanProgress(progress)
       }
 
-      handleScanProgress(progress)
-    }
+      const scanners = [
+        // this.scanTransactionsFromFilscan(addressString, handleScan),
+        this.scanTransactionsFromFilfox(addressString, handleScan)
+      ]
+
+      const startingNetworkHeight = this.walletLocalData.blockHeight
 
-    const scanners = [
-      this.scanTransactionsFromFilscan(addressString, handleScan),
-      this.scanTransactionsFromFilfox(addressString, handleScan)
-    ]
+      // Run scanners:
+      await Promise.all(scanners)
 
-    await Promise.all(scanners)
+      // Save the network height at the start of the scanning
+      this.walletLocalData.lastAddressQueryHeight = startingNetworkHeight
+      this.walletLocalDataDirty = true
 
-    handleScanProgress(1)
+      // Make sure the sync progress is 100%
+      handleScanProgress(1)
+    } catch (error) {
+      console.error(error)
+      throw error
+    } finally {
+      this.isScanning = false
+    }
   }
 
   async scanTransactionsFromFilfox(
@@ -367,17 +392,14 @@ const CHECK_TRANSACTION_INTERVAL = 15000
 
       const messages = messagesResponse.messages
       for (const message of messages) {
-        const txid = message.cid
-        const idx = this.findTransaction(this.currencyInfo.currencyCode, txid)
-
-        if (idx >= 0) {
-          // Exit early because we reached transaction history from previous
-          // check
-          return
-        }
+        // Exit when we reach a transaction we may already have saved
+        if (message.height < this.walletLocalData.lastAddressQueryHeight) return
 
         // Process message into a transaction
-        const tx = this.filfoxMessageToEdgeTransaction(message)
+        const messageDetails = await this.filfoxApi.getMessageDetails(
+          message.cid
+        )
+        const tx = this.filfoxMessageToEdgeTransaction(messageDetails)
 
         // Calculate the progress
         const progress =
@@ -410,14 +432,8 @@ const CHECK_TRANSACTION_INTERVAL = 15000
 
       const messages = messagesResponse.messages_by_account_id_list
       for (const message of messages) {
-        const txid = message.cid
-        const idx = this.findTransaction(this.currencyInfo.currencyCode, txid)
-
-        if (idx >= 0) {
-          // Exit early because we reached transaction history from previous
-          // check
-          return
-        }
+        // Exit when we reach a transaction we may already have saved
+        if (message.height < this.walletLocalData.lastAddressQueryHeight) return
 
         // Process message into a transaction
         const tx = this.filscanMessageToEdgeTransaction(message)
@@ -432,31 +448,46 @@ const CHECK_TRANSACTION_INTERVAL = 15000
   }
 
   __init() {this.filfoxMessageToEdgeTransaction = (
-    message
+    messageDetails
   ) => {
     const addressString = this.address.toString()
-    let netNativeAmount = message.value
     const ourReceiveAddresses = []
 
-    const networkFee = '0' // TODO: calculate transaction fee from onchain gas fields
-    if (message.to !== addressString) {
-      // check if tx is a spend
-      netNativeAmount = `-${_biggystring.add.call(void 0, netNativeAmount, networkFee)}`
+    // Handle network fees:
+    const networkFee = messageDetails.transfers
+      .filter(
+        transfer =>
+          transfer.type === 'miner-fee' || transfer.type === 'burner-fee'
+      )
+      .reduce((sum, transfer) => _biggystring.add.call(void 0, sum, transfer.value), '0')
+
+    // Handle native amount:
+    let nativeAmount
+    if (messageDetails.from === addressString) {
+      // For spends, always include network fee
+      nativeAmount = `-${networkFee}`
+      if (messageDetails.to !== addressString) {
+        // For spends not to self, subtract tx value
+        nativeAmount = _biggystring.sub.call(void 0, nativeAmount, messageDetails.value)
+      }
     } else {
+      // For receives nativeAMount is always positively the value
+      nativeAmount = messageDetails.value
       ourReceiveAddresses.push(addressString)
     }
 
     const edgeTransaction = {
-      txid: message.cid,
-      date: message.timestamp,
+      blockHeight: messageDetails.height,
       currencyCode: this.currencyInfo.currencyCode,
-      blockHeight: message.height,
-      nativeAmount: netNativeAmount,
-      isSend: netNativeAmount.startsWith('-'),
+      date: messageDetails.timestamp,
+      isSend: nativeAmount.startsWith('-'),
+      memos: [],
+      nativeAmount,
       networkFee,
+      otherParams: {},
       ourReceiveAddresses, // blank if you sent money otherwise array of addresses that are yours in this transaction
       signedTx: '',
-      otherParams: {},
+      txid: messageDetails.cid,
       walletId: this.walletId
     }
 
@@ -465,28 +496,35 @@ const CHECK_TRANSACTION_INTERVAL = 15000
 
   filscanMessageToEdgeTransaction(message) {
     const addressString = this.address.toString()
-    let netNativeAmount = message.value
     const ourReceiveAddresses = []
 
     const networkFee = '0' // TODO: calculate transaction fee from onchain gas fields
-    if (message.to !== addressString) {
-      // check if tx is a spend
-      netNativeAmount = `-${_biggystring.add.call(void 0, netNativeAmount, networkFee)}`
+    let nativeAmount
+    if (message.from === addressString) {
+      // For spends, always include network fee
+      nativeAmount = `-${networkFee}`
+      if (message.to !== addressString) {
+        // For spends not to self, subtract tx value
+        nativeAmount = _biggystring.sub.call(void 0, nativeAmount, message.value)
+      }
     } else {
+      // For receives nativeAMount is always positively the value
+      nativeAmount = message.value
       ourReceiveAddresses.push(addressString)
     }
 
     const edgeTransaction = {
-      txid: message.cid,
-      date: message.block_time,
-      currencyCode: this.currencyInfo.currencyCode,
       blockHeight: message.height,
-      nativeAmount: netNativeAmount,
-      isSend: netNativeAmount.startsWith('-'),
+      currencyCode: this.currencyInfo.currencyCode,
+      date: message.block_time,
+      isSend: nativeAmount.startsWith('-'),
+      memos: [],
+      nativeAmount,
       networkFee,
+      otherParams: {},
       ourReceiveAddresses, // blank if you sent money otherwise array of addresses that are yours in this transaction
       signedTx: '',
-      otherParams: {},
+      txid: message.cid,
       walletId: this.walletId
     }
 

package/lib/filecoin/Filfox.js

@@ -40,7 +40,7 @@ var _cleaners = require('cleaners');
   height: _cleaners.asNumber,
   method: _cleaners.asString,
   nonce: _cleaners.asNumber,
-  reciept: _cleaners.asObject.call(void 0, {
+  receipt: _cleaners.asObject.call(void 0, {
     exitCode: _cleaners.asNumber
   }),
   timestamp: _cleaners.asNumber,
@@ -48,6 +48,42 @@ var _cleaners = require('cleaners');
   value: _cleaners.asString
 }); exports.asFilfoxMessage = asFilfoxMessage
 
+
+ const asFilfoxMessageDetailed = _cleaners.asObject.call(void 0, {
+  cid: _cleaners.asString,
+  height: _cleaners.asNumber,
+  timestamp: _cleaners.asNumber,
+  from: _cleaners.asString,
+  to: _cleaners.asString,
+  value: _cleaners.asString,
+  gasLimit: _cleaners.asNumber,
+  gasFeeCap: _cleaners.asString,
+  gasPremium: _cleaners.asString,
+  receipt: _cleaners.asObject.call(void 0, {
+    exitCode: _cleaners.asNumber,
+    return: _cleaners.asString,
+    gasUsed: _cleaners.asNumber
+  }),
+  baseFee: _cleaners.asString,
+  fee: _cleaners.asObject.call(void 0, {
+    baseFeeBurn: _cleaners.asString,
+    overEstimationBurn: _cleaners.asString,
+    minerPenalty: _cleaners.asString,
+    minerTip: _cleaners.asString,
+    refund: _cleaners.asString
+  }),
+  transfers: _cleaners.asArray.call(void 0, 
+    _cleaners.asObject.call(void 0, {
+      from: _cleaners.asString,
+      fromId: _cleaners.asString,
+      to: _cleaners.asString,
+      toId: _cleaners.asString,
+      value: _cleaners.asString,
+      type: _cleaners.asString
+    })
+  )
+}); exports.asFilfoxMessageDetailed = asFilfoxMessageDetailed
+
 //
 // Messages
 //
@@ -58,6 +94,15 @@ var _cleaners = require('cleaners');
   totalCount: _cleaners.asNumber
 }); exports.asFilfoxMessagesResult = asFilfoxMessagesResult
 
+//
+// Message Details
+//
+
+
+
+
+ const asFilfoxMessageDetailsResult = exports.asFilfoxMessageDetailed; exports.asFilfoxMessageDetailsResult = asFilfoxMessageDetailsResult
+
 // -----------------------------------------------------------------------------
 // Implementation
 // -----------------------------------------------------------------------------
@@ -98,4 +143,26 @@ var _cleaners = require('cleaners');
 
     return responseBody
   }
+
+  async getMessageDetails(
+    messageCid
+  ) {
+    const response = await this.fetch(`${this.baseUrl}/message/${messageCid}`, {
+      method: 'GET',
+      headers: {
+        'content-type': 'application/json'
+      }
+    })
+    const responseText = await response.text()
+    const responseBody = exports.asFilfoxEnvelope.call(void 0, (0, exports.asFilfoxMessageDetailsResult))(
+      responseText
+    )
+
+    if ('error' in responseBody)
+      throw new Error(
+        `Error response code ${responseBody.statusCode}: ${responseBody.message} ${responseBody.error}`
+      )
+
+    return responseBody
+  }
 } exports.Filfox = Filfox;

package/lib/filecoin/filecoinInfo.js

@@ -16,20 +16,18 @@ const networkInfo = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'FIL',
   displayName: 'Filecoin',
   pluginId: 'filecoin',
   requiredConfirmations: 900,
+  unsafeBroadcastTx: true,
   walletType: 'wallet:filecoin',
 
-  defaultSettings: {},
-
+  // Explorers:
   addressExplorer: 'https://filscan.io/en/address/%s',
   transactionExplorer: 'https://filscan.io/en/message/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'FIL',
       multiplier: '1000000000000000000',
@@ -67,9 +65,9 @@ const networkInfo = {
     }
   ],
 
-  metaTokens: [], // Deprecated
-
-  unsafeBroadcastTx: true
+  // Deprecated:
+  defaultSettings: {},
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const filecoin = _innerPlugin.makeOuterPlugin({

package/lib/fio/FioEngine.js

@@ -26,6 +26,7 @@ var _types = require('edge-core-js/types');
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 
 
 
@@ -483,16 +484,17 @@ const SYNC_NETWORK_INTERVAL = 10000
       otherParams.meta.isTransferProcessed = true
 
       const edgeTransaction = {
-        txid: action.action_trace.trx_id,
-        date: this.getUTCDate(action.block_time) / 1000,
-        currencyCode,
         blockHeight: action.block_num > 0 ? action.block_num : 0,
-        nativeAmount,
+        currencyCode,
+        date: this.getUTCDate(action.block_time) / 1000,
         isSend: nativeAmount.startsWith('-'),
+        memos: [],
+        nativeAmount,
         networkFee,
+        otherParams,
         ourReceiveAddresses,
         signedTx: '',
-        otherParams,
+        txid: action.action_trace.trx_id,
         walletId: this.walletId
       }
       this.addTransaction(currencyCode, edgeTransaction)
@@ -570,16 +572,17 @@ const SYNC_NETWORK_INTERVAL = 10000
 
       otherParams.meta.isFeeProcessed = true
       const edgeTransaction = {
-        txid: action.action_trace.trx_id,
-        date: this.getUTCDate(action.block_time) / 1000,
-        currencyCode,
         blockHeight: action.block_num > 0 ? action.block_num : 0,
-        nativeAmount,
+        currencyCode,
+        date: this.getUTCDate(action.block_time) / 1000,
         isSend: nativeAmount.startsWith('-'),
+        memos: [],
+        nativeAmount,
         networkFee,
-        signedTx: '',
-        ourReceiveAddresses: [],
         otherParams,
+        ourReceiveAddresses: [],
+        signedTx: '',
+        txid: action.action_trace.trx_id,
         walletId: this.walletId
       }
       this.addTransaction(currencyCode, edgeTransaction)
@@ -1376,6 +1379,7 @@ const SYNC_NETWORK_INTERVAL = 10000
   }
 
   async getMaxSpendable(spendInfo) {
+    spendInfo = _upgradeMemos.upgradeMemos.call(void 0, spendInfo, this.currencyInfo)
     const balance = this.getBalance({
       currencyCode: spendInfo.currencyCode
     })
@@ -1397,8 +1401,11 @@ const SYNC_NETWORK_INTERVAL = 10000
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     const { edgeSpendInfo, nativeBalance, currencyCode } =
       this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
+
     const lockedBalance =
       _nullishCoalesce(this.walletLocalData.totalBalances[
         this.networkInfo.balanceCurrencyCodes.locked
@@ -1678,19 +1685,20 @@ const SYNC_NETWORK_INTERVAL = 10000
     }
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode,
       blockHeight: 0,
-      nativeAmount: _biggystring.sub.call(void 0, `-${quantity}`, `${fee}`),
+      currencyCode,
+      date: 0,
       isSend: true,
+      memos,
+      nativeAmount: _biggystring.sub.call(void 0, `-${quantity}`, `${fee}`),
       networkFee: `${fee}`,
-      ourReceiveAddresses: [],
-      signedTx: '',
       otherParams: {
         ...otherParams,
         txParams
       },
+      ourReceiveAddresses: [],
+      signedTx: '',
+      txid: '',
       walletId: this.walletId
     }
 

package/lib/fio/fioInfo.js

@@ -48,28 +48,30 @@ const networkInfo = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'FIO',
   displayName: 'FIO',
   pluginId: 'fio',
+  unsafeSyncNetwork: true,
   walletType: 'wallet:fio',
 
-  defaultSettings: { ...networkInfo },
-
+  // Explorers:
   addressExplorer: 'https://fio.bloks.io/key/%s',
   transactionExplorer: 'https://fio.bloks.io/transaction/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'FIO',
       multiplier: '1000000000',
       symbol: 'ᵮ'
     }
   ],
-  metaTokens: [], // Deprecated
 
-  unsafeSyncNetwork: true
+  // No memo support:
+  memoOptions: [],
+
+  // Deprecated:
+  defaultSettings: { ...networkInfo },
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const fio = _innerPlugin.makeOuterPlugin({