diff --git a/src/partners/banxa.ts b/src/partners/banxa.ts index 29012417..ca29cdcf 100644 --- a/src/partners/banxa.ts +++ b/src/partners/banxa.ts @@ -306,6 +306,7 @@ function getFiatPaymentType(tx: BanxaTx): FiatPaymentType { case 'Sofort Transfer': return 'sofort' case 'Checkout Credit Card': + case 'Primer Credit Card': case 'WorldPay Credit Card': return 'credit' case 'ClearJunction Fast Pay': @@ -325,6 +326,7 @@ function getFiatPaymentType(tx: BanxaTx): FiatPaymentType { case 'PayID via Monoova': return 'payid' case 'WorldPay ApplePay': + case 'Primer Apple Pay': return 'applepay' case 'WorldPay GooglePay': return 'googlepay' diff --git a/src/partners/bitaccess.ts b/src/partners/bitaccess.ts index 65a61593..afd62bdd 100644 --- a/src/partners/bitaccess.ts +++ b/src/partners/bitaccess.ts @@ -12,6 +12,7 @@ import fetch from 'node-fetch' import { PartnerPlugin, PluginParams, PluginResult, StandardTx } from '../types' import { datelog } from '../util' +import { queryDummy } from './dummy' const asBitaccessTx = asObject({ trade_type: asValue<['buy', 'sell']>('buy', 'sell'), @@ -117,7 +118,7 @@ export async function queryBitaccess( export const bitaccess: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: queryBitaccess, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'Bitaccess', pluginId: 'bitaccess' diff --git a/src/partners/coinswitch.ts b/src/partners/coinswitch.ts index 524d7d25..ea054a38 100644 --- a/src/partners/coinswitch.ts +++ b/src/partners/coinswitch.ts @@ -11,6 +11,7 @@ import fetch from 'node-fetch' import { PartnerPlugin, PluginParams, PluginResult, StandardTx } from '../types' import { datelog } from '../util' +import { queryDummy } from './dummy' const asCoinSwitchTx = asObject({ status: asString, @@ -97,7 +98,7 @@ export async function queryCoinSwitch( export const coinswitch: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: queryCoinSwitch, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'CoinSwitch', pluginId: 'coinswitch' diff --git a/src/partners/dummy.ts b/src/partners/dummy.ts new file mode 100644 index 00000000..ac9de04b --- /dev/null +++ b/src/partners/dummy.ts @@ -0,0 +1,10 @@ +import { PluginParams, PluginResult } from '../types' + +export async function queryDummy( + pluginParams: PluginParams +): Promise { + return { + settings: { lastTimestamp: 0 }, + transactions: [] + } +} diff --git a/src/partners/faast.ts b/src/partners/faast.ts index d3badcc6..e5f3666e 100644 --- a/src/partners/faast.ts +++ b/src/partners/faast.ts @@ -4,6 +4,7 @@ import fetch from 'node-fetch' import { PartnerPlugin, PluginParams, PluginResult, StandardTx } from '../types' import { datelog } from '../util' +import { queryDummy } from './dummy' const asFaastTx = asObject({ swap_id: asString, @@ -99,7 +100,7 @@ export async function queryFaast( export const faast: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: queryFaast, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'Faast', pluginId: 'faast' diff --git a/src/partners/foxExchange.ts b/src/partners/foxExchange.ts index 98bb453a..419594ab 100644 --- a/src/partners/foxExchange.ts +++ b/src/partners/foxExchange.ts @@ -3,6 +3,7 @@ import fetch from 'node-fetch' import { PartnerPlugin, PluginParams, PluginResult, StandardTx } from '../types' import { datelog } from '../util' +import { queryDummy } from './dummy' const asFoxExchangeTx = asObject({ orderId: asString, @@ -111,7 +112,7 @@ export async function queryFoxExchange( export const foxExchange: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: queryFoxExchange, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'FoxExchange', pluginId: 'foxExchange' diff --git a/src/partners/gebo.ts b/src/partners/gebo.ts index caf70309..471bdaa1 100644 --- a/src/partners/gebo.ts +++ b/src/partners/gebo.ts @@ -1,5 +1,6 @@ import { PartnerPlugin, PluginParams, PluginResult, StandardTx } from '../types' import { datelog } from '../util' +import { queryDummy } from './dummy' export async function queryGebo( pluginParams: PluginParams @@ -14,7 +15,7 @@ export async function queryGebo( export const gebo: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: queryGebo, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'Gebo', pluginId: 'gebo' diff --git a/src/partners/ioniagiftcard.ts b/src/partners/ioniagiftcard.ts index 5304cab5..64d578f6 100644 --- a/src/partners/ioniagiftcard.ts +++ b/src/partners/ioniagiftcard.ts @@ -17,6 +17,7 @@ import { Status } from '../types' import { datelog, retryFetch, smartIsoDateFromTimestamp, snooze } from '../util' +import { queryDummy } from './dummy' const asIoniaStatus = asMaybe(asValue('complete'), 'other') @@ -129,7 +130,7 @@ export const queryIoniaGiftCards = async ( export const ioniaGiftCards: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: queryIoniaGiftCards, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'Ionia Gift Cards', pluginId: 'ioniagiftcards' diff --git a/src/partners/ioniavisarewards.ts b/src/partners/ioniavisarewards.ts index ef222165..1eec421f 100644 --- a/src/partners/ioniavisarewards.ts +++ b/src/partners/ioniavisarewards.ts @@ -17,6 +17,7 @@ import { Status } from '../types' import { datelog, retryFetch, smartIsoDateFromTimestamp, snooze } from '../util' +import { queryDummy } from './dummy' const asIoniaStatus = asMaybe(asValue('complete'), 'other') @@ -129,7 +130,7 @@ export const queryIoniaVisaRewards = async ( export const ioniaVisaRewards: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: queryIoniaVisaRewards, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'Ionia Visa Rewards', pluginId: 'ioniavisarewards' diff --git a/src/partners/kado.ts b/src/partners/kado.ts index ffe30ae4..60a5250a 100644 --- a/src/partners/kado.ts +++ b/src/partners/kado.ts @@ -3,7 +3,6 @@ import { asBoolean, asDate, asEither, - asNull, asNumber, asObject, asString, @@ -20,6 +19,7 @@ import { StandardTx } from '../types' import { datelog, retryFetch, smartIsoDateFromTimestamp, snooze } from '../util' +import { queryDummy } from './dummy' // Define cleaner for individual transactions in onRamps and offRamps const asTxType = asValue('buy', 'sell') @@ -120,7 +120,7 @@ export async function queryKado( } export const kado: PartnerPlugin = { - queryFunc: queryKado, + queryFunc: queryDummy, pluginName: 'Kado', pluginId: 'kado' } diff --git a/src/partners/moonpay.ts b/src/partners/moonpay.ts index 854ea085..067743f2 100644 --- a/src/partners/moonpay.ts +++ b/src/partners/moonpay.ts @@ -32,7 +32,7 @@ const asMoonpayTx = asObject({ baseCurrency: asMoonpayCurrency, baseCurrencyAmount: asNumber, baseCurrencyId: asString, - cardType: asOptional(asValue('apple_pay', 'google_pay')), + cardType: asOptional(asValue('apple_pay', 'google_pay', 'card')), country: asString, createdAt: asDate, cryptoTransactionId: asString, diff --git a/src/partners/paybis.ts b/src/partners/paybis.ts index 96dcac7c..257ee16f 100644 --- a/src/partners/paybis.ts +++ b/src/partners/paybis.ts @@ -43,8 +43,8 @@ const asUserCountry = asObject({ code: asString }) const asUser = asObject({ - id: asString, - email: asString, + // id: asString, + // email: asString, country: asEither(asUserCountry, asNull) }) // const asExchangeRate = asObject({ @@ -273,8 +273,7 @@ export function processPaybisTx(rawTx: unknown): StandardTx { const payoutAmount = Number(receivedOriginal.amount) const depositTxid = gateway === 'crypto_to_fiat' ? hash : undefined const payoutTxid = gateway === 'fiat_to_crypto' ? hash : undefined - - const direction = (gateway === 'fiat_to_crypto') == null ? 'buy' : 'sell' + const direction = gateway === 'fiat_to_crypto' ? 'buy' : 'sell' const standardTx: StandardTx = { status: statusMap[tx.status], @@ -307,6 +306,8 @@ function getFiatPaymentType( switch (name) { case undefined: return null + case 'Apple Pay': + return 'applepay' case 'AstroPay': return 'astropay' case 'Credit/Debit Card': @@ -314,6 +315,8 @@ function getFiatPaymentType( case 'FPX': // Idk? return 'fpx' + case 'Google Pay': + return 'googlepay' case 'Giropay': return 'giropay' case 'Neteller': diff --git a/src/partners/safello.ts b/src/partners/safello.ts index 02924bbd..07f3a399 100644 --- a/src/partners/safello.ts +++ b/src/partners/safello.ts @@ -2,6 +2,7 @@ import { asArray, asNumber, asObject, asString, asUnknown } from 'cleaners' import fetch from 'node-fetch' import { PartnerPlugin, PluginParams, PluginResult, StandardTx } from '../types' +import { queryDummy } from './dummy' const asSafelloTx = asObject({ completedDate: asString, @@ -74,7 +75,7 @@ export async function querySafello( export const safello: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: querySafello, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'Safello', pluginId: 'safello' diff --git a/src/partners/switchain.ts b/src/partners/switchain.ts index 7118aaab..83844b90 100644 --- a/src/partners/switchain.ts +++ b/src/partners/switchain.ts @@ -3,6 +3,7 @@ import fetch from 'node-fetch' import { PartnerPlugin, PluginParams, PluginResult, StandardTx } from '../types' import { datelog, safeParseFloat } from '../util' +import { queryDummy } from './dummy' const asSwitchainTx = asObject({ id: asString, @@ -102,7 +103,7 @@ export async function querySwitchain( export const switchain: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: querySwitchain, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'Switchain', pluginId: 'switchain' diff --git a/src/partners/thorchain.ts b/src/partners/thorchain.ts index cb189dd9..6738de33 100644 --- a/src/partners/thorchain.ts +++ b/src/partners/thorchain.ts @@ -210,7 +210,7 @@ export const thorchain = makeThorchainPlugin({ export const maya = makeThorchainPlugin({ pluginName: 'Maya', pluginId: 'maya', - midgardUrl: 'midgard-maya.liquify.com' + midgardUrl: 'midgard.mayachain.info' }) export function processThorchainTx( diff --git a/src/partners/totle.ts b/src/partners/totle.ts index fc2815b6..746c056c 100644 --- a/src/partners/totle.ts +++ b/src/partners/totle.ts @@ -5,6 +5,7 @@ import Web3 from 'web3' import { PartnerPlugin, PluginParams, PluginResult, StandardTx } from '../types' import { datelog, safeParseFloat } from '../util' +import { queryDummy } from './dummy' const asCurrentBlockResult = asNumber @@ -439,7 +440,7 @@ export async function queryTotle( export const totle: PartnerPlugin = { // queryFunc will take PluginSettings as arg and return PluginResult - queryFunc: queryTotle, + queryFunc: queryDummy, // results in a PluginResult pluginName: 'Totle', pluginId: 'totle'