Merge pull request #205 from EdgeApp/paul/v3RatesAndFixes

Paul/v3 rates and fixes

Author: paullinator

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+- changed: Add index for orderId
+- changed: Add EVM chainId, pluginId, and tokenId fields to StandardTx
+- changed: Update Lifi to provide chainId, pluginId, and tokenId
+- changed: Use rates V3 for transactions with pluginId/tokenId
+- fixed: Moonpay by adding Revolut payment type
+- fixed: Use v2 rates API
+
+## 0.2.0
+
 - added: Add Lifi reporting
 - added: Added `/v1/getTxInfo` route.
 - added: Paybis support

package.json

@@ -20,10 +20,10 @@
     "prepare": "./scripts/prepare.sh && npm-run-all clean configure -p build.* && npm run setup",
     "setup": "node -r sucrase/register src/initDbs.ts",
     "start": "node -r sucrase/register src/indexQuery.ts",
-    "start:cache": "node -r sucrase/register src/indexCache.ts",
-    "start:rates": "node -r sucrase/register src/indexRates.ts",
-    "start:api": "node -r sucrase/register src/indexApi.ts",
-    "start:destroyPartition": "node -r sucrase/register src/bin/destroyPartition.ts",
+    "start.cache": "node -r sucrase/register src/indexCache.ts",
+    "start.rates": "node -r sucrase/register src/indexRates.ts",
+    "start.api": "node -r sucrase/register src/indexApi.ts",
+    "start.destroyPartition": "node -r sucrase/register src/bin/destroyPartition.ts",
     "stats": "node -r sucrase/register src/bin/partitionStats.ts",
     "test": "mocha -r sucrase/register 'test/**/*.test.ts'",
     "demo": "parcel serve src/demo/index.html",

src/bin/destroyPartition.ts

@@ -56,7 +56,9 @@ async function main(partitionName: string): Promise<void> {
     datelog(`Successfully Deleted: progress cache ${progress._id}`)
   } catch (e) {
     datelog(e)
+    process.exit(1)
   }
+  process.exit(0)
 }
 
 main(process.argv[2]).catch(e => datelog(e))

src/config.ts

@@ -18,7 +18,9 @@ export const asConfig = asObject({
   timeoutOverrideMins: asOptional(asNumber, 1200),
   cacheLookbackMonths: asOptional(asNumber, 24),
   couchMainCluster: asOptional(asString, 'wusa'),
-  couchUris: asOptional(asCouchCredentials)
+  couchUris: asOptional(asCouchCredentials, {
+    wusa: 'http://username:password@localhost:5984'
+  })
 })
 
 export const config = makeConfig(asConfig, 'config.json')

src/demo/demo.tsx

@@ -60,7 +60,7 @@ class App extends Component<
 
   async componentDidMount(): Promise<void> {
     Object.assign(document.body.style, body)
-    if (this.state.apiKey !== '') {
+    if (this.state.apiKey != null && this.state.apiKey.length > 2) {
       await this.getAppId()
     }
   }

src/initDbs.ts

@@ -39,6 +39,7 @@ function fieldsToDesignDocs(
 
 const transactionIndexes: DesignDocumentMap = {
   ...fieldsToDesignDocs(['isoDate']),
+  ...fieldsToDesignDocs(['orderId']),
   ...fieldsToDesignDocs(['status']),
   ...fieldsToDesignDocs(['status', 'depositCurrency', 'isoDate']),
   ...fieldsToDesignDocs([
@@ -125,20 +126,14 @@ const options: SetupDatabaseOptions = {
 }
 
 export async function initDbs(): Promise<void> {
-  if (config.couchUris != null) {
-    const pool = connectCouch(config.couchMainCluster, config.couchUris)
-    await setupDatabase(pool, couchSettingsSetup, options)
-    await Promise.all(
-      databases.map(async setup => await setupDatabase(pool, setup, options))
-    )
-  } else {
-    await Promise.all(
-      databases.map(
-        async setup =>
-          await setupDatabase(config.couchDbFullpath, setup, options)
-      )
-    )
+  if (config.couchUris == null) {
+    throw new Error('couchUris is not set')
   }
+  const pool = connectCouch(config.couchMainCluster, config.couchUris)
+  await setupDatabase(pool, couchSettingsSetup, options)
+  await Promise.all(
+    databases.map(async setup => await setupDatabase(pool, setup, options))
+  )
   console.log('Done')
   process.exit(0)
 }

src/partners/banxa.ts

@@ -276,13 +276,19 @@ export function processBanxaTx(rawTx: unknown): StandardTx {
     depositTxid: undefined,
     depositAddress: undefined,
     depositCurrency: inputCurrency,
+    depositChainPluginId: undefined,
+    depositEvmChainId: undefined,
+    depositTokenId: undefined,
     depositAmount: inputAmount,
     direction,
     exchangeType: 'fiat',
     paymentType,
     payoutTxid: undefined,
     payoutAddress,
     payoutCurrency: outputCurrency,
+    payoutChainPluginId: undefined,
+    payoutEvmChainId: undefined,
+    payoutTokenId: undefined,
     payoutAmount: outputAmount,
     timestamp,
     isoDate,
@@ -332,6 +338,8 @@ function getFiatPaymentType(tx: BanxaTx): FiatPaymentType {
       return 'googlepay'
     case 'iDEAL Transfer':
       return 'ideal'
+    case 'ZeroHash ACH Sell':
+      return 'ach'
     default:
       throw new Error(`Unknown payment method: ${tx.payment_type} for ${tx.id}`)
   }

src/partners/bitaccess.ts

@@ -145,13 +145,19 @@ export function processBitaccessTx(rawTx: unknown): StandardTx {
     depositTxid,
     depositAddress: tx.deposit_address,
     depositCurrency: tx.deposit_currency.toUpperCase(),
+    depositChainPluginId: undefined,
+    depositEvmChainId: undefined,
+    depositTokenId: undefined,
     depositAmount: tx.deposit_amount,
     direction: tx.trade_type,
     exchangeType: 'fiat',
     paymentType: 'cash',
     payoutTxid,
     payoutAddress: tx.withdrawal_address,
     payoutCurrency: tx.withdrawal_currency.toUpperCase(),
+    payoutChainPluginId: undefined,
+    payoutEvmChainId: undefined,
+    payoutTokenId: undefined,
     payoutAmount: tx.withdrawal_amount,
     timestamp,
     isoDate: tx.updated_at,

src/partners/bitrefill.ts

@@ -151,13 +151,19 @@ export function processBitrefillTx(rawTx: unknown): StandardTx {
     depositTxid: undefined,
     depositAddress: undefined,
     depositCurrency: inputCurrency,
+    depositChainPluginId: undefined,
+    depositEvmChainId: undefined,
+    depositTokenId: undefined,
     depositAmount,
     direction: 'sell',
     exchangeType: 'fiat',
     paymentType: 'giftcard',
     payoutTxid: undefined,
     payoutAddress: undefined,
     payoutCurrency: tx.currency,
+    payoutChainPluginId: undefined,
+    payoutEvmChainId: undefined,
+    payoutTokenId: undefined,
     payoutAmount: parseInt(tx.value),
     timestamp,
     isoDate: new Date(tx.invoiceTime).toISOString(),

src/partners/bitsofgold.ts

@@ -127,13 +127,19 @@ export function processBitsOfGoldTx(rawTx: unknown): StandardTx {
     depositTxid: undefined,
     depositAddress: undefined,
     depositCurrency,
+    depositChainPluginId: undefined,
+    depositEvmChainId: undefined,
+    depositTokenId: undefined,
     depositAmount,
     direction,
     exchangeType: 'fiat',
     paymentType: data.fiat_type === 'ILS' ? 'israelibank' : 'sepa',
     payoutTxid: undefined,
     payoutAddress: undefined,
     payoutCurrency,
+    payoutChainPluginId: undefined,
+    payoutEvmChainId: undefined,
+    payoutTokenId: undefined,
     payoutAmount,
     timestamp: timestamp / 1000,
     isoDate: date.toISOString(),