edge-currency-plugins 1.0.0 → 1.1.0

package/lib/common/utxobased/db/Models/ProcessorTransaction.js

@@ -1,4 +1,6 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var _altcoinjs = require('altcoin-js');
+var _bnjs = require('bn.js'); var _bnjs2 = _interopRequireDefault(_bnjs);
+
 
 
 
@@ -56,12 +58,11 @@ var _keymanager = require('../../keymanager/keymanager');
 
 
 
-
  const toEdgeTransaction = async (
   args
 ) => {
-  const { tx, processor, walletTools, engineInfo } = args
-
+  const { tx, processor, walletTools, pluginInfo } = args
+  const { engineInfo, currencyInfo } = pluginInfo
   const ourReceiveAddresses = []
   for (const out of tx.ourOuts) {
     const { scriptPubkey } = tx.outputs[parseInt(out)]
@@ -95,14 +96,32 @@ var _keymanager = require('../../keymanager/keymanager');
     }
   }
 
+  const feeRes = {}
+
+  try {
+    const altcoinTx = _altcoinjs.Transaction.fromHex(tx.hex)
+    const vBytes = altcoinTx.virtualSize()
+    // feeRate must be of a number type (limited to 53 bits)
+    const feeRate = new (0, _bnjs2.default)(tx.fees, 10)
+      .div(new (0, _bnjs2.default)(vBytes, 10))
+      .toNumber()
+    Object.assign(feeRes, {
+      feeRateUsed: {
+        // GUI repo uses satPerVByte rather than satPerByte defined in customFeeTemplate
+        satPerVByte: feeRate
+      }
+    })
+  } catch (e) {}
+
   return {
-    currencyCode: args.currencyCode,
-    txid: args.tx.txid,
-    blockHeight: args.tx.blockHeight,
-    date: args.tx.date,
-    nativeAmount: args.tx.ourAmount,
-    networkFee: args.tx.fees,
-    signedTx: args.tx.hex,
-    ourReceiveAddresses
+    currencyCode: currencyInfo.currencyCode,
+    txid: tx.txid,
+    blockHeight: tx.blockHeight,
+    date: tx.date,
+    nativeAmount: tx.ourAmount,
+    networkFee: tx.fees,
+    signedTx: tx.hex,
+    ourReceiveAddresses,
+    ...feeRes
   }
 }; exports.toEdgeTransaction = toEdgeTransaction

package/lib/common/utxobased/engine/makeUtxoEngine.js

@@ -253,10 +253,9 @@ var _utils = require('./utils');
           async (tx) =>
             await _ProcessorTransaction.toEdgeTransaction.call(void 0, {
               tx,
-              currencyCode: currencyInfo.currencyCode,
               walletTools,
               processor,
-              engineInfo
+              pluginInfo
             })
         )
       )

package/lib/common/utxobased/engine/makeUtxoEngineState.js

@@ -647,20 +647,13 @@ const addToAddressTransactionCache = async (
  const transactionChanged = async (
   args
 ) => {
-  const {
-    emitter,
-    walletTools,
-    processor,
-    pluginInfo: { currencyInfo, engineInfo },
-    tx
-  } = args
+  const { emitter, walletTools, processor, pluginInfo, tx } = args
   emitter.emit(_makeEngineEmitter.EngineEvent.TRANSACTIONS_CHANGED, [
     await _ProcessorTransaction.toEdgeTransaction.call(void 0, {
       tx,
-      currencyCode: currencyInfo.currencyCode,
       walletTools,
       processor,
-      engineInfo
+      pluginInfo
     })
   ])
 }; exports.transactionChanged = transactionChanged

package/lib/src/common/utxobased/db/Models/ProcessorTransaction.d.ts

@@ -1,15 +1,14 @@
 import { EdgeTransaction } from 'edge-core-js/types';
-import { EngineInfo } from '../../../plugin/types';
+import { PluginInfo } from '../../../plugin/types';
 import { UTXOPluginWalletTools } from '../../engine/makeUtxoWalletTools';
 import { Processor } from '../makeProcessor';
 import { IProcessorTransaction } from '../types';
 export declare const fromEdgeTransaction: (tx: EdgeTransaction) => IProcessorTransaction;
 interface ToEdgeTransactionArgs {
     tx: IProcessorTransaction;
-    currencyCode: string;
     walletTools: UTXOPluginWalletTools;
     processor: Processor;
-    engineInfo: EngineInfo;
+    pluginInfo: PluginInfo;
 }
 export declare const toEdgeTransaction: (args: ToEdgeTransactionArgs) => Promise<EdgeTransaction>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
   "license": "MIT",