Tay innovation

.eslintrc.json

@@ -3,7 +3,7 @@
   "parser": "babel-eslint",
   "plugins": ["flowtype", "standard"],
   "rules": {
-    "camelcase": "error",
+    "camelcase": "off",
     "flowtype/generic-spacing": "off",
     "no-throw-literal": "error",
     "no-var": "error",

.flowconfig

@@ -18,6 +18,8 @@
 
 <PROJECT_ROOT>/lib/.*.js.flow
 
+.*/node_modules/oboe/test/json/incomplete.json
+
 [include]
 
 [libs]

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,14 @@
+### CHANGELOG
+
+Does this branch warrant an entry to the CHANGELOG?
+
+- [ ] Yes
+- [ ] No
+
+### Dependencies
+
+<!-- Replace line with PRs which this PR depends if any --> none
+
+### Description
+
+<!-- Describe your changes textually and/or pictorially if necessary --> none

.github/workflows/asana-attachment.yml

@@ -0,0 +1 @@
+# removed

.github/workflows/asana-comment.yml

@@ -0,0 +1 @@
+# removed

.github/workflows/pr-checks.yml

@@ -0,0 +1,9 @@
+name: PR Checks
+on: [pull_request]
+jobs:
+  block-wip-pr:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/[email protected]
+    - name: Block WIP PR
+      uses: samholmes/[email protected]

.github/workflows/pr-rebase.yml

@@ -0,0 +1,28 @@
+name: PR Rebase
+on:
+  issue_comment:
+    types: [created]
+jobs:
+  rebase:
+    name: Rebase
+    if: >-
+      github.event.issue.pull_request != '' && 
+      (
+        contains(github.event.comment.body, '/autosquash') || 
+        contains(github.event.comment.body, '/fixup') ||
+        contains(github.event.comment.body, '/rebase')
+      )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+      - name: Automatic Rebase
+        uses: EdgeApp/rebase@changelog-resolver
+        with:
+          autosquash: ${{ true }}
+          changelogResolver: ${{ true }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.yarnrc

@@ -0,0 +1 @@
+--ignore-scripts true

config.json.sample

@@ -7,6 +7,7 @@
   "coinMarketCapAPiKey": "xxx",
   "shapeShiftApiKey": "xxx",
   "shapeShiftToken": "xxx",
+  "banxaToken": "xxx",
   "libertyXApiKey": "xxx",
   "changellyApiKey": "xxx",
   "changenowApiKey": "xxx",
@@ -32,6 +33,16 @@
   "wyre": {
     "periscopeClientKey": "xxx"
   },
+  "bity": {
+    "clientId": "",
+    "clientSecret": ""
+  },
+  "paytrieCredentials": {
+    "apiKey": "xxx",
+    "secretToken": "xxx"
+  },
+  "switchainApiKey" : "",
+  "transak_api_secret": "xxx",
   "coinMarketCapExcludeLookup": ["USD", "EUR", "GBP"],
   "coinApiExcludeLookup": ["USD", "EUR", "GBP"]
 }

package.json

@@ -20,12 +20,14 @@
   "dependencies": {
     "api-changelly": "git://github.com/changelly/api-changelly.git#8e350f3",
     "await-sleep": "0.0.1",
+    "axios": "^0.19.2",
     "biggystring": "^3.0.1",
     "changelly_api": "git://github.com/changelly/api-changelly.git#8e350f3",
     "csvtojson": "^2.0.10",
     "json-format": "^1.0.1",
     "jsonfile": "^4.0.0",
     "node-fetch": "^1.7.3",
+    "sleep": "^6.3.0",
     "sprintf-js": "^1.1.1",
     "web3": "^1.0.0-beta.52"
   },

src/banxa.js

@@ -1,12 +1,29 @@
 // @flow
 import type { StandardTx, SwapFuncParams } from './checkSwapService.js'
 const js = require('jsonfile')
-const fs = require('fs')
+const fetch = require('node-fetch')
 const { checkSwapService } = require('./checkSwapService.js')
-const csv = require('csvtojson')
+const crypto = require('crypto')
+const sleep = require('sleep')
+const confFileName = './config.json'
+const config = js.readFileSync(confFileName)
 
 const BANXA_CACHE = './cache/banRaw.json'
-const BANXA_FOLDER = './cache/banxa'
+
+const MONTH_MAP = {
+  'Jan': '01',
+  'Feb': '02',
+  'Mar': '03',
+  'Apr': '04',
+  'May': '05',
+  'Jun': '06',
+  'Jul': '07',
+  'Aug': '08',
+  'Sep': '09',
+  'Oct': '10',
+  'Nov': '11',
+  'Dec': '12'
+}
 
 async function doBanxa (swapFuncParams: SwapFuncParams) {
   return checkSwapService(fetchBanxa,
@@ -16,50 +33,144 @@ async function doBanxa (swapFuncParams: SwapFuncParams) {
   )
 }
 
+async function callBanxaAPI (queryDate, pageLimit, page) {
+  const nonce = Math.floor(new Date() / 1000)
+
+  const apiQuery = `/api/orders?start_date=${queryDate}&end_date=${queryDate}&per_page=${pageLimit}&page=${page}`
+
+  const text = `GET\n${apiQuery}\n${nonce}`
+  const secret = config.banxaToken
+  const key = 'EDGE'
+  const hmac = crypto.createHmac('sha256', secret)
+    .update(text)
+    .digest('hex')
+  const authHeader = key + ':' + hmac + ':' + nonce
+
+  const headers = {
+    'Authorization': 'Bearer ' + authHeader,
+    'Content-Type': 'application/json'
+  }
+
+  return fetch(`https://edge.banxa.com${apiQuery}`, {headers: headers})
+}
+
+function processOrders (orders, ssFormatTxs) {
+  for (const order of orders) {
+    if (order.status === 'complete') {
+      // Reformat the date from DD-MMM-YYYY HH:MM:SS to YYYY-MM-DDTHH:MM:SS
+      const origDateTime = order.created_at
+      const dateTimeParts = origDateTime.split(' ')
+      const dateParts = dateTimeParts[0].split('-')
+      const month = MONTH_MAP[dateParts[1]]
+      const reformattedDate = `${dateParts[2]}-${month}-${dateParts[0]}T${dateTimeParts[1]}Z`
+
+      // Flip the amounts if the order is a SELL
+      let inputAmount = order.fiat_amount
+      let inputCurrency = order.fiat_code
+      let outputAmount = order.coin_amount
+      let outputCurrency = order.coin_code
+      if (order.order_type === 'CRYPTO-SELL') {
+        inputAmount = order.coin_amount
+        inputCurrency = order.coin_code
+        outputAmount = order.fiat_amount
+        outputCurrency = order.fiat_code
+      }
+
+      const ssTx: StandardTx = {
+        status: 'complete',
+        inputTXID: order.ref.toString(),
+        inputAddress: '',
+        inputCurrency: inputCurrency,
+        inputAmount: inputAmount,
+        outputAddress: order.wallet_address,
+        outputCurrency: outputCurrency,
+        outputAmount: outputAmount,
+        timestamp: new Date(reformattedDate).getTime() / 1000
+      }
+      ssFormatTxs.push(ssTx)
+    }
+  }
+}
+
 async function fetchBanxa (swapFuncParams: SwapFuncParams) {
   if (!swapFuncParams.useCache) {
-    console.log('Fetching Banxa from CSV...')
+    console.log('Fetching Banxa from API...')
   }
-  let diskCache = { txs: [] }
+  let diskCache = { last_date: '2019-08-26', txs: [] }
 
   try {
     diskCache = js.readFileSync(BANXA_CACHE)
   } catch (e) {}
-
-  const transactionMap = {}
   const ssFormatTxs: Array<StandardTx> = []
 
-  const files = await fs.readdirSync(BANXA_FOLDER)
+  const cachedLastDate = new Date(diskCache.last_date)
 
-  for (const fileName of files) {
-    const filePath = `./cache/banxa/${fileName}`
-    const csvData = await csv().fromFile(filePath)
-    for (const order of csvData) {
-      const date = new Date(order['UTC Time'])
-      const timestamp = date.getTime() / 1000
-      const uniqueIdentifier = order['Order Id']
-      const ssTx: StandardTx = {
-        status: 'complete',
-        inputTXID: uniqueIdentifier,
-        inputAddress: '',
-        inputCurrency: order['Source Currency'],
-        inputAmount: parseFloat(order['Source Amount']),
-        outputAddress: '',
-        outputCurrency: order['Target Currency'],
-        outputAmount: order['Target Amount'],
-        timestamp: timestamp
+  // Go back a week just to make sure you capture any late completing orders
+  const startQueryDate = new Date(cachedLastDate.getTime() - 7 * 86400000)
+
+  const now = new Date()
+  const today = new Date(now.toISOString().split('T')[0]).getTime()
+
+  let queryDate = startQueryDate.toISOString().split('T')[0]
+
+  if (!swapFuncParams.useCache) {
+    console.log(`BANXA: Loading orders starting from ${queryDate}`)
+    // Loop through the days
+    while (startQueryDate.getTime() !== today) {
+      let page = 1
+      const pageLimit = 100
+      queryDate = startQueryDate.toISOString().split('T')[0]
+      // Move last date on 1 day
+      startQueryDate.setTime(startQueryDate.getTime() + 86400000)
+      let attempt = 0
+
+      // Loop through the pages for this day
+      while (1) {
+        let orders = []
+
+        let apiResponse
+        while (attempt < 3) {
+          console.log(
+            `BANXA: Calling API with date ${queryDate}, result size ${pageLimit} and offset ${page} for attempt ${attempt}`
+          )
+          apiResponse = await callBanxaAPI(queryDate, pageLimit, page)
+          const status = await apiResponse.status
+          // Handle the situation where the API is rate limiting the requests
+          if (status !== 200) {
+            console.log(
+              `BANXA: Response code ${status}. Retrying after 2 second sleep...`
+            )
+            sleep.sleep(2)
+            attempt++
+          } else {
+            break
+          }
+        }
+        if (attempt === 3) break
+
+        if (apiResponse) {
+          const ordersData = await apiResponse.json()
+
+          if (ordersData && ordersData.data && ordersData.data.orders.length) {
+            orders = ordersData.data.orders
+          } else break
+
+          processOrders(orders, ssFormatTxs)
+
+          if (orders.length < pageLimit) break
+          page++
+        }
+      }
+      if (attempt === 3) {
+        console.log(`BANXA: Unable to process date ${queryDate}`)
+        break
       }
-      // console.log('ssTx: ', ssTx)
-      transactionMap[uniqueIdentifier] = ssTx
     }
   }
-  for (const id in transactionMap) {
-    ssFormatTxs.push(transactionMap[id])
-    ssFormatTxs.sort((a, b) => a.timestamp - b.timestamp)
-  }
 
-  // console.log('ssFormatTxs is: ', ssFormatTxs)
+  diskCache.last_date = queryDate > cachedLastDate ? queryDate : cachedLastDate
 
+  console.log(`lastDate ${queryDate}`)
   const out = {
     diskCache,
     newTransactions: ssFormatTxs