edge-currency-plugins 1.0.0-rc.5 → 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

@@ -450,7 +450,7 @@ var _utils3 = require('./utils');
       const utxoMap = new Map()
       for (const utxo of utxos) {
         const utxoSet = _nullishCoalesce(utxoMap.get(utxo.scriptPubkey), () => ( new Set()))
-        if (utxoMap.has(utxo.scriptPubkey) == null)
+        if (!utxoMap.has(utxo.scriptPubkey))
           utxoMap.set(utxo.scriptPubkey, utxoSet)
         utxoSet.add(utxo)
       }
@@ -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/common/utxobased/info/bitcoincash.js

@@ -52,7 +52,7 @@ const currencyInfo = {
 
 const engineInfo = {
   formats: ['bip44', 'bip32'],
-  forks: ['bitcoinsv'],
+  // forks: ['bitcoinsv'],
   gapLimit: 10,
   defaultFee: 10000,
   feeUpdateInterval: 60000,

package/lib/common/utxobased/info/bitcoinsv.js

@@ -41,9 +41,9 @@ const currencyInfo = {
   metaTokens: [],
 
   // Explorers:
-  blockExplorer: 'https://blockchair.com/bitcoin-sv/block/%s',
-  addressExplorer: 'https://blockchair.com/bitcoin-sv/address/%s',
-  transactionExplorer: 'https://blockchair.com/bitcoin-sv/transaction/%s',
+  blockExplorer: 'https://whatsonchain.com/block/%s',
+  addressExplorer: 'https://whatsonchain.com/address/%s',
+  transactionExplorer: 'https://whatsonchain.com/tx/%s',
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/bitcoinsv-logo-solo-64.png`,

package/lib/common/utxobased/keymanager/utxopicker/accumulative.js

@@ -47,6 +47,6 @@ var _utils = require('./utils'); var utils = _interopRequireWildcard(_utils);
 
   return {
     changeUsed: false,
-    fee: feeRate * utils.transactionBytes(inputs, outputs)
+    fee: Math.ceil(feeRate * utils.transactionBytes(inputs, outputs))
   }
 } exports.accumulative = accumulative;

package/lib/common/utxobased/keymanager/utxopicker/forceUseUtxo.js

@@ -54,6 +54,6 @@ var _utils = require('./utils'); var utils = _interopRequireWildcard(_utils);
 
   return {
     changeUsed: false,
-    fee: feeRate * utils.transactionBytes(inputs, outputs)
+    fee: Math.ceil(feeRate * utils.transactionBytes(inputs, outputs))
   }
 } exports.forceUseUtxo = forceUseUtxo;

package/lib/common/utxobased/keymanager/utxopicker/subtractFee.js

@@ -10,7 +10,7 @@ var _utils = require('./utils'); var utils = _interopRequireWildcard(_utils);
     scriptPubkey: Buffer.from(target.script, 'hex')
   }))
 
-  const fee = feeRate * utils.transactionBytes(utxos, outputs)
+  const fee = Math.ceil(feeRate * utils.transactionBytes(utxos, outputs))
   targets[0].value -= fee
   outputs[0].value -= fee
   return { inputs: utxos, outputs, fee, changeUsed: false }

package/lib/common/utxobased/network/Socket.js

@@ -275,7 +275,12 @@ const WAKE_UP_MS = 5000 // interval at which we wakeUp and potentially onQueueSp
             if (!subscription.subscribed) {
               subscription.deferred.reject()
             }
-            subscription.cb(subscription.cleaner(json.data))
+            try {
+              subscription.cb(subscription.cleaner(json.data))
+            } catch (error) {
+              console.log({ uri, error, json, subscription })
+              throw error
+            }
             return
           }
         }
@@ -296,9 +301,9 @@ const WAKE_UP_MS = 5000 // interval at which we wakeUp and potentially onQueueSp
           } else {
             message.task.deferred.resolve(json.data)
           }
-        } catch (e) {
-          if (e instanceof TypeError) console.log({ json, message })
-          message.task.deferred.reject(e)
+        } catch (error) {
+          console.log({ uri, error, json, message })
+          message.task.deferred.reject(error)
         }
       }
     } catch (e) {

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-rc.5",
+  "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",
@@ -48,7 +48,7 @@
     "bs58smartcheck": "^2.0.4",
     "cleaners": "^0.3.12",
     "disklet": "^0.4.5",
-    "edge-core-js": "^0.19.19",
+    "edge-core-js": "^0.19.20",
     "memlet": "^0.1.6",
     "uri-js": "^4.4.0",
     "url-parse": "^1.5.2",