edge-currency-accountbased 0.22.21 → 0.23.0

package/lib/ethereum/ethEngine.js

@@ -14,6 +14,8 @@ var _cleaners = require('cleaners');
 
 
 
+
+
 var _types = require('edge-core-js/types');
 // eslint-disable-next-line camelcase
 var _ethsigutil = require('eth-sig-util');
@@ -66,6 +68,11 @@ var _ethSchema = require('./ethSchema');
 
 
 
+
+
+
+
+
 
 
 
@@ -80,10 +87,10 @@ var _ethMiningFees = require('./fees/ethMiningFees');
 
 var _feeProviders = require('./fees/feeProviders');
 
- class EthereumEngine
-  extends _engine.CurrencyEngine
+ class EthereumEngine extends _engine.CurrencyEngine
+
 
-{
+ {
   
   
   
@@ -104,14 +111,6 @@ var _feeProviders = require('./fees/feeProviders');
     currencyInfo
   ) {
     super(env, tools, walletInfo, opts);EthereumEngine.prototype.__init.call(this);
-    const { pluginId } = this.currencyInfo
-    if (typeof this.walletInfo.keys[`${pluginId}Key`] !== 'string') {
-      // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions, @typescript-eslint/prefer-optional-chain
-      if (walletInfo.keys.keys && walletInfo.keys.keys[`${pluginId}Key`]) {
-        this.walletInfo.keys[`${pluginId}Key`] =
-          walletInfo.keys.keys[`${pluginId}Key`]
-      }
-    }
     this.initOptions = initOptions
     this.networkInfo = env.networkInfo
     this.ethNetwork = new (0, _ethNetwork.EthereumNetwork)(this)
@@ -140,9 +139,9 @@ var _feeProviders = require('./fees/feeProviders');
     ]
 
     this.utils = {
-      signMessage: (message) => {
+      signMessage: (message, privateKeys) => {
         if (!_utils.isHex.call(void 0, message)) throw new Error('ErrorInvalidMessage')
-        const privKey = Buffer.from(this.getDisplayPrivateSeed(), 'hex')
+        const privKey = Buffer.from(privateKeys.privateKey, 'hex')
         const messageBuffer = _utils.hexToBuf.call(void 0, message)
         const messageHash = _ethereumjsutil2.default.hashPersonalMessage(messageBuffer)
         const { v, r, s } = _ethereumjsutil2.default.ecsign(messageHash, privKey)
@@ -150,12 +149,14 @@ var _feeProviders = require('./fees/feeProviders');
         return _ethereumjsutil2.default.toRpcSig(v, r, s)
       },
 
-      // @ts-expect-error
-      signTypedData: (typedData) => {
+      signTypedData: (
+        typedData,
+        privateKeys
+      ) => {
         // Adapted from https://github.com/ethereum/EIPs/blob/master/assets/eip-712/Example.js
         const clean = _ethSchema.asEIP712TypedData.call(void 0, typedData)
 
-        const privKey = Buffer.from(this.getDisplayPrivateSeed(), 'hex')
+        const privKey = Buffer.from(privateKeys.privateKey, 'hex')
         const { types } = clean
 
         // Recursively finds all the dependencies of a type
@@ -264,7 +265,7 @@ var _feeProviders = require('./fees/feeProviders');
         )
       },
 
-      txRpcParamsToSpendInfo: (params, currencyCode) => {
+      txRpcParamsToSpendInfo: (params) => {
         const spendTarget = { otherParams: params }
         if (params.to != null) {
           spendTarget.publicAddress = params.to
@@ -276,7 +277,7 @@ var _feeProviders = require('./fees/feeProviders');
         }
 
         const spendInfo = {
-          currencyCode,
+          currencyCode: this.currencyInfo.currencyCode,
           spendTargets: [spendTarget],
           networkFeeOption: 'custom',
           customNetworkFee: {
@@ -295,48 +296,10 @@ var _feeProviders = require('./fees/feeProviders');
     }
 
     this.otherMethods = {
-      personal_sign: params => this.utils.signMessage(params[0]),
-      eth_sign: params => this.utils.signMessage(params[1]),
-      eth_signTypedData: params => {
-        try {
-          return this.utils.signTypedData(JSON.parse(params[1]))
-        } catch (e) {
-          // It's possible that the dApp makes the wrong call.
-          // Try to sign using the latest signTypedData_v4 method.
-          return this.otherMethods.eth_signTypedData_v4(params)
-        }
-      },
-      eth_signTypedData_v4: params =>
-        _ethsigutil.signTypedData_v4.call(void 0, Buffer.from(this.getDisplayPrivateSeed(), 'hex'), {
-          data: JSON.parse(params[1])
-        }),
-      eth_sendTransaction: async (params, cc) => {
-        // @ts-expect-error
-        const spendInfo = this.utils.txRpcParamsToSpendInfo(params[0], cc)
-        const tx = await this.makeSpend(spendInfo)
-        const signedTx = await this.signTx(tx)
-        return await this.broadcastTx(signedTx)
-      },
-      eth_signTransaction: async (params, cc) => {
-        // @ts-expect-error
-        const spendInfo = this.utils.txRpcParamsToSpendInfo(params[0], cc)
-        const tx = await this.makeSpend(spendInfo)
-        return await this.signTx(tx)
-      },
-      eth_sendRawTransaction: async params => {
-        const tx = {
-          currencyCode: '',
-          nativeAmount: '',
-          networkFee: '',
-          blockHeight: 0,
-          date: Date.now(),
-          txid: '',
-          signedTx: params[0],
-          ourReceiveAddresses: [],
-          walletId: this.walletId
-        }
-
-        return await this.broadcastTx(tx)
+      txRpcParamsToSpendInfo: async (
+        params
+      ) => {
+        return this.utils.txRpcParamsToSpendInfo(params)
       },
 
       // Wallet Connect utils
@@ -449,63 +412,28 @@ var _feeProviders = require('./fees/feeProviders');
         // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
         delete this.tools.walletConnectors[uri]
       },
-      wcRequestResponse: async (
+      wcApproveRequest: async (
         uri,
-        approve,
-        payload
+        payload,
+        result
       ) => {
-        const requestBody = (result) => ({
-          id: payload.id,
+        this.tools.walletConnectors[uri].connector.approveRequest({
+          id: parseInt(payload.id.toString()),
           jsonrpc: '2.0',
-          ...result
+          result: result
         })
-
-        if (approve) {
-          try {
-            // @ts-expect-error
-            const result = await this.otherMethods[`${payload.method}`](
-              payload.params
-            )
-
-            switch (payload.method) {
-              case 'personal_sign':
-              case 'eth_sign':
-              case 'eth_signTypedData':
-              case 'eth_signTypedData_v4':
-                this.tools.walletConnectors[uri].connector.approveRequest(
-                  requestBody({ result: result })
-                )
-                break
-              case 'eth_signTransaction':
-                this.tools.walletConnectors[uri].connector.approveRequest(
-                  requestBody({ result: result.signedTx })
-                )
-                break
-              case 'eth_sendTransaction':
-              case 'eth_sendRawTransaction':
-                this.tools.walletConnectors[uri].connector.approveRequest(
-                  requestBody({ result: result.txid })
-                )
-            }
-          } catch (e) {
-            this.tools.walletConnectors[uri].connector.rejectRequest(
-              requestBody({
-                error: {
-                  message: 'rejected'
-                }
-              })
-            )
-            throw e
+      },
+      wcRejectRequest: async (
+        uri,
+        payload
+      ) => {
+        this.tools.walletConnectors[uri].connector.rejectRequest({
+          id: parseInt(payload.id.toString()),
+          jsonrpc: '2.0',
+          error: {
+            message: 'rejected'
           }
-        } else {
-          this.tools.walletConnectors[uri].connector.rejectRequest(
-            requestBody({
-              error: {
-                message: 'rejected'
-              }
-            })
-          )
-        }
+        })
       },
       wcGetConnections: () =>
         Object.keys(this.tools.walletConnectors)
@@ -819,7 +747,7 @@ var _feeProviders = require('./fees/feeProviders');
       throw new TypeError(`Invalid ${this.currencyInfo.pluginId} address`)
     }
 
-    let data = _nullishCoalesce(spendTarget.memo, () => ( _optionalChain([spendTarget, 'access', _ => _.otherParams, 'optionalAccess', _2 => _2.data])))
+    let data = _nullishCoalesce(spendTarget.memo, () => ( _optionalChain([spendTarget, 'access', _2 => _2.otherParams, 'optionalAccess', _3 => _3.data])))
     if (data != null && data.length > 0 && !_utils.isHex.call(void 0, data)) {
       throw new Error(`Memo/data field must be of type 'hex'`)
     }
@@ -1087,7 +1015,42 @@ var _feeProviders = require('./fees/feeProviders');
     return edgeTransaction
   }
 
-  async signTx(edgeTransaction) {
+  async signMessage(
+    message,
+    privateKeys,
+    opts
+  ) {
+    const ethereumPrivateKeys = _ethTypes.asEthereumPrivateKeys.call(void 0, 
+      this.currencyInfo.pluginId
+    )(privateKeys)
+    const otherParams = _ethTypes.asEthereumSignMessageParams.call(void 0, opts.otherParams)
+
+    if (otherParams.typedData) {
+      const typedData = JSON.parse(message)
+      try {
+        return this.utils.signTypedData(typedData, ethereumPrivateKeys)
+      } catch (_) {
+        // It's possible that the dApp makes the wrong call.
+        // Try to sign using the latest signTypedData_v4 method.
+        return _ethsigutil.signTypedData_v4.call(void 0, 
+          Buffer.from(ethereumPrivateKeys.privateKey, 'hex'),
+          {
+            data: typedData
+          }
+        )
+      }
+    }
+
+    return this.utils.signMessage(message, ethereumPrivateKeys)
+  }
+
+  async signTx(
+    edgeTransaction,
+    privateKeys
+  ) {
+    const ethereumPrivateKeys = _ethTypes.asEthereumPrivateKeys.call(void 0, 
+      this.currencyInfo.pluginId
+    )(privateKeys)
     const otherParams = _utils.getOtherParams.call(void 0, edgeTransaction)
 
     // Do signing
@@ -1184,10 +1147,7 @@ var _feeProviders = require('./fees/feeProviders');
       data
     }
 
-    const privKey = Buffer.from(
-      this.walletInfo.keys[`${this.currencyInfo.pluginId}Key`],
-      'hex'
-    )
+    const privKey = Buffer.from(ethereumPrivateKeys.privateKey, 'hex')
 
     // Log the private key address
     const wallet = _ethereumjswallet2.default.fromPrivateKey(privKey)
@@ -1234,7 +1194,7 @@ var _feeProviders = require('./fees/feeProviders');
     )
     if (replacedTxIndex === -1) {
       if (
-        _optionalChain([txOtherParams, 'optionalAccess', _3 => _3.replacedTxid]) != null &&
+        _optionalChain([txOtherParams, 'optionalAccess', _4 => _4.replacedTxid]) != null &&
         txOtherParams.replacedTxid !== ''
       ) {
         // If the tx parameter is not found, then perhaps it is a
@@ -1332,26 +1292,15 @@ var _feeProviders = require('./fees/feeProviders');
     }
   }
 
-  // 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}Key`]
-    ) {
-      return this.walletInfo.keys[`${this.currencyInfo.pluginId}Key`]
-    }
-    return ''
+  getDisplayPrivateSeed(privateKeys) {
+    const ethereumPrivateKeys = _ethTypes.asEthereumPrivateKeys.call(void 0, 
+      this.currencyInfo.pluginId
+    )(privateKeys)
+    return ethereumPrivateKeys.privateKey
   }
 
-  // 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
   }
 
   // Overload saveTx to mutate replaced transactions by RBF
@@ -1362,7 +1311,7 @@ var _feeProviders = require('./fees/feeProviders');
     )
 
     // We must check if this transaction replaces another transaction
-    if (_optionalChain([txOtherParams, 'optionalAccess', _4 => _4.replacedTxid]) != null) {
+    if (_optionalChain([txOtherParams, 'optionalAccess', _5 => _5.replacedTxid]) != null) {
       const { currencyCode } = edgeTransaction
       const txid = _utils.normalizeAddress.call(void 0, txOtherParams.replacedTxid)
       const index = this.findTransaction(currencyCode, txid)
@@ -1389,7 +1338,7 @@ var _feeProviders = require('./fees/feeProviders');
     // Update the unconfirmed nonce if the transaction being saved is not confirmed
     if (edgeTransaction.blockHeight === 0) {
       const nonceUsed =
-        _optionalChain([edgeTransaction, 'access', _5 => _5.otherParams, 'optionalAccess', _6 => _6.nonceUsed])
+        _optionalChain([edgeTransaction, 'access', _6 => _6.otherParams, 'optionalAccess', _7 => _7.nonceUsed])
       if (nonceUsed != null) {
         this.otherData.unconfirmedNextNonce = _biggystring.add.call(void 0, nonceUsed, '1')
       }
@@ -1419,17 +1368,18 @@ var _feeProviders = require('./fees/feeProviders');
 ) {
   const { currencyInfo, initOptions } = env
 
+  const safeWalletInfo = _ethTypes.asSafeEthWalletInfo.call(void 0, walletInfo)
   const engine = new EthereumEngine(
     env,
     tools,
-    walletInfo,
+    safeWalletInfo,
     initOptions,
     opts,
     currencyInfo
   )
 
   // 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/ethereum/ethTypes.js

@@ -10,9 +10,14 @@
 
 
 
+
+
+
 var _cleaners = require('cleaners');
 
 
+var _types3 = require('../common/types');
+
 
 
 
@@ -472,6 +477,9 @@ const asWcDappDetails = _cleaners.asObject.call(void 0, {
   params: _cleaners.asArray.call(void 0, asWcDappDetails)
 }); exports.asWcSessionRequestParams = asWcSessionRequestParams
 
+//
+// Other Params and Other Methods:
+//
 
 
 
@@ -487,12 +495,68 @@ const asWcDappDetails = _cleaners.asObject.call(void 0, {
 
 
 
+ const asEthereumSignMessageParams = _cleaners.asOptional.call(void 0, 
+  _cleaners.asObject.call(void 0, {
+    typedData: _cleaners.asOptional.call(void 0, _cleaners.asBoolean, false)
+  }),
+  { typedData: false }
+); exports.asEthereumSignMessageParams = asEthereumSignMessageParams
+
+//
+// Wallet Info and Keys:
+//
+
 
+ const asSafeEthWalletInfo = _types3.asSafeCommonWalletInfo; exports.asSafeEthWalletInfo = asSafeEthWalletInfo
 
 
 
 
 
+ const asEthereumPrivateKeys = (
+  pluginId
+) => {
+  // Type hacks:
+  
 
 
 
+
+
+
+  const _pluginId = pluginId 
+  // Derived cleaners from the generic parameter:
+  const asFromKeys = _cleaners.asObject.call(void 0, {
+    [`${_pluginId}Mnemonic`]: _cleaners.asOptional.call(void 0, _cleaners.asString),
+    [`${_pluginId}Key`]: _cleaners.asString
+  }) 
+  const asFromJackedKeys = _cleaners.asObject.call(void 0, { keys: asFromKeys })
+
+  return _cleaners.asCodec.call(void 0, 
+    (value) => {
+      // Handle potentially jacked-up keys:
+      const fromJacked = _cleaners.asMaybe.call(void 0, asFromJackedKeys)(value)
+      if (fromJacked != null) {
+        const to = {
+          mnemonic: fromJacked.keys[`${_pluginId}Mnemonic`],
+          privateKey: fromJacked.keys[`${_pluginId}Key`]
+        }
+        return to
+      }
+
+      // Handle normal keys:
+      const from = asFromKeys(value)
+      const to = {
+        mnemonic: from[`${_pluginId}Mnemonic`],
+        privateKey: from[`${_pluginId}Key`]
+      }
+      return to
+    },
+    ethPrivateKey => {
+      return {
+        [`${_pluginId}Mnemonic`]: ethPrivateKey.mnemonic,
+        [`${_pluginId}Key`]: ethPrivateKey.privateKey
+      }
+    }
+  )
+}; exports.asEthereumPrivateKeys = asEthereumPrivateKeys

package/lib/fio/fioConst.js

@@ -7,6 +7,7 @@
 
 
 
+
 var _cleaners = require('cleaners');
 
 var _types = require('../common/types');
@@ -25,8 +26,10 @@ var _types = require('../common/types');
   transferTokens: 'transferTokens',
   addPublicAddress: 'addPublicAddress',
   addPublicAddresses: 'addPublicAddresses',
-  setFioDomainPublic: 'setFioDomainPublic',
+  removePublicAddresses: 'removePublicAddresses',
+  setFioDomainPublic: 'setFioDomainVisibility',
   rejectFundsRequest: 'rejectFundsRequest',
+  cancelFundsRequest: 'cancelFundsRequest',
   requestFunds: 'requestFunds',
   recordObtData: 'recordObtData',
   registerFioAddress: 'registerFioAddress',
@@ -43,14 +46,18 @@ var _types = require('../common/types');
  const BROADCAST_ACTIONS = {
   [exports.ACTIONS.recordObtData]: true,
   [exports.ACTIONS.requestFunds]: true,
+  [exports.ACTIONS.rejectFundsRequest]: true,
+  [exports.ACTIONS.cancelFundsRequest]: true,
   [exports.ACTIONS.registerFioAddress]: true,
   [exports.ACTIONS.registerFioDomain]: true,
   [exports.ACTIONS.renewFioDomain]: true,
   [exports.ACTIONS.transferTokens]: true,
   [exports.ACTIONS.addPublicAddresses]: true,
+  [exports.ACTIONS.removePublicAddresses]: true,
   [exports.ACTIONS.transferFioAddress]: true,
   [exports.ACTIONS.transferFioDomain]: true,
   [exports.ACTIONS.addBundledTransactions]: true,
+  [exports.ACTIONS.setFioDomainPublic]: true,
   [exports.ACTIONS.stakeFioTokens]: true,
   [exports.ACTIONS.unStakeFioTokens]: true
 }; exports.BROADCAST_ACTIONS = BROADCAST_ACTIONS
@@ -61,8 +68,10 @@ var _types = require('../common/types');
   [exports.ACTIONS.registerFioDomain]: 'registerFioDomain',
   [exports.ACTIONS.renewFioDomain]: 'renewFioDomain',
   [exports.ACTIONS.addPublicAddresses]: 'addPubAddress',
+  [exports.ACTIONS.removePublicAddresses]: 'removePubAddress',
   [exports.ACTIONS.setFioDomainPublic]: 'setFioDomainPublic',
   [exports.ACTIONS.rejectFundsRequest]: 'rejectFundsRequest',
+  [exports.ACTIONS.cancelFundsRequest]: 'cancelFundsRequest',
   [exports.ACTIONS.recordObtData]: 'recordObtData',
   [exports.ACTIONS.transferTokens]: 'transferTokens',
   [exports.ACTIONS.pushTransaction]: 'pushTransaction',
@@ -71,25 +80,7 @@ var _types = require('../common/types');
   [exports.ACTIONS.stakeFioTokens]: 'pushTransaction',
   [exports.ACTIONS.unStakeFioTokens]: 'pushTransaction',
   addBundledTransactions: 'addBundledTransactions'
-}; exports.ACTIONS_TO_END_POINT_KEYS = ACTIONS_TO_END_POINT_KEYS
-
- const ACTIONS_TO_FEE_END_POINT_KEYS = {
-  [exports.ACTIONS.requestFunds]: 'newFundsRequest',
-  [exports.ACTIONS.registerFioAddress]: 'registerFioAddress',
-  [exports.ACTIONS.registerFioDomain]: 'registerFioDomain',
-  [exports.ACTIONS.renewFioDomain]: 'renewFioDomain',
-  [exports.ACTIONS.addPublicAddresses]: 'addPubAddress',
-  [exports.ACTIONS.setFioDomainPublic]: 'setFioDomainPublic',
-  [exports.ACTIONS.rejectFundsRequest]: 'rejectFundsRequest',
-  [exports.ACTIONS.recordObtData]: 'recordObtData',
-  [exports.ACTIONS.transferTokens]: 'transferTokens',
-  [exports.ACTIONS.pushTransaction]: 'pushTransaction',
-  [exports.ACTIONS.transferFioAddress]: 'transferFioAddress',
-  [exports.ACTIONS.transferFioDomain]: 'transferFioDomain',
-  [exports.ACTIONS.addBundledTransactions]: 'addBundledTransactions',
-  [exports.ACTIONS.stakeFioTokens]: 'stakeFioTokens',
-  [exports.ACTIONS.unStakeFioTokens]: 'unStakeFioTokens'
-}; exports.ACTIONS_TO_FEE_END_POINT_KEYS = ACTIONS_TO_FEE_END_POINT_KEYS
+} ; exports.ACTIONS_TO_END_POINT_KEYS = ACTIONS_TO_END_POINT_KEYS
 
  const ACTIONS_TO_TX_ACTION_NAME = {
   [exports.ACTIONS.transferTokens]: 'trnsfiopubky',
@@ -98,40 +89,6 @@ var _types = require('../common/types');
   transfer: 'transfer'
 }; exports.ACTIONS_TO_TX_ACTION_NAME = ACTIONS_TO_TX_ACTION_NAME
 
- const FIO_REQUESTS_TYPES = {
-  PENDING: 'PENDING',
-  SENT: 'SENT'
-}; exports.FIO_REQUESTS_TYPES = FIO_REQUESTS_TYPES
-
- const FEE_ACTION_MAP = {
-  [exports.ACTIONS.addPublicAddress]: {
-    action: 'getFeeForAddPublicAddress',
-    propName: 'fioAddress'
-  },
-  [exports.ACTIONS.addPublicAddresses]: {
-    action: 'getFeeForAddPublicAddress',
-    propName: 'fioAddress'
-  },
-  [exports.ACTIONS.rejectFundsRequest]: {
-    action: 'getFeeForRejectFundsRequest',
-    propName: 'payerFioAddress'
-  },
-  [exports.ACTIONS.requestFunds]: {
-    action: 'getFeeForNewFundsRequest',
-    propName: 'payeeFioAddress'
-  },
-  [exports.ACTIONS.recordObtData]: {
-    action: 'getFeeForRecordObtData',
-    propName: 'payerFioAddress'
-  },
-  [exports.ACTIONS.stakeFioTokens]: {
-    propName: 'fioAddress'
-  },
-  [exports.ACTIONS.unStakeFioTokens]: {
-    propName: 'fioAddress'
-  }
-}; exports.FEE_ACTION_MAP = FEE_ACTION_MAP
-
  const DEFAULT_BUNDLED_TXS_AMOUNT = 100; exports.DEFAULT_BUNDLED_TXS_AMOUNT = DEFAULT_BUNDLED_TXS_AMOUNT
  const DEFAULT_APR = 450; exports.DEFAULT_APR = DEFAULT_APR
  const STAKING_REWARD_MEMO = 'Paying Staking Rewards'; exports.STAKING_REWARD_MEMO = STAKING_REWARD_MEMO
@@ -153,6 +110,21 @@ var _types = require('../common/types');
 
 
 
+ const asEncryptedFioRequest = _cleaners.asObject.call(void 0, {
+  fio_request_id: _cleaners.asNumber,
+  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,
+  time_stamp: _cleaners.asString,
+  status: _cleaners.asOptional.call(void 0, 
+    _cleaners.asValue.call(void 0, 'cancelled', 'rejected', 'requested', 'sent_to_blockchain')
+  )
+}); exports.asEncryptedFioRequest = asEncryptedFioRequest
+
+
+
  const asFioAddress = _cleaners.asObject.call(void 0, {
   name: _cleaners.asString,
   bundledTxs: _cleaners.asOptional.call(void 0, _cleaners.asNumber)
@@ -213,7 +185,6 @@ var _types = require('../common/types');
       PENDING: []
     }
   ),
-  fioRequestsToApprove: _cleaners.asMaybe.call(void 0, _cleaners.asObject.call(void 0, _types.asAny), {}),
   srps: _cleaners.asMaybe.call(void 0, _cleaners.asNumber, 0),
   stakingRoe: _cleaners.asMaybe.call(void 0, _cleaners.asString, ''),
   stakingStatus: _cleaners.asMaybe.call(void 0, exports.asEdgeStakingStatus, {