edge-currency-plugins 2.6.2 → 3.0.0

package/android/src/main/java/app/edge/reactnative/currencyplugins/EdgeCurrencyPluginsModule.java

@@ -0,0 +1,26 @@
+package app.edge.reactnative.currencyplugins;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import java.util.HashMap;
+import java.util.Map;
+
+public class EdgeCurrencyPluginsModule extends ReactContextBaseJavaModule {
+  EdgeCurrencyPluginsModule(ReactApplicationContext context) {
+    super(context);
+  }
+
+  @Override
+  public Map<String, Object> getConstants() {
+    final Map<String, Object> constants = new HashMap<>();
+    constants.put(
+        "sourceUri",
+        "file:///android_asset/edge-currency-plugins/edge-currency-plugins.js");
+    return constants;
+  }
+
+  @Override
+  public String getName() {
+    return "EdgeCurrencyPluginsModule";
+  }
+}

package/android/src/main/java/app/edge/reactnative/currencyplugins/EdgeCurrencyPluginsPackage.java

@@ -0,0 +1,24 @@
+package app.edge.reactnative.currencyplugins;
+
+import androidx.annotation.NonNull;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import java.util.Collections;
+import java.util.List;
+
+public class EdgeCurrencyPluginsPackage implements ReactPackage {
+  @NonNull
+  @Override
+  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+    return Collections.<NativeModule>singletonList(
+        new EdgeCurrencyPluginsModule(reactContext));
+  }
+
+  @NonNull
+  @Override
+  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+    return Collections.emptyList();
+  }
+}

package/edge-currency-plugins.d.ts

@@ -0,0 +1,34 @@
+import { EdgeCorePluginOptions, EdgeCurrencyPlugin } from 'edge-core-js/types'
+
+import {
+  EdgeCurrencyPluginIoOptions,
+  EdgeCurrencyPluginNativeIo
+} from './src/react-native'
+
+/**
+ * Add this to your `nativeIo` object on React Native,
+ * as `{ 'edge-currency-plugins': makePluginIo() }`
+ */
+export function makePluginIo(
+  options?: EdgeCurrencyPluginIoOptions
+): EdgeCurrencyPluginNativeIo
+
+/**
+ * Debugging-URI to use on React Native,
+ * along with running `yarn start` in this repo.
+ */
+export const debugUri: string
+
+/* Regular URI to use on React Native. */
+export const pluginUri: string
+
+type EdgeCorePluginFactory = (env: EdgeCorePluginOptions) => EdgeCurrencyPlugin
+
+/**
+ * The Node.js default export.
+ */
+declare const plugins: {
+  [pluginId: string]: EdgeCorePluginFactory
+}
+
+export default plugins

package/edge-currency-plugins.podspec

@@ -0,0 +1,28 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = package['name']
+  s.version      = package['version']
+  s.summary      = package['description']
+  s.homepage     = package['homepage']
+  s.license      = package['license']
+  s.authors      = package['author']
+
+  s.platform     = :ios, "9.0"
+  s.requires_arc = true
+  s.source = {
+    :git => "https://github.com/EdgeApp/edge-currency-plugins.git",
+    :tag => "v#{s.version}"
+  }
+  s.source_files =
+    "ios/EdgeCurrencyPluginsModule.swift",
+    "ios/EdgeCurrencyPluginsModule.m"
+
+  s.resource_bundles = {
+    "edge-currency-plugins" => "android/src/main/assets/edge-currency-plugins/*.js"
+  }
+
+  s.dependency "React-Core"
+end

package/ios/EdgeCurrencyPluginsModule.m

@@ -0,0 +1,4 @@
+#import <React/RCTBridgeModule.h>
+
+@interface RCT_EXTERN_MODULE(EdgeCurrencyPluginsModule, NSObject)
+@end

package/ios/EdgeCurrencyPluginsModule.swift

@@ -0,0 +1,20 @@
+@objc(EdgeCurrencyPluginsModule) class EdgeCurrencyPluginsModule: NSObject {
+  @objc static func requiresMainQueueSetup() -> Bool { return false }
+
+  @objc func constantsToExport() -> NSDictionary {
+    return ["sourceUri": sourceUri() ?? ""]
+  }
+
+  func sourceUri() -> String? {
+    if let bundleUrl = Bundle.main.url(
+      forResource: "edge-currency-plugins",
+      withExtension: "bundle"
+    ),
+      let bundle = Bundle(url: bundleUrl),
+      let script = bundle.url(forResource: "edge-currency-plugins", withExtension: "js")
+    {
+      return script.absoluteString
+    }
+    return nil
+  }
+}

package/ios/edge-currency-plugins.xcodeproj/project.pbxproj

@@ -0,0 +1 @@
+// Placeholder so react-native autolinking can find us

package/lib/common/constants.js

@@ -1,5 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); const IMAGE_SERVER_URL = 'https://content.edge.app'; exports.IMAGE_SERVER_URL = IMAGE_SERVER_URL
- const INFO_SERVER_URI = 'https://info1.edge.app'; exports.INFO_SERVER_URI = INFO_SERVER_URI
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); const INFO_SERVER_URI = 'https://info1.edge.app'; exports.INFO_SERVER_URI = INFO_SERVER_URI
 
 // Fees
  const FEES_PATH = 'fees.json'; exports.FEES_PATH = FEES_PATH

package/lib/common/plugin/CurrencyPlugin.js

@@ -6,6 +6,8 @@
 
 
 
+var _memlet = require('memlet');
+
 
 
 
@@ -17,12 +19,14 @@ var _EngineEmitter = require('./EngineEmitter');
 var _PluginState = require('./PluginState');
 
 
+let hasMemletBeenSet = false
+
  function makeCurrencyPlugin(
   pluginOptions,
   pluginInfo
 ) {
   const { currencyInfo } = pluginInfo
-  const { io, log, pluginDisklet, initOptions } = pluginOptions
+  const { initOptions, io, log, nativeIo, pluginDisklet } = pluginOptions
   const currencyTools = _CurrencyTools.makeCurrencyTools.call(void 0, io, pluginInfo)
   const { defaultSettings, pluginId, currencyCode } = currencyInfo
   const pluginState = _PluginState.makePluginState.call(void 0, {
@@ -33,6 +37,18 @@ var _PluginState = require('./PluginState');
     log,
     defaultSettings: _types3.asUtxoUserSettings.call(void 0, defaultSettings)
   })
+
+  if (!hasMemletBeenSet) {
+    const { memletConfig } = nativeIo[
+      'edge-currency-plugins'
+    ] 
+
+    if (memletConfig != null) {
+      hasMemletBeenSet = true
+      _memlet.setMemletConfig.call(void 0, memletConfig)
+    }
+  }
+
   return {
     currencyInfo,
 

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

@@ -97,14 +97,15 @@ var _bnjs = require('bn.js'); var _bnjs2 = _interopRequireDefault(_bnjs);
     confirmations: tx.confirmations,
     currencyCode: currencyInfo.currencyCode,
     date: tx.date,
+    feeRateUsed,
     isSend: _biggystring.lt.call(void 0, tx.ourAmount, '0'),
     memos: [],
     nativeAmount: tx.ourAmount,
     networkFee: tx.fees,
     ourReceiveAddresses,
     signedTx: tx.hex,
+    tokenId: null,
     txid: tx.txid,
-    walletId,
-    feeRateUsed
+    walletId
   }
 }; exports.toEdgeTransaction = toEdgeTransaction

package/lib/common/utxobased/db/Processor.js

@@ -102,6 +102,11 @@ const BASELET_DIR = 'tables'
 
 
 
+
+
+
+
+
 
 
 

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

@@ -11,7 +11,11 @@ var _Blockbook = require('../network/Blockbook');
 
 
 
+
+
+
 var _blockbookApi = require('../network/blockbookApi');
+var _BlockbookElectrum = require('../network/BlockbookElectrum');
 var _Deferred = require('../network/Deferred'); var _Deferred2 = _interopRequireDefault(_Deferred);
 
 var _SocketEmitter = require('../network/SocketEmitter');
@@ -43,6 +47,34 @@ var _constants = require('./constants');
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -137,7 +169,6 @@ var _constants = require('./constants');
 
 
 
-
   const makeServerStatesCacheEntry = (blockbook) => ({
     blockbook,
     blockSubscriptionStatus: 'unsubscribed',
@@ -146,7 +177,6 @@ var _constants = require('./constants');
     blockHeight: 0
   })
   const setPickNextTaskCB = (
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     callback
   ) => {
     pickNextTaskCB = callback
@@ -189,7 +219,7 @@ var _constants = require('./constants');
   }
 
   const doRefillServers = () => {
-    const includePatterns = ['wss:', 'ws:']
+    const includePatterns = ['wss:', 'ws:', 'electrumwss:', 'electrumws:']
     if (serverList.length === 0) {
       serverList = pluginState.getLocalServers(_constants.NEW_CONNECTIONS, includePatterns)
     }
@@ -223,31 +253,62 @@ var _constants = require('./constants');
         continue
       }
 
-      // Make new Blockbook instance
-      const blockbook = _Blockbook.makeBlockbook.call(void 0, {
-        asAddress: pluginInfo.engineInfo.asBlockbookAddress,
-        connectionUri: uri,
-        engineEmitter,
-        log,
-        onQueueSpaceCB: async (
+      // Blockbook instance variable
+      let blockbook
 
+      // Create a new blockbook instance based on the URI scheme
+      if (['electrumwss', 'electrumws'].includes(parsed.scheme)) {
+        // Electrum wrapper
+        blockbook = _BlockbookElectrum.makeBlockbookElectrum.call(void 0, {
+          asAddress: pluginInfo.engineInfo.asBlockbookAddress,
+          connectionUri: uri,
+          engineEmitter,
+          log,
+          onQueueSpaceCB: async (
 
 ) => {
-          // Exit if the connection is no longer active
-          if (!(uri in serverStatesCache)) return
-
-          const task = await pickNextTaskCB(uri)
-          if (task != null && typeof task !== 'boolean') {
-            const taskMessage = `${task.method} params: ${JSON.stringify(
-              task.params
-            )}`
-            log(`${uri} nextTask: ${taskMessage}`)
-          }
-          return task
-        },
-        socketEmitter,
-        walletId: walletInfo.id
-      })
+            // Exit if the connection is no longer active
+            if (!(uri in serverStatesCache)) return
+
+            const task = await pickNextTaskCB(uri)
+            if (task != null && typeof task !== 'boolean') {
+              const taskMessage = `${task.method} params: ${JSON.stringify(
+                task.params
+              )}`
+              log(`${uri} nextTask: ${taskMessage}`)
+            }
+            return task
+          },
+          pluginInfo,
+          socketEmitter,
+          walletId: walletInfo.id
+        })
+      } else {
+        // Regular blockbook instance
+        blockbook = _Blockbook.makeBlockbook.call(void 0, {
+          asAddress: pluginInfo.engineInfo.asBlockbookAddress,
+          connectionUri: uri,
+          engineEmitter,
+          log,
+          onQueueSpaceCB: async (
+
+) => {
+            // Exit if the connection is no longer active
+            if (!(uri in serverStatesCache)) return
+
+            const task = await pickNextTaskCB(uri)
+            if (task != null && typeof task !== 'boolean') {
+              const taskMessage = `${task.method} params: ${JSON.stringify(
+                task.params
+              )}`
+              log(`${uri} nextTask: ${taskMessage}`)
+            }
+            return task
+          },
+          socketEmitter,
+          walletId: walletInfo.id
+        })
+      }
 
       // Make new ServerStates instance
       serverStatesCache[uri] = makeServerStatesCacheEntry(blockbook)
@@ -366,7 +427,7 @@ var _constants = require('./constants');
       // Broadcast through any HTTP URI that may be configured, only if no
       // blockbook instances are connected.
       if (!isAnyBlockbookConnected) {
-        // This is for the future when we want to HTTP servers from the user
+        // This is for the future when we want to get HTTP servers from the user
         // settings:
         // const httpUris = pluginState.getLocalServers(Infinity, [
         //   /^http(?:s)?:/i
@@ -398,6 +459,8 @@ var _constants = require('./constants');
         }
 
         for (const uri of nowNodeUris) {
+          log.warn('Falling back to NOWNode server broadcast over HTTP:', uri)
+
           // HTTP Fallback
           io.fetchCors(`${uri}/api/v2/sendtx/`, {
             method: 'POST',
@@ -495,7 +558,7 @@ var _constants = require('./constants');
     return serverStatesCache[uri].blockHeight
   }
 
-  return {
+  const instance = {
     setPickNextTaskCB,
     stop,
     serverCanGetTx,
@@ -508,6 +571,74 @@ var _constants = require('./constants');
     broadcastTx,
     watchAddresses,
     watchBlocks,
-    getBlockHeight
+    getBlockHeight,
+
+    //
+    // Task Methods:
+    //
+
+    addressQueryTask(
+      serverUri,
+      address,
+      params,
+      deferred
+    ) {
+      const serverState = serverStatesCache[serverUri]
+      if (serverState == null)
+        throw new Error(`No blockbook connection with ${serverUri}`)
+
+      return serverState.blockbook.addressQueryTask(
+        address,
+        {
+          asBlockbookAddress: pluginInfo.engineInfo.asBlockbookAddress,
+          lastQueriedBlockHeight: params.lastQueriedBlockHeight,
+          page: params.page
+        },
+        deferred
+      )
+    },
+
+    transactionQueryTask(
+      serverUri,
+      txId,
+      deferred
+    ) {
+      const serverState = serverStatesCache[serverUri]
+      if (serverState == null)
+        throw new Error(`No blockbook connection with ${serverUri}`)
+
+      return serverState.blockbook.transactionQueryTask(txId, deferred)
+    },
+
+    transactionSpecialQueryTask(
+      serverUri,
+      txId,
+      deferred
+    ) {
+      const serverState = serverStatesCache[serverUri]
+      if (serverState == null)
+        throw new Error(`No blockbook connection with ${serverUri}`)
+
+      return serverState.blockbook.transactionSpecialQueryTask(txId, deferred)
+    },
+    utxoListQueryTask(
+      serverUri,
+      address,
+      deferred
+    ) {
+      const serverState = serverStatesCache[serverUri]
+      if (serverState == null)
+        throw new Error(`No blockbook connection with ${serverUri}`)
+
+      return serverState.blockbook.utxoListQueryTask(
+        address,
+        {
+          asBlockbookAddress: pluginInfo.engineInfo.asBlockbookAddress
+        },
+        deferred
+      )
+    }
   }
+
+  return instance
 } exports.makeServerStates = makeServerStates;

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

@@ -543,7 +543,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
         bs.gt(totalAmountToSend, `${_utils3.sumUtxos.call(void 0, utxos)}`) ||
         utxos.length === 0
       ) {
-        throw new (0, _edgecorejs.InsufficientFundsError)(currencyInfo.currencyCode)
+        throw new (0, _edgecorejs.InsufficientFundsError)({ tokenId: null })
       }
 
       let targets = []
@@ -684,6 +684,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
         otherParams,
         ourReceiveAddresses,
         signedTx: '',
+        tokenId: null,
         txid: '',
         walletId: walletInfo.id
       }
@@ -948,7 +949,7 @@ var _UtxoWalletTools = require('./UtxoWalletTools');
             if (tmpUtxos === null || tmpUtxos.length < 1) {
               throw new Error('Private key has no funds')
             }
-            const destAddress = await this.getFreshAddress({})
+            const destAddress = await this.getFreshAddress({ tokenId: null })
             const nativeAmount = tmpMetadata.state.balance
             const txOptions = { utxos: tmpUtxos, subtractFee: true }
             spendInfo.spendTargets = [