edge-currency-plugins 3.8.0 → 3.8.1

package/lib/common/plugin/CurrencyTools.js

@@ -169,11 +169,20 @@ var _utils3 = require('./utils');
       obj,
       _customTokens
     ) {
-      const { publicAddress } = obj
+      let publicAddress = obj.publicAddress
       if (publicAddress === '') {
         throw new Error('InvalidPublicAddressError')
       }
 
+      // Remove any cashaddr prefixes from the public address if they exist.
+      if (
+        _optionalChain([coinInfo, 'access', _7 => _7.prefixes, 'access', _8 => _8.cashaddr, 'optionalAccess', _9 => _9.some, 'call', _10 => _10(prefix =>
+          publicAddress.startsWith(`${prefix}:`)
+        )]) === true
+      ) {
+        publicAddress = publicAddress.split(':')[1]
+      }
+
       // TODO: validate network address
 
       const query = []

package/lib/common/plugin/types.js

@@ -303,6 +303,14 @@ var _types3 = require('../utxobased/db/types');
 
 
 
+
+
+
+
+
+
+
+
 
 
 

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

@@ -190,7 +190,8 @@ var _utils = require('./utils');
       return _keymanager.scriptPubkeyToAddress.call(void 0, {
         scriptPubkey: args.scriptPubkey,
         addressType,
-        coin
+        coin,
+        includeCashaddrPrefix: pluginInfo.coinInfo.includeCashaddrPrefix
       })
     },
 

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

@@ -62,7 +62,7 @@ const engineInfo = {
     }
   ],
   formats: ['bip44', 'bip32'],
-  forks: [], // 'bitcoinsv' is currently disabled, so not included in the forks
+  forks: ['ecash'], // 'bitcoinsv' is currently disabled, so not included in the forks
   gapLimit: 10,
   feeUpdateInterval: 60000,
   defaultFeeInfo: {

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

@@ -21,8 +21,8 @@ const currencyInfo = {
 
   // Explorers:
   blockExplorer: 'https://blockchair.com/ecash/block/%s',
-  addressExplorer: 'https://explorer.e.cash/address/ecash:%s',
-  transactionExplorer: 'https://explorer.e.cash/tx/%s',
+  addressExplorer: 'https://blockchair.com/ecash/address/%s',
+  transactionExplorer: 'https://blockchair.com/ecash/tx/%s',
 
   denominations: [
     { name: 'XEC', multiplier: '100', symbol: 'e' },
@@ -65,9 +65,10 @@ const engineInfo = {
   },
   asBlockbookAddress: _cleaners.asCodec.call(void 0, 
     raw => {
-      return _cleaners.asString.call(void 0, raw).split(':')[1]
+      const address = _cleaners.asString.call(void 0, raw)
+      return address.startsWith('ecash:') ? address.split(':')[1] : address
     },
-    address => `ecash:${address}`
+    address => (address.startsWith('ecash:') ? address : `ecash:${address}`)
   )
 }
 
@@ -76,6 +77,7 @@ const engineInfo = {
   segwit: false,
   sighash: _altcoinjs.Psbt.BCH_SIGHASH_ALL,
   coinType: 899,
+  includeCashaddrPrefix: true,
 
   prefixes: {
     messagePrefix: ['\x18Bitcoin Signed Message::\n'],

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

@@ -271,6 +271,7 @@ var VerifyAddressEnum; (function (VerifyAddressEnum) {
 
 
 
+
 
 
  function bip43PurposeNumberToTypeEnum(
@@ -612,7 +613,8 @@ const addressToScriptPubkeyInternal = (
             coin: args.coin
           }),
           _cashAddress.CashaddrTypeEnum.pubkeyhash,
-          standardPrefixes.cashaddr
+          standardPrefixes.cashaddr,
+          args.includeCashaddrPrefix
         )
       }
       if (legacyPrefixes.cashaddr != null) {
@@ -623,7 +625,8 @@ const addressToScriptPubkeyInternal = (
             coin: args.coin
           }),
           _cashAddress.CashaddrTypeEnum.pubkeyhash,
-          legacyPrefixes.cashaddr
+          legacyPrefixes.cashaddr,
+          args.includeCashaddrPrefix
         )
       }
       payment = _altcoinjs.payments.p2pkh
@@ -637,7 +640,8 @@ const addressToScriptPubkeyInternal = (
             coin: args.coin
           }),
           _cashAddress.CashaddrTypeEnum.scripthash,
-          standardPrefixes.cashaddr
+          standardPrefixes.cashaddr,
+          args.includeCashaddrPrefix
         )
       }
       if (legacyPrefixes.cashaddr != null) {
@@ -648,7 +652,8 @@ const addressToScriptPubkeyInternal = (
             coin: args.coin
           }),
           _cashAddress.CashaddrTypeEnum.scripthash,
-          legacyPrefixes.cashaddr
+          legacyPrefixes.cashaddr,
+          args.includeCashaddrPrefix
         )
       }
       payment = _altcoinjs.payments.p2sh

package/lib/src/common/plugin/types.d.ts

@@ -142,6 +142,13 @@ export interface CoinInfo {
      * addresses.
      */
     coinType: number;
+    /**
+     * Whether the currency should include its cashaddr prefix in the formatted
+     * addresses.
+     *
+     * Defaults to `false`.
+     */
+    includeCashaddrPrefix?: boolean;
     /**
      * Optional sighash value to be passed to AltcoinJS as the sighashType field
      * on inputs. This is primarily used by currencies that leverage it as

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

@@ -87,6 +87,7 @@ export interface ScriptPubkeyToAddressArgs {
     addressType: AddressTypeEnum;
     coin: string;
     redeemScript?: string;
+    includeCashaddrPrefix?: boolean;
 }
 export interface ScriptPubkeyToAddressReturn {
     address: string;

package/lib/test/common/plugin/CurrencyPlugin.fixtures/currencies/ecash.d.ts

@@ -0,0 +1,2 @@
+import { FixtureType } from '../common';
+export declare const ecash: FixtureType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "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",