edge-currency-accountbased 2.2.1 → 2.2.3

package/lib/polkadot/PolkadotEngine.js

@@ -14,8 +14,7 @@ var _biggystring = require('biggystring');
 
 
 
-
-var _types3 = require('edge-core-js/types');
+var _types = require('edge-core-js/types');
 var _rfc4648 = require('rfc4648');
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
@@ -42,7 +41,6 @@ var _utils = require('../common/utils');
 
 
 
-
 var _polkadotTypes = require('./polkadotTypes');
 
 const ACCOUNT_POLL_MILLISECONDS = 5000
@@ -115,10 +113,14 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
   }
 
   async queryBalance() {
-    const queryArray = [
-      [this.api.query.system.account, this.walletInfo.keys.publicKey] // returns FrameSystemAccountInfo
-    ]
-    const edgeTokenArray = []
+    const accountBalanceRes = await this.api.query.system.account(
+      this.walletInfo.keys.publicKey
+    )
+    this.nonce = accountBalanceRes.nonce.toNumber()
+    this.updateBalance(
+      this.currencyInfo.currencyCode,
+      accountBalanceRes.data.free.toString()
+    )
 
     for (const tokenId of this.enabledTokenIds) {
       const token = this.allTokensMap[tokenId]
@@ -126,41 +128,16 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
       const networkLocation = _tokenHelpers.asMaybeContractLocation.call(void 0, token.networkLocation)
       if (networkLocation == null) continue
 
-      queryArray.push([
-        this.api.query.assets.account,
-        [networkLocation.contractAddress, this.walletInfo.keys.publicKey]
-      ]) // returns Option<PalletAssetsAssetAccount>
-      edgeTokenArray.push(token)
-    }
+      const tokenBalanceRes = await this.api.query.assets.account
 
-    const unsubscribe = await this.api.queryMulti(queryArray, balances => {
-      if (balances.length === 0) {
-        throw new Error('No balances returned')
-      }
+(networkLocation.contractAddress, this.walletInfo.keys.publicKey)
 
-      // Mainnet
-      const accountBalance = balances.shift() 
-      this.nonce = accountBalance.nonce.toNumber()
-      this.updateBalance(
-        this.currencyInfo.currencyCode,
-        accountBalance.data.free.toString()
-      )
-
-      // Assets
-      for (const [i, assetBalanceRaw] of balances.entries()) {
-        const token = edgeTokenArray[i]
-        const assetBalance = _polkadotTypes.asMaybeAssetsPalletBalance.call(void 0, 
-          assetBalanceRaw.toPrimitive()
-        )
-        if (assetBalance == null) {
-          this.updateBalance(token.currencyCode, '0')
-          return
-        }
-
-        this.updateBalance(token.currencyCode, assetBalance.balance.toString())
+      let tokenBalance = '0'
+      if (tokenBalanceRes.isSome) {
+        tokenBalance = tokenBalanceRes.unwrap().balance.toString()
       }
-    })
-    unsubscribe() // queryMulti sets up a subscription but we only need to call it once
+      this.updateBalance(token.currencyCode, tokenBalance)
+    }
   }
 
   async queryBlockheight() {
@@ -417,7 +394,7 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
 
     if (publicAddress == null)
       throw new Error('makeSpend Missing publicAddress')
-    if (nativeAmount == null) throw new (0, _types3.NoAmountSpecifiedError)()
+    if (nativeAmount == null) throw new (0, _types.NoAmountSpecifiedError)()
 
     const balance = this.getBalance({
       currencyCode
@@ -433,7 +410,7 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
       )
 
       if (_biggystring.gt.call(void 0, nativeAmount, spendableBalance)) {
-        throw new (0, _types3.InsufficientFundsError)()
+        throw new (0, _types.InsufficientFundsError)()
       }
 
       const transfer = await this.api.tx.balances.transferKeepAlive(
@@ -457,11 +434,11 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
       totalTxAmount = _biggystring.add.call(void 0, nativeAmount, nativeNetworkFee)
 
       if (_biggystring.gt.call(void 0, totalTxAmount, spendableBalance)) {
-        throw new (0, _types3.InsufficientFundsError)()
+        throw new (0, _types.InsufficientFundsError)()
       }
     } else {
       if (_biggystring.gt.call(void 0, nativeAmount, balance)) {
-        throw new (0, _types3.InsufficientFundsError)()
+        throw new (0, _types.InsufficientFundsError)()
       }
       totalTxAmount = nativeAmount
       const transfer = await this.api.tx.assets.transfer(
@@ -491,7 +468,7 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
         this.api.consts.balances.existentialDeposit.toString()
       )
       if (_biggystring.gt.call(void 0, nativeNetworkFee, spendableFeeBalance)) {
-        throw new (0, _types3.InsufficientFundsError)({
+        throw new (0, _types.InsufficientFundsError)({
           currencyCode: this.currencyInfo.currencyCode,
           networkFee: nativeNetworkFee
         })

package/lib/polkadot/polkadotTypes.js

@@ -13,15 +13,6 @@ var _cleaners = require('cleaners');
 
 var _types = require('../common/types');
 
- const asMaybeAssetsPalletBalance = _cleaners.asMaybe.call(void 0, 
-  _cleaners.asObject.call(void 0, {
-    balance: _cleaners.asNumber
-    // status: 'Liquid',
-    // reason: { sufficient: null },
-    // extra: null
-  })
-); exports.asMaybeAssetsPalletBalance = asMaybeAssetsPalletBalance
-
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-accountbased",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "Edge currency plugin for account based currencies",
   "homepage": "https://edge.app/",
   "repository": {