ShapeShift Improvements

src/eth/eth-account.js

@@ -22,6 +22,10 @@ class EthAccount {
     return this._addr;
   }
 
+  get receiveAddress () {
+    return this.address;
+  }
+
   get privateKey () {
     return this._priv;
   }

src/shift/index.js

@@ -31,19 +31,22 @@ class ShapeShift {
     return this._api.getRate(coinPair)
   }
 
-  getQuote (coinPair, amount) {
+  getQuote (from, to, amount) {
     trace('getting quote')
-    let [from, to] = coinPair.split('_')
 
-    let withdrawalAddress = this.nextAddressForCurrency(to)
-    let returnAddress = this.nextAddressForCurrency(from)
+    let returnAddress = from.receiveAddress;
+    let withdrawalAddress = to.receiveAddress;
+    let coinPair = from.coinCode + '_' + to.coinCode;
 
     return this._api.getQuote(coinPair, amount, withdrawalAddress, returnAddress)
       .then(Quote.fromApiResponse)
   }
 
-  getApproximateQuote (coinPair, amount) {
+  getApproximateQuote (from, to, amount) {
     trace('getting approximate quote')
+
+    let coinPair = from.coinCode + '_' + to.coinCode;
+
     return this._api.getQuote(coinPair, amount)
       .then(Quote.fromApiResponse)
   }
@@ -121,19 +124,6 @@ class ShapeShift {
     return Promise.all(requests);
   }
 
-  nextAddressForCurrency (currency) {
-    if (currency === 'btc') {
-      return this._wallet.hdwallet.defaultAccount.receiveAddress
-    }
-    if (currency === 'eth') {
-      return this._wallet.eth.defaultAccount.address
-    }
-    if (currency === 'bch') {
-      return this._wallet.bch.defaultAccount.receiveAddress
-    }
-    throw new Error(`Currency '${currency}' is not supported`)
-  }
-
   saveBtcWithdrawalLabel (quote) {
     let label = `ShapeShift order #${quote.orderId}`
     let account = this._wallet.hdwallet.defaultAccount