diff options
author | zkao <zichongkao@gmail.com> | 2018-12-15 04:15:35 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-15 04:15:35 +0800 |
commit | 6d45beccad44e86ddd692d0cf54c09c29c5d9daf (patch) | |
tree | 66ef5002e7d407f891d991fcb6cbd10ddb9ee5c9 /packages/pipeline/src | |
parent | 1efde6f59b976a074ba2ea15be867400b21dd68b (diff) | |
download | dexon-sol-tools-6d45beccad44e86ddd692d0cf54c09c29c5d9daf.tar dexon-sol-tools-6d45beccad44e86ddd692d0cf54c09c29c5d9daf.tar.gz dexon-sol-tools-6d45beccad44e86ddd692d0cf54c09c29c5d9daf.tar.bz2 dexon-sol-tools-6d45beccad44e86ddd692d0cf54c09c29c5d9daf.tar.lz dexon-sol-tools-6d45beccad44e86ddd692d0cf54c09c29c5d9daf.tar.xz dexon-sol-tools-6d45beccad44e86ddd692d0cf54c09c29c5d9daf.tar.zst dexon-sol-tools-6d45beccad44e86ddd692d0cf54c09c29c5d9daf.zip |
Fix dex order quote/base asset assigning (#1432)
Diffstat (limited to 'packages/pipeline/src')
-rw-r--r-- | packages/pipeline/src/parsers/ddex_orders/index.ts | 14 | ||||
-rw-r--r-- | packages/pipeline/src/parsers/oasis_orders/index.ts | 4 | ||||
-rw-r--r-- | packages/pipeline/src/parsers/paradex_orders/index.ts | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/packages/pipeline/src/parsers/ddex_orders/index.ts b/packages/pipeline/src/parsers/ddex_orders/index.ts index 52a998f9f..d7b97efbe 100644 --- a/packages/pipeline/src/parsers/ddex_orders/index.ts +++ b/packages/pipeline/src/parsers/ddex_orders/index.ts @@ -54,12 +54,14 @@ export function parseDdexOrder( tokenOrder.orderType = orderType; tokenOrder.price = price; - tokenOrder.baseAssetSymbol = ddexMarket.baseToken; - tokenOrder.baseAssetAddress = ddexMarket.baseTokenAddress; - tokenOrder.baseVolume = price.times(amount); + // ddex currently confuses quote and base assets. + // We switch them here to maintain our internal consistency. + tokenOrder.baseAssetSymbol = ddexMarket.quoteToken; + tokenOrder.baseAssetAddress = ddexMarket.quoteTokenAddress; + tokenOrder.baseVolume = amount; - tokenOrder.quoteAssetSymbol = ddexMarket.quoteToken; - tokenOrder.quoteAssetAddress = ddexMarket.quoteTokenAddress; - tokenOrder.quoteVolume = amount; + tokenOrder.quoteAssetSymbol = ddexMarket.baseToken; + tokenOrder.quoteAssetAddress = ddexMarket.baseTokenAddress; + tokenOrder.quoteVolume = price.times(amount); return tokenOrder; } diff --git a/packages/pipeline/src/parsers/oasis_orders/index.ts b/packages/pipeline/src/parsers/oasis_orders/index.ts index 7aafbf460..13997f31b 100644 --- a/packages/pipeline/src/parsers/oasis_orders/index.ts +++ b/packages/pipeline/src/parsers/oasis_orders/index.ts @@ -62,10 +62,10 @@ export function parseOasisOrder( tokenOrder.baseAssetSymbol = oasisMarket.base; tokenOrder.baseAssetAddress = null; // Oasis doesn't provide address information - tokenOrder.baseVolume = price.times(amount); + tokenOrder.baseVolume = amount; tokenOrder.quoteAssetSymbol = oasisMarket.quote; tokenOrder.quoteAssetAddress = null; // Oasis doesn't provide address information - tokenOrder.quoteVolume = amount; + tokenOrder.quoteVolume = price.times(amount); return tokenOrder; } diff --git a/packages/pipeline/src/parsers/paradex_orders/index.ts b/packages/pipeline/src/parsers/paradex_orders/index.ts index 7966658a7..5ceeb64a4 100644 --- a/packages/pipeline/src/parsers/paradex_orders/index.ts +++ b/packages/pipeline/src/parsers/paradex_orders/index.ts @@ -57,10 +57,10 @@ export function parseParadexOrder( tokenOrder.baseAssetSymbol = paradexMarket.baseToken; tokenOrder.baseAssetAddress = paradexMarket.baseTokenAddress as string; - tokenOrder.baseVolume = price.times(amount); + tokenOrder.baseVolume = amount; tokenOrder.quoteAssetSymbol = paradexMarket.quoteToken; tokenOrder.quoteAssetAddress = paradexMarket.quoteTokenAddress as string; - tokenOrder.quoteVolume = amount; + tokenOrder.quoteVolume = price.times(amount); return tokenOrder; } |