edge-currency-plugins 3.8.3 → 3.8.5

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

@@ -541,6 +541,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
       )
       const txOptions = _nullishCoalesce(spendInfoOtherParams.txOptions, () => ( {}))
       const {
+        memoIndex,
         outputSort,
         utxoSourceAddress,
         forceChangeAddress
@@ -669,6 +670,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
         freshChangeAddress,
         subtractFee,
         log,
+        memoIndex,
         outputSort
       })
       if (tx.changeUsed) {

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

@@ -6,6 +6,7 @@
 
 
 
+
 var _cleaners = require('cleaners');
 
 
@@ -53,6 +54,7 @@ const asOutputSort = _cleaners.asValue.call(void 0, 'bip69', 'targets')
   /** @deprecated use `EdgeSpendInfo['enableRbf']` */
   enableRbf: _cleaners.asOptional.call(void 0, _cleaners.asBoolean),
   forceChangeAddress: _cleaners.asOptional.call(void 0, _cleaners.asString),
+  memoIndex: _cleaners.asOptional.call(void 0, _cleaners.asNumber),
   outputSort: _cleaners.asOptional.call(void 0, asOutputSort, 'bip69'),
   txOptions: _cleaners.asOptional.call(void 0, _types3.asTxOptions),
   utxoSourceAddress: _cleaners.asOptional.call(void 0, _cleaners.asString)

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

@@ -35,12 +35,13 @@ const currencyInfo = {
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
+      'wss://btc-wusa1.edge.app',
+      'wss://btc-eu1.edge.app',
       'wss://btc1.trezor.io',
       'wss://btc2.trezor.io',
       'wss://btc3.trezor.io',
       'wss://btc4.trezor.io',
       'wss://btc5.trezor.io',
-      'wss://btc-wusa1.edge.app',
       'wss://btcbook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
@@ -53,7 +54,7 @@ const engineInfo = {
   serverConfigs: [
     {
       type: 'blockbook-nownode',
-      uris: ['https://btc-wusa1.edge.app']
+      uris: ['https://btc-wusa1.edge.app', 'https://btc-eu1.edge.app']
     },
     {
       type: 'blockbook-nownode',

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

@@ -36,12 +36,12 @@ const currencyInfo = {
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
+      'wss://bch-eusa1.edge.app',
       'wss://bch1.trezor.io',
       'wss://bch2.trezor.io',
       'wss://bch3.trezor.io',
       'wss://bch4.trezor.io',
       'wss://bch5.trezor.io',
-      'wss://bch-wusa1.edge.app',
       'wss://bchbook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
@@ -54,7 +54,7 @@ const engineInfo = {
   serverConfigs: [
     {
       type: 'blockbook-nownode',
-      uris: ['https://bch-wusa1.edge.app']
+      uris: ['https://bch-eusa1.edge.app']
     },
     {
       type: 'blockbook-nownode',

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

@@ -35,12 +35,12 @@ const currencyInfo = {
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
+      'wss://dash-wusa1.edge.app',
       'wss://dash1.trezor.io',
       'wss://dash2.trezor.io',
       'wss://dash3.trezor.io',
       'wss://dash4.trezor.io',
       'wss://dash5.trezor.io',
-      'wss://dash-eusa1.edge.app',
       'wss://dash.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false

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

@@ -32,6 +32,7 @@ const currencyInfo = {
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
+      'wss://dgb-eu1.edge.app',
       'wss://dgb1.trezor.io',
       'wss://dgb2.trezor.io',
       'wss://dgbbook.nownodes.io/wss/%{nowNodesApiKey}'
@@ -44,6 +45,10 @@ const currencyInfo = {
 
 const engineInfo = {
   serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['https://dgb-eu1.edge.app']
+    },
     {
       type: 'blockbook-nownode',
       uris: ['https://dgbbook.nownodes.io']

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

@@ -31,12 +31,12 @@ const currencyInfo = {
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
+      'wss://doge-eusa1.edge.app',
       'wss://doge1.trezor.io',
       'wss://doge2.trezor.io',
       'wss://doge3.trezor.io',
       'wss://doge4.trezor.io',
       'wss://doge5.trezor.io',
-      'wss://doge-wusa1.edge.app',
       'wss://dogebook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
@@ -49,7 +49,7 @@ const engineInfo = {
   serverConfigs: [
     {
       type: 'blockbook-nownode',
-      uris: ['https://doge-wusa1.edge.app']
+      uris: ['https://doge-eusa1.edge.app']
     },
     {
       type: 'blockbook-nownode',

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

@@ -33,12 +33,12 @@ var _commonInfo = require('./commonInfo');
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
+      'wss://ltc-wusa1.edge.app',
       'wss://ltc1.trezor.io',
       'wss://ltc2.trezor.io',
       'wss://ltc3.trezor.io',
       'wss://ltc4.trezor.io',
       'wss://ltc5.trezor.io',
-      'wss://ltc-eusa1.edge.app',
       'wss://ltcbook.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false

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

@@ -34,7 +34,7 @@ const currencyInfo = {
   ..._commonInfo.legacyMemoInfo,
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
-    blockbookServers: ['wss://pivx-eusa1.edge.app', 'wss://zkbitcoin.com'],
+    blockbookServers: ['wss://pivx-wusa1.edge.app', 'wss://zkbitcoin.com'],
     enableCustomServers: false
   },
   displayName: 'PIVX',
@@ -45,7 +45,7 @@ const engineInfo = {
   serverConfigs: [
     {
       type: 'blockbook-nownode',
-      uris: ['https://btc-wusa1.edge.app']
+      uris: ['https://pivx-wusa1.edge.app']
     },
     {
       type: 'blockbook-nownode',

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

@@ -29,7 +29,7 @@ const currencyInfo = {
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
-      'wss://qtum-eusa1.edge.app',
+      'wss://qtum-wusa1.edge.app',
       'wss://blockv3.qtum.info',
       'wss://qtum.atomicwallet.io'
     ],
@@ -40,6 +40,12 @@ const currencyInfo = {
 }
 
 const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['https://qtum-wusa1.edge.app']
+    }
+  ],
   formats: ['bip44', 'bip32'],
   gapLimit: 10,
   feeUpdateInterval: 60000,

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

@@ -32,6 +32,7 @@ const currencyInfo = {
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
+      'wss://vtc-wusa1.edge.app',
       'wss://vtc1.trezor.io',
       'wss://vtc2.trezor.io',
       'wss://vtc3.trezor.io',
@@ -45,6 +46,12 @@ const currencyInfo = {
 }
 
 const engineInfo = {
+  serverConfigs: [
+    {
+      type: 'blockbook-nownode',
+      uris: ['https://vtc-wusa1.edge.app']
+    }
+  ],
   formats: ['bip49', 'bip84', 'bip44', 'bip32'],
   forks: [],
   gapLimit: 10,

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

@@ -32,8 +32,8 @@ var _commonInfo = require('./commonInfo');
   defaultSettings: {
     customFeeSettings: ['satPerByte'],
     blockbookServers: [
-      // 'wss://blockbook.firo.org',
-      'wss://firo-wusa1.edge.app'
+      'wss://firo-eusa1.edge.app',
+      'wss://blockbook.firo.org'
       // 'wss://firo.nownodes.io/wss/%{nowNodesApiKey}'
     ],
     enableCustomServers: false
@@ -46,7 +46,7 @@ var _commonInfo = require('./commonInfo');
   serverConfigs: [
     {
       type: 'blockbook-nownode',
-      uris: ['https://firo-wusa1.edge.app']
+      uris: ['https://firo-eusa1.edge.app']
     },
     {
       type: 'blockbook-nownode',

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

@@ -272,6 +272,7 @@ var VerifyAddressEnum; (function (VerifyAddressEnum) {
 
 
 
+
 
 
  function bip43PurposeNumberToTypeEnum(
@@ -949,7 +950,7 @@ const wifToPrivateKeyEncodingInternal = (
 } exports.signMessageBase64 = signMessageBase64;
 
  function makeTx(args) {
-  const { log, outputSort, memos } = args
+  const { log, outputSort, memos, memoIndex } = args
   let sequence = 0xffffffff
   if (args.enableRbf) {
     sequence -= 2
@@ -1102,6 +1103,16 @@ const wifToPrivateKeyEncodingInternal = (
     }
   })()
 
+  if (memoIndex != null) {
+    const currentMemoIndex = sortedOutputs.findIndex(
+      output => output.value === 0
+    )
+    if (currentMemoIndex !== -1) {
+      const memoOutput = sortedOutputs.splice(currentMemoIndex, 1)
+      sortedOutputs.splice(memoIndex, 0, memoOutput[0])
+    }
+  }
+
   const psbt = new (0, _altcoinjs.Psbt)()
   try {
     psbt.addInputs(sortedInputs)

package/lib/src/common/utxobased/engine/types.d.ts

@@ -28,6 +28,7 @@ export declare type UtxoSpendInfoOtherParams = ReturnType<typeof asUtxoSpendInfo
 export declare const asUtxoSpendInfoOtherParams: import("cleaners").ObjectCleaner<{
     enableRbf: boolean | undefined;
     forceChangeAddress: string | undefined;
+    memoIndex: number | undefined;
     outputSort: "targets" | "bip69";
     txOptions: import("../../plugin/types").TxOptions | undefined;
     utxoSourceAddress: string | undefined;

package/lib/src/common/utxobased/keymanager/keymanager.d.ts

@@ -145,6 +145,7 @@ export interface MakeTxArgs {
     subtractFee?: boolean;
     log?: EdgeLog;
     outputSort: 'bip69' | 'targets';
+    memoIndex?: number;
 }
 export interface MakeTxTarget {
     address?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "3.8.3",
+  "version": "3.8.5",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "homepage": "https://edge.app/",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",