Smarter Tokens fetching

js/src/3rdparty/shapeshift/shapeshift.js

@@ -15,7 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 export default function (rpc) {
-  const subscriptions = [];
+  let subscriptions = [];
+  let pollStatusIntervalId = null;
 
   function getCoins () {
     return rpc.get('getcoins');
@@ -45,6 +46,24 @@ export default function (rpc) {
       callback,
       idx
     });
+
+    // Only poll if there are subscriptions...
+    if (!pollStatusIntervalId) {
+      pollStatusIntervalId = setInterval(_pollStatus, 2000);
+    }
+  }
+
+  function unsubscribe (depositAddress) {
+    const newSubscriptions = []
+      .concat(subscriptions)
+      .filter((sub) => sub.depositAddress !== depositAddress);
+
+    subscriptions = newSubscriptions;
+
+    if (subscriptions.length === 0) {
+      clearInterval(pollStatusIntervalId);
+      pollStatusIntervalId = null;
+    }
   }
 
   function _getSubscriptionStatus (subscription) {
@@ -81,13 +100,12 @@ export default function (rpc) {
     subscriptions.forEach(_getSubscriptionStatus);
   }
 
-  setInterval(_pollStatus, 2000);
-
   return {
     getCoins,
     getMarketInfo,
     getStatus,
     shift,
-    subscribe
+    subscribe,
+    unsubscribe
   };
 }

js/src/api/contract/contract.js

@@ -48,7 +48,8 @@ export default class Contract {
       this._instance[fn.signature] = fn;
     });
 
-    this._sendSubscriptionChanges();
+    this._subscribedToChanges = false;
+    this._subscribedToChangesId = null;
   }
 
   get address () {
@@ -232,51 +233,102 @@ export default class Contract {
       return this._subscribe(event, options, callback);
     };
 
+    event.register = (options = {}, callback) => {
+      return this._register(event, options, callback);
+    };
+
     event.unsubscribe = (subscriptionId) => {
       return this.unsubscribe(subscriptionId);
     };
 
     return event;
   }
 
-  subscribe (eventName = null, options = {}, callback) {
-    return new Promise((resolve, reject) => {
-      let event = null;
+  _register (event = null, _options, callback) {
+    return this
+      ._createEthFilter(event, _options)
+      .then((filterId) => {
+        return {
+          fetch: () => {
+            return this._api.eth
+              .getFilterChanges(filterId)
+              .then((logs) => {
+                if (!logs || !logs.length) {
+                  return;
+                }
+
+                try {
+                  callback(null, this.parseEventLogs(logs));
+                } catch (error) {
+                  callback(error);
+                }
+              });
+          },
+
+          unsubscribe: () => {
+            return this._api.eth.uninstallFilter(filterId);
+          }
+        };
+      });
+  }
 
-      if (eventName) {
-        event = this._events.find((evt) => evt.name === eventName);
+  _findEvent (eventName = null) {
+    const event = eventName
+      ? this._events.find((evt) => evt.name === eventName)
+      : null;
 
-        if (!event) {
-          const events = this._events.map((evt) => evt.name).join(', ');
-          reject(new Error(`${eventName} is not a valid eventName, subscribe using one of ${events} (or null to include all)`));
-          return;
-        }
-      }
+    if (eventName && !event) {
+      const events = this._events.map((evt) => evt.name).join(', ');
+      throw new Error(`${eventName} is not a valid eventName, subscribe using one of ${events} (or null to include all)`);
+    }
 
-      return this._subscribe(event, options, callback).then(resolve).catch(reject);
-    });
+    return event;
   }
 
-  _subscribe (event = null, _options, callback) {
-    const subscriptionId = nextSubscriptionId++;
+  _createEthFilter (event = null, _options) {
+    const optionTopics = _options.topics || [];
+    const signature = event && event.signature || null;
+
+    // If event provided, remove the potential event signature
+    // as the first element of the topics
+    const topics = signature
+      ? [ signature ].concat(optionTopics.filter((t, idx) => idx > 0 || t !== signature))
+      : optionTopics;
+
     const options = Object.assign({}, _options, {
       address: this._address,
-      topics: [event ? event.signature : null]
+      topics
     });
 
-    return this._api.eth
-      .newFilter(options)
+    return this._api.eth.newFilter(options);
+  }
+
+  subscribe (eventName = null, options = {}, callback) {
+    try {
+      const event = this._findEvent(eventName);
+      return this._subscribe(event, options, callback);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }
+
+  _subscribe (event = null, _options, callback) {
+    const subscriptionId = nextSubscriptionId++;
+
+    return this
+      ._createEthFilter(event, _options)
       .then((filterId) => {
         return this._api.eth
           .getFilterLogs(filterId)
           .then((logs) => {
             callback(null, this.parseEventLogs(logs));
+
             this._subscriptions[subscriptionId] = {
-              options,
               callback,
               filterId
             };
 
+            this._subscribeToChanges();
             return subscriptionId;
           });
       });
@@ -287,12 +339,30 @@ export default class Contract {
       .uninstallFilter(this._subscriptions[subscriptionId].filterId)
       .then(() => {
         delete this._subscriptions[subscriptionId];
+
+        if (Object.keys(this._subscriptions).length === 0) {
+          this._unsubscribeToChanges();
+        }
       })
       .catch((error) => {
         console.error('unsubscribe', error);
       });
   }
 
+  _subscribeToChanges = () => {
+    if (this._subscribedToChanges) {
+      return;
+    }
+
+    this._subscribedToChanges = true;
+    this._sendSubscriptionChanges();
+  }
+
+  _unsubscribeToChanges = () => {
+    this._subscribedToChanges = false;
+    clearTimeout(this._subscribedToChangesId);
+  }
+
   _sendSubscriptionChanges = () => {
     const subscriptions = Object.values(this._subscriptions);
     const timeout = () => setTimeout(this._sendSubscriptionChanges, 1000);
@@ -316,11 +386,11 @@ export default class Contract {
           }
         });
 
-        timeout();
+        this._subscribedToChangesId = timeout();
       })
       .catch((error) => {
         console.error('_sendSubscriptionChanges', error);
-        timeout();
+        this._subscribedToChangesId = timeout();
       });
   }
 }

js/src/api/format/input.js

@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import BigNumber from 'bignumber.js';
+import { range } from 'lodash';
 
 import { isArray, isHex, isInstanceOf, isString } from '../util/types';
 
@@ -50,10 +51,15 @@ export function inHash (hash) {
   return inHex(hash);
 }
 
+export function pad (input, length) {
+  const value = inHex(input).substr(2, length * 2);
+  return '0x' + value + range(length * 2 - value.length).map(() => '0').join('');
+}
+
 export function inTopics (_topics) {
   let topics = (_topics || [])
-    .filter((topic) => topic)
-    .map(inHex);
+    .filter((topic) => topic === null || topic)
+    .map((topic) => topic === null ? null : pad(topic, 32));
 
   while (topics.length < 4) {
     topics.push(null);

js/src/api/util/format.js

@@ -29,3 +29,7 @@ export function hex2Ascii (_hex) {
 
   return str;
 }
+
+export function asciiToHex (string) {
+  return '0x' + string.split('').map((s) => s.charCodeAt(0).toString(16)).join('');
+}

js/src/api/util/index.js

@@ -16,7 +16,7 @@
 
 import { isAddress as isAddressValid, toChecksumAddress } from '../../abi/util/address';
 import { decodeCallData, decodeMethodInput, methodToAbi } from './decode';
-import { bytesToHex, hex2Ascii } from './format';
+import { bytesToHex, hex2Ascii, asciiToHex } from './format';
 import { fromWei, toWei } from './wei';
 import { sha3 } from './sha3';
 import { isArray, isFunction, isHex, isInstanceOf, isString } from './types';
@@ -31,6 +31,7 @@ export default {
   isString,
   bytesToHex,
   hex2Ascii,
+  asciiToHex,
   createIdentityImg,
   decodeCallData,
   decodeMethodInput,

js/src/contracts/sms-verification.js

@@ -21,18 +21,35 @@ export const checkIfVerified = (contract, account) => {
 };
 
 export const checkIfRequested = (contract, account) => {
+  let subId = null;
+  let resolved = false;
+
   return new Promise((resolve, reject) => {
-    contract.subscribe('Requested', {
-      fromBlock: 0, toBlock: 'pending'
-    }, (err, logs) => {
-      if (err) {
-        return reject(err);
-      }
-      const e = logs.find((l) => {
-        return l.type === 'mined' && l.params.who && l.params.who.value === account;
+    contract
+      .subscribe('Requested', {
+        fromBlock: 0, toBlock: 'pending'
+      }, (err, logs) => {
+        if (err) {
+          return reject(err);
+        }
+        const e = logs.find((l) => {
+          return l.type === 'mined' && l.params.who && l.params.who.value === account;
+        });
+
+        resolve(e ? e.transactionHash : false);
+        resolved = true;
+
+        if (subId) {
+          contract.unsubscribe(subId);
+        }
+      })
+      .then((_subId) => {
+        subId = _subId;
+
+        if (resolved) {
+          contract.unsubscribe(subId);
+        }
       });
-      resolve(e ? e.transactionHash : false);
-    });
   });
 };
 

js/src/modals/Shapeshift/shapeshift.js

@@ -63,6 +63,16 @@ export default class Shapeshift extends Component {
     this.retrieveCoins();
   }
 
+  componentWillUnmount () {
+    this.unsubscribe();
+  }
+
+  unsubscribe () {
+    // Unsubscribe from Shapeshit
+    const { depositAddress } = this.state;
+    shapeshift.unsubscribe(depositAddress);
+  }
+
   render () {
     const { error, stage } = this.state;
 
@@ -205,6 +215,10 @@ export default class Shapeshift extends Component {
         console.log('onShift', result);
         const depositAddress = result.deposit;
 
+        if (this.state.depositAddress) {
+          this.unsubscribe();
+        }
+
         shapeshift.subscribe(depositAddress, this.onExchangeInfo);
         this.setState({ depositAddress });
       })