feat(BSV): begin adding bsv to swap

blockchain · Jan 3, 2019 · 76d89f4 · 76d89f4
1 parent 0121487
commit 76d89f4
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 1 deletion.
diff --git a/config/mocks/wallet-options-v4.json b/config/mocks/wallet-options-v4.json
@@ -81,6 +81,14 @@
           "exchange": true
         }
       },
+      "bsv": {
+        "availability": {
+          "send": true,
+          "request": false,
+          "lockbox": false,
+          "exchange": true
+        }
+      },
       "eth": {
         "availability": {
           "send": true,

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/model.js b/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/model.js
@@ -55,7 +55,7 @@ export const CREATE_ACCOUNT_ERROR = 'Not enough funds to create new account'
 export const NO_ACCOUNT_ERROR = 'Account does not exist'
 export const RESERVE_ERROR = 'Reserve exceeds remaining funds'
 
-const currenciesOrder = ['BTC', 'ETH', 'BCH', 'XLM']
+const currenciesOrder = ['BTC', 'ETH', 'BCH', 'XLM', 'BSV']
 export const sortByOrder = sortBy(flip(indexOf)(currenciesOrder))
 
 const getPairedCoins = curry(

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/sagas.utils.js b/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/sagas.utils.js
@@ -36,6 +36,7 @@ export default ({ coreSagas, networks }) => {
 
   const btcOptions = [settings.NETWORK_BTC, PROVISIONAL_BTC_SCRIPT]
   const bchOptions = [settings.NETWORK_BCH, PROVISIONAL_BCH_SCRIPT]
+  const bsvOptions = [settings.NETWORK_BCH, PROVISIONAL_BCH_SCRIPT]
   const ethOptions = [settings.NETWORK_ETH, null]
   const xlmOptions = [null, null]
   const calculateProvisionalPayment = function*(source, amount) {
@@ -46,6 +47,7 @@ export default ({ coreSagas, networks }) => {
       const [network, provisionalScript] = prop(coin, {
         BTC: btcOptions,
         BCH: bchOptions,
+        BSV: bsvOptions,
         ETH: ethOptions,
         XLM: xlmOptions
       })
@@ -99,6 +101,15 @@ export default ({ coreSagas, networks }) => {
           .from(addressOrIndex, addressType)
           .done()
         break
+      case 'BSV':
+        payment = yield coreSagas.payment.bsv
+          .create({ network: settings.NETWORK_BCH })
+          .chain()
+          .init()
+          .fee('priority')
+          .from(addressOrIndex, addressType)
+          .done()
+        break
       case 'BTC':
         payment = yield coreSagas.payment.btc
           .create({ network: networks.btc })
@@ -156,6 +167,14 @@ export default ({ coreSagas, networks }) => {
           .fee('priority')
           .amount(parseInt(amount))
         break
+      case 'BSV':
+        payment = coreSagas.payment.bsv
+          .create({ network: settings.NETWORK_BCH })
+          .chain()
+          .init()
+          .fee('priority')
+          .amount(parseInt(amount))
+        break
       case 'BTC':
         payment = coreSagas.payment.btc
           .create({ network: networks.btc })
@@ -208,6 +227,11 @@ export default ({ coreSagas, networks }) => {
     return head(bchAccounts.getOrFail('Could not get BCH HD accounts.'))
   }
 
+  const getDefaultBsvAccountValue = function*() {
+    const bsvAccounts = yield select(S.getActiveBsvAccounts)
+    return head(bsvAccounts.getOrFail('Could not get BSV HD accounts.'))
+  }
+
   const getDefaultBtcAccountValue = function*() {
     const btcAccounts = yield select(S.getActiveBtcAccounts)
     return head(btcAccounts.getOrFail('Could not get BTC HD accounts.'))
@@ -227,6 +251,8 @@ export default ({ coreSagas, networks }) => {
     switch (coin) {
       case 'BCH':
         return yield call(getDefaultBchAccountValue)
+      case 'BSV':
+        return yield call(getDefaultBsvAccountValue)
       case 'BTC':
         return yield call(getDefaultBtcAccountValue)
       case 'ETH':

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/selectors.js b/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/selectors.js
@@ -94,6 +94,35 @@ export const getActiveBchAccounts = createDeepEqualSelector(
   }
 )
 
+export const getActiveBsvAccounts = createDeepEqualSelector(
+  [
+    coreSelectors.wallet.getHDAccounts,
+    coreSelectors.data.bsv.getAddresses,
+    coreSelectors.kvStore.bsv.getAccounts
+  ],
+  (bsvAccounts, bsvDataR, bsvMetadataR) => {
+    const transform = (bsvData, bsvMetadata) =>
+      bsvAccounts
+        .map(acc => {
+          const index = prop('index', acc)
+          const xpub = prop('xpub', acc)
+          const data = prop(xpub, bsvData)
+          const metadata = bsvMetadata[index]
+
+          return {
+            archived: prop('archived', metadata),
+            coin: 'BSV',
+            label: prop('label', metadata) || xpub,
+            address: index,
+            balance: prop('final_balance', data),
+            type: ADDRESS_TYPES.ACCOUNT
+          }
+        })
+        .filter(isActive)
+    return lift(transform)(bsvDataR, bsvMetadataR)
+  }
+)
+
 export const getActiveBtcAccounts = createDeepEqualSelector(
   [
     coreSelectors.wallet.getHDAccounts,
@@ -184,6 +213,7 @@ export const getActiveXlmAccounts = createDeepEqualSelector(
 export const getActiveAccounts = state => ({
   BTC: getActiveBtcAccounts(state).getOrElse([]),
   BCH: getActiveBchAccounts(state).getOrElse([]),
+  BSV: getActiveBsvAccounts(state).getOrElse([]),
   ETH: getActiveEthAccounts(state).getOrElse([]),
   XLM: getActiveXlmAccounts(state).getOrElse([])
 })

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/services.js b/packages/blockchain-wallet-v4-frontend/src/data/components/exchange/services.js
@@ -22,6 +22,9 @@ export const convertBaseToStandard = (coin, value) => {
     case 'BCH':
       return Exchange.convertBchToBch({ value, fromUnit: 'SAT', toUnit: 'BCH' })
         .value
+    case 'BSV':
+      return Exchange.convertBsvToBsv({ value, fromUnit: 'SAT', toUnit: 'BCH' })
+        .value
     case 'BTC':
       return Exchange.convertBitcoinToBitcoin({
         value,
@@ -50,6 +53,9 @@ export const convertStandardToBase = (coin, value) => {
     case 'BCH':
       return Exchange.convertBchToBch({ value, fromUnit: 'BCH', toUnit: 'SAT' })
         .value
+    case 'BSV':
+      return Exchange.convertBsvToBsv({ value, fromUnit: 'BCH', toUnit: 'SAT' })
+        .value
     case 'BTC':
       return Exchange.convertBitcoinToBitcoin({
         value,
@@ -116,6 +122,8 @@ export const selectFee = (coin, payment) => {
   switch (coin) {
     case 'BCH':
       return path(['selection', 'fee'], payment)
+    case 'BSV':
+      return path(['selection', 'fee'], payment)
     case 'BTC':
       return path(['selection', 'fee'], payment)
     case 'ETH':

diff --git a/...lockchain-wallet-v4-frontend/src/scenes/Exchange/ExchangeForm/CurrencySelect/selectors.js b/...lockchain-wallet-v4-frontend/src/scenes/Exchange/ExchangeForm/CurrencySelect/selectors.js
@@ -21,6 +21,7 @@ const { formatPair } = model.rates
 const getCoinFullName = flip(prop)({
   BTC: 'Bitcoin',
   BCH: 'Bitcoin Cash',
+  BSV: 'Bitcoin SV',
   ETH: 'Ether',
   XLM: 'Stellar'
 })