Wallet servers (#250)

Wallet servers

dist/bundle.es.js

@@ -85,6 +85,8 @@ const WALLET_LOCK_COMPLETED = 'WALLET_LOCK_COMPLETED';
 const WALLET_LOCK_FAILED = 'WALLET_LOCK_FAILED';
 const WALLET_STATUS_START = 'WALLET_STATUS_START';
 const WALLET_STATUS_COMPLETED = 'WALLET_STATUS_COMPLETED';
+const WALLET_RESTART = 'WALLET_RESTART';
+const WALLET_RESTART_COMPLETED = 'WALLET_RESTART_COMPLETED';
 const SET_TRANSACTION_LIST_FILTER = 'SET_TRANSACTION_LIST_FILTER';
 const UPDATE_CURRENT_HEIGHT = 'UPDATE_CURRENT_HEIGHT';
 const SET_DRAFT_TRANSACTION_AMOUNT = 'SET_DRAFT_TRANSACTION_AMOUNT';
@@ -168,6 +170,9 @@ const SEARCH_BLUR = 'SEARCH_BLUR';
 
 // Settings
 const DAEMON_SETTINGS_RECEIVED = 'DAEMON_SETTINGS_RECEIVED';
+const DAEMON_STATUS_RECEIVED = 'DAEMON_STATUS_RECEIVED';
+const SHARED_PREFERENCE_SET = 'SHARED_PREFERENCE_SET';
+const SAVE_CUSTOM_WALLET_SERVERS = 'SAVE_CUSTOM_WALLET_SERVERS';
 const CLIENT_SETTING_CHANGED = 'CLIENT_SETTING_CHANGED';
 const UPDATE_IS_NIGHT = 'UPDATE_IS_NIGHT';
 
@@ -327,6 +332,8 @@ var action_types = /*#__PURE__*/Object.freeze({
   WALLET_LOCK_FAILED: WALLET_LOCK_FAILED,
   WALLET_STATUS_START: WALLET_STATUS_START,
   WALLET_STATUS_COMPLETED: WALLET_STATUS_COMPLETED,
+  WALLET_RESTART: WALLET_RESTART,
+  WALLET_RESTART_COMPLETED: WALLET_RESTART_COMPLETED,
   SET_TRANSACTION_LIST_FILTER: SET_TRANSACTION_LIST_FILTER,
   UPDATE_CURRENT_HEIGHT: UPDATE_CURRENT_HEIGHT,
   SET_DRAFT_TRANSACTION_AMOUNT: SET_DRAFT_TRANSACTION_AMOUNT,
@@ -400,6 +407,9 @@ var action_types = /*#__PURE__*/Object.freeze({
   SEARCH_FOCUS: SEARCH_FOCUS,
   SEARCH_BLUR: SEARCH_BLUR,
   DAEMON_SETTINGS_RECEIVED: DAEMON_SETTINGS_RECEIVED,
+  DAEMON_STATUS_RECEIVED: DAEMON_STATUS_RECEIVED,
+  SHARED_PREFERENCE_SET: SHARED_PREFERENCE_SET,
+  SAVE_CUSTOM_WALLET_SERVERS: SAVE_CUSTOM_WALLET_SERVERS,
   CLIENT_SETTING_CHANGED: CLIENT_SETTING_CHANGED,
   UPDATE_IS_NIGHT: UPDATE_IS_NIGHT,
   AUTHENTICATION_STARTED: AUTHENTICATION_STARTED,
@@ -672,6 +682,103 @@ var speech_urls = /*#__PURE__*/Object.freeze({
   SPEECH_PUBLISH: SPEECH_PUBLISH
 });
 
+const ANNOUNCE_HEAD_AND_SD_ONLY = 'announce_head_and_sd_only';
+const API = 'api';
+const BLOB_DOWNLOAD_TIMEOUT = 'blob_download_timeout';
+const BLOB_LRU_CACHE_SIZE = 'blob_lru_cache_size';
+const BLOCKCHAIN_NAME = 'blockchain_name';
+const CACHE_TIME = 'cache_time';
+const COIN_SELECTION_STRATEGY = 'coin_selection_strategy';
+const COMMENT_SERVER = 'comment_server';
+const COMPONENTS_TO_SKIP = 'components_to_skip';
+const CONCURRENT_BLOB_ANNOUNCERS = 'concurrent_blob_announcers';
+const CONCURRENT_REFLECTOR_UPLOADS = 'concurrent_reflector_uploads';
+const CONFIG = 'config';
+const DATA_DIR = 'data_dir';
+const DOWNLOAD_DIR = 'download_dir';
+const DOWNLOAD_TIMEOUT = 'download_timeout';
+const FIXED_PEER_DELAY = 'fixed_peer_delay';
+const KNOWN_DHT_NODES = 'known_dht_nodes';
+const LBRYUM_SERVERS = 'lbryum_servers';
+const MAX_CONNECTIONS_PER_DOWNLOAD = 'max_connections_per_download';
+const MAX_KEY_FEE = 'max_key_fee';
+const DEFAULT_WALLET = 'default_wallet';
+const NETWORK_INTERFACE = 'network_interface';
+const NODE_RPC_TIMEOUT = 'node_rpc_timeout';
+const PEER_CONNECT_TIMEOUT = 'peer_connect_timeout';
+const REFLECT_STREAMS = 'reflect_streams';
+const REFLECTOR_SERVERS = 'reflector_servers';
+const S3_HEADERS_DEPTH = 's3_headers_depth';
+const SAVE_BLOBS = 'save_blobs';
+const SAVE_FILES = 'save_files';
+const SHARE_USAGE_DATA = 'share_usage_data';
+const SPLIT_BUCKETS_UNDER_INDEX = 'split_buckets_under_index';
+const STREAMING_GET = 'streaming_get';
+const STREAMING_SERVER = 'streaming_server';
+const TCP_PORT = 'tcp_port';
+const TRACK_BANDWIDTH = 'track_bandwidth';
+const UDP_PORT = 'udp_port';
+const USE_UPNP = 'use_upnp';
+const WALLET_DIR = 'wallet_dir';
+const WALLETS = 'wallets';
+
+var daemon_settings = /*#__PURE__*/Object.freeze({
+  ANNOUNCE_HEAD_AND_SD_ONLY: ANNOUNCE_HEAD_AND_SD_ONLY,
+  API: API,
+  BLOB_DOWNLOAD_TIMEOUT: BLOB_DOWNLOAD_TIMEOUT,
+  BLOB_LRU_CACHE_SIZE: BLOB_LRU_CACHE_SIZE,
+  BLOCKCHAIN_NAME: BLOCKCHAIN_NAME,
+  CACHE_TIME: CACHE_TIME,
+  COIN_SELECTION_STRATEGY: COIN_SELECTION_STRATEGY,
+  COMMENT_SERVER: COMMENT_SERVER,
+  COMPONENTS_TO_SKIP: COMPONENTS_TO_SKIP,
+  CONCURRENT_BLOB_ANNOUNCERS: CONCURRENT_BLOB_ANNOUNCERS,
+  CONCURRENT_REFLECTOR_UPLOADS: CONCURRENT_REFLECTOR_UPLOADS,
+  CONFIG: CONFIG,
+  DATA_DIR: DATA_DIR,
+  DOWNLOAD_DIR: DOWNLOAD_DIR,
+  DOWNLOAD_TIMEOUT: DOWNLOAD_TIMEOUT,
+  FIXED_PEER_DELAY: FIXED_PEER_DELAY,
+  KNOWN_DHT_NODES: KNOWN_DHT_NODES,
+  LBRYUM_SERVERS: LBRYUM_SERVERS,
+  MAX_CONNECTIONS_PER_DOWNLOAD: MAX_CONNECTIONS_PER_DOWNLOAD,
+  MAX_KEY_FEE: MAX_KEY_FEE,
+  DEFAULT_WALLET: DEFAULT_WALLET,
+  NETWORK_INTERFACE: NETWORK_INTERFACE,
+  NODE_RPC_TIMEOUT: NODE_RPC_TIMEOUT,
+  PEER_CONNECT_TIMEOUT: PEER_CONNECT_TIMEOUT,
+  REFLECT_STREAMS: REFLECT_STREAMS,
+  REFLECTOR_SERVERS: REFLECTOR_SERVERS,
+  S3_HEADERS_DEPTH: S3_HEADERS_DEPTH,
+  SAVE_BLOBS: SAVE_BLOBS,
+  SAVE_FILES: SAVE_FILES,
+  SHARE_USAGE_DATA: SHARE_USAGE_DATA,
+  SPLIT_BUCKETS_UNDER_INDEX: SPLIT_BUCKETS_UNDER_INDEX,
+  STREAMING_GET: STREAMING_GET,
+  STREAMING_SERVER: STREAMING_SERVER,
+  TCP_PORT: TCP_PORT,
+  TRACK_BANDWIDTH: TRACK_BANDWIDTH,
+  UDP_PORT: UDP_PORT,
+  USE_UPNP: USE_UPNP,
+  WALLET_DIR: WALLET_DIR,
+  WALLETS: WALLETS
+});
+
+/*
+* How to use this file:
+* Settings exported from here will trigger the setting to be
+* sent to the preference middleware when set using the
+* usual setDaemonSettings and clearDaemonSettings methods.
+*
+* See redux/settings/actions in the app for where this is used.
+ */
+
+const WALLET_SERVERS = LBRYUM_SERVERS;
+
+var shared_preferences = /*#__PURE__*/Object.freeze({
+  WALLET_SERVERS: WALLET_SERVERS
+});
+
 const SEARCH_TYPES = {
   FILE: 'file',
   CHANNEL: 'channel',
@@ -1410,18 +1517,18 @@ var _extends$2 = Object.assign || function (target) { for (var i = 1; i < argume
 
 function extractUserState(rawObj) {
   if (rawObj && rawObj.version === '0.1' && rawObj.value) {
-    const { subscriptions, tags, blockedChannels } = rawObj.value;
+    const { subscriptions, tags, blockedChannels, settings } = rawObj.value;
 
-    return _extends$2({}, subscriptions ? { subscriptions } : {}, tags ? { tags } : {}, blockedChannels ? { blockedChannels } : {});
+    return _extends$2({}, subscriptions ? { subscriptions } : {}, tags ? { tags } : {}, blockedChannels ? { blockedChannels } : {}, settings ? { settings } : {});
   }
 
   return {};
 }
 
-function doPopulateSharedUserState(settings) {
+function doPopulateSharedUserState(sharedSettings) {
   return dispatch => {
-    const { subscriptions, tags } = extractUserState(settings);
+    const { subscriptions, tags, blockedChannels, settings } = extractUserState(sharedSettings);
-    dispatch({ type: USER_STATE_POPULATE, data: { subscriptions, tags } });
+    dispatch({ type: USER_STATE_POPULATE, data: { subscriptions, tags, blockedChannels, settings } });
   };
 }
 
@@ -2494,6 +2601,18 @@ function doWalletUnlock(password) {
   };
 }
 
+function doWalletReconnect() {
+  return dispatch => {
+    dispatch({
+      type: WALLET_RESTART
+    });
+    // this basically returns null when it's done. :(
+    // might be good to  dispatch ACTIONS.WALLET_RESTARTED
+    lbryProxy.wallet_reconnect().then(() => dispatch({
+      type: WALLET_RESTART_COMPLETED
+    }));
+  };
+}
 function doWalletDecrypt() {
   return dispatch => {
     dispatch({
@@ -5378,6 +5497,7 @@ const selectChannelIsBlocked = uri => reselect.createSelector(selectBlockedChann
 
 exports.ACTIONS = action_types;
 exports.CLAIM_VALUES = claim;
+exports.DAEMON_SETTINGS = daemon_settings;
 exports.DEFAULT_FOLLOWED_TAGS = DEFAULT_FOLLOWED_TAGS;
 exports.DEFAULT_KNOWN_TAGS = DEFAULT_KNOWN_TAGS;
 exports.LICENSES = licenses;
@@ -5387,6 +5507,7 @@ exports.PAGES = pages;
 exports.SEARCH_OPTIONS = SEARCH_OPTIONS;
 exports.SEARCH_TYPES = SEARCH_TYPES;
 exports.SETTINGS = settings;
+exports.SHARED_PREFERENCES = shared_preferences;
 exports.SORT_OPTIONS = sort_options;
 exports.SPEECH_URLS = speech_urls;
 exports.THUMBNAIL_STATUSES = thumbnail_upload_statuses;
@@ -5459,6 +5580,7 @@ exports.doUpdateSearchQuery = doUpdateSearchQuery;
 exports.doUploadThumbnail = doUploadThumbnail;
 exports.doWalletDecrypt = doWalletDecrypt;
 exports.doWalletEncrypt = doWalletEncrypt;
+exports.doWalletReconnect = doWalletReconnect;
 exports.doWalletStatus = doWalletStatus;
 exports.doWalletUnlock = doWalletUnlock;
 exports.fileInfoReducer = fileInfoReducer;

src/constants/action_types.js

@@ -62,6 +62,8 @@ export const WALLET_LOCK_COMPLETED = 'WALLET_LOCK_COMPLETED';
 export const WALLET_LOCK_FAILED = 'WALLET_LOCK_FAILED';
 export const WALLET_STATUS_START = 'WALLET_STATUS_START';
 export const WALLET_STATUS_COMPLETED = 'WALLET_STATUS_COMPLETED';
+export const WALLET_RESTART = 'WALLET_RESTART';
+export const WALLET_RESTART_COMPLETED = 'WALLET_RESTART_COMPLETED';
 export const SET_TRANSACTION_LIST_FILTER = 'SET_TRANSACTION_LIST_FILTER';
 export const UPDATE_CURRENT_HEIGHT = 'UPDATE_CURRENT_HEIGHT';
 export const SET_DRAFT_TRANSACTION_AMOUNT = 'SET_DRAFT_TRANSACTION_AMOUNT';
@@ -145,6 +147,9 @@ export const SEARCH_BLUR = 'SEARCH_BLUR';
 
 // Settings
 export const DAEMON_SETTINGS_RECEIVED = 'DAEMON_SETTINGS_RECEIVED';
+export const DAEMON_STATUS_RECEIVED = 'DAEMON_STATUS_RECEIVED';
+export const SHARED_PREFERENCE_SET = 'SHARED_PREFERENCE_SET';
+export const SAVE_CUSTOM_WALLET_SERVERS = 'SAVE_CUSTOM_WALLET_SERVERS';
 export const CLIENT_SETTING_CHANGED = 'CLIENT_SETTING_CHANGED';
 export const UPDATE_IS_NIGHT = 'UPDATE_IS_NIGHT';
 

src/constants/daemon_settings.js

@@ -0,0 +1,39 @@
+export const ANNOUNCE_HEAD_AND_SD_ONLY = 'announce_head_and_sd_only';
+export const API = 'api';
+export const BLOB_DOWNLOAD_TIMEOUT = 'blob_download_timeout';
+export const BLOB_LRU_CACHE_SIZE = 'blob_lru_cache_size';
+export const BLOCKCHAIN_NAME = 'blockchain_name';
+export const CACHE_TIME = 'cache_time';
+export const COIN_SELECTION_STRATEGY = 'coin_selection_strategy';
+export const COMMENT_SERVER = 'comment_server';
+export const COMPONENTS_TO_SKIP = 'components_to_skip';
+export const CONCURRENT_BLOB_ANNOUNCERS = 'concurrent_blob_announcers';
+export const CONCURRENT_REFLECTOR_UPLOADS = 'concurrent_reflector_uploads';
+export const CONFIG = 'config';
+export const DATA_DIR = 'data_dir';
+export const DOWNLOAD_DIR = 'download_dir';
+export const DOWNLOAD_TIMEOUT = 'download_timeout';
+export const FIXED_PEER_DELAY = 'fixed_peer_delay';
+export const KNOWN_DHT_NODES = 'known_dht_nodes';
+export const LBRYUM_SERVERS = 'lbryum_servers';
+export const MAX_CONNECTIONS_PER_DOWNLOAD = 'max_connections_per_download';
+export const MAX_KEY_FEE = 'max_key_fee';
+export const DEFAULT_WALLET = 'default_wallet';
+export const NETWORK_INTERFACE = 'network_interface';
+export const NODE_RPC_TIMEOUT = 'node_rpc_timeout';
+export const PEER_CONNECT_TIMEOUT = 'peer_connect_timeout';
+export const REFLECT_STREAMS = 'reflect_streams';
+export const REFLECTOR_SERVERS = 'reflector_servers';
+export const S3_HEADERS_DEPTH = 's3_headers_depth';
+export const SAVE_BLOBS = 'save_blobs';
+export const SAVE_FILES = 'save_files';
+export const SHARE_USAGE_DATA = 'share_usage_data';
+export const SPLIT_BUCKETS_UNDER_INDEX = 'split_buckets_under_index';
+export const STREAMING_GET = 'streaming_get';
+export const STREAMING_SERVER = 'streaming_server';
+export const TCP_PORT = 'tcp_port';
+export const TRACK_BANDWIDTH = 'track_bandwidth';
+export const UDP_PORT = 'udp_port';
+export const USE_UPNP = 'use_upnp';
+export const WALLET_DIR = 'wallet_dir';
+export const WALLETS = 'wallets';

src/constants/shared_preferences.js

@@ -0,0 +1,12 @@
+/*
+* How to use this file:
+* Settings exported from here will trigger the setting to be
+* sent to the preference middleware when set using the
+* usual setDaemonSettings and clearDaemonSettings methods.
+*
+* See redux/settings/actions in the app for where this is used.
+ */
+
+import * as DAEMON_SETTINGS from './daemon_settings';
+
+export const WALLET_SERVERS = DAEMON_SETTINGS.LBRYUM_SERVERS;

src/index.js

@@ -8,6 +8,8 @@ import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses';
 import * as TRANSACTIONS from 'constants/transaction_types';
 import * as TX_LIST from 'constants/transaction_list';
 import * as SPEECH_URLS from 'constants/speech_urls';
+import * as DAEMON_SETTINGS from 'constants/daemon_settings';
+import * as SHARED_PREFERENCES from 'constants/shared_preferences';
 import { SEARCH_TYPES, SEARCH_OPTIONS } from 'constants/search';
 import { DEFAULT_KNOWN_TAGS, DEFAULT_FOLLOWED_TAGS, MATURE_TAGS } from 'constants/tags';
 import Lbry, { apiCall } from 'lbry';
@@ -22,6 +24,7 @@ export {
   SEARCH_TYPES,
   SEARCH_OPTIONS,
   SETTINGS,
+  DAEMON_SETTINGS,
   TRANSACTIONS,
   TX_LIST,
   SORT_OPTIONS,
@@ -30,6 +33,7 @@ export {
   DEFAULT_FOLLOWED_TAGS,
   MATURE_TAGS,
   SPEECH_URLS,
+  SHARED_PREFERENCES,
 };
 
 // common
@@ -109,6 +113,7 @@ export {
   doWalletDecrypt,
   doWalletUnlock,
   doWalletStatus,
+  doWalletReconnect,
   doSetTransactionListFilter,
   doUpdateBlockHeight,
   doClearSupport,

src/redux/actions/sync.js

@@ -8,27 +8,29 @@ type SharedData = {
     subscriptions?: Array<string>,
     tags?: Array<string>,
     blockedChannels?: Array<string>,
+    settings?: any,
   },
 };
 
 function extractUserState(rawObj: SharedData) {
   if (rawObj && rawObj.version === '0.1' && rawObj.value) {
-    const { subscriptions, tags, blockedChannels } = rawObj.value;
+    const { subscriptions, tags, blockedChannels, settings} = rawObj.value;
 
     return {
       ...(subscriptions ? { subscriptions } : {}),
       ...(tags ? { tags } : {}),
       ...(blockedChannels ? { blockedChannels } : {}),
+      ...(settings ? { settings } : {}),
     };
   }
 
   return {};
 }
 
-export function doPopulateSharedUserState(settings: any) {
+export function doPopulateSharedUserState(sharedSettings: any) {
   return (dispatch: Dispatch) => {
-    const { subscriptions, tags } = extractUserState(settings);
+    const { subscriptions, tags, blockedChannels, settings } = extractUserState(sharedSettings);
-    dispatch({ type: ACTIONS.USER_STATE_POPULATE, data: { subscriptions, tags } });
+    dispatch({ type: ACTIONS.USER_STATE_POPULATE, data: { subscriptions, tags, blockedChannels, settings } });
   };
 }
 

src/redux/actions/wallet.js

@@ -338,6 +338,20 @@ export function doWalletLock() {
   };
 }
 
+export function doWalletReconnect() {
+  return dispatch => {
+    dispatch({
+      type: ACTIONS.WALLET_RESTART,
+    });
+    // this basically returns null when it's done. :(
+    // might be good to  dispatch ACTIONS.WALLET_RESTARTED
+    Lbry.wallet_reconnect().then(() =>
+      dispatch({
+        type: ACTIONS.WALLET_RESTART_COMPLETED,
+      })
+    );
+  };
+}
 export function doWalletDecrypt() {
   return dispatch => {
     dispatch({