aboutsummaryrefslogtreecommitdiffstats
path: root/packages/order-utils/src/order_state_utils.ts
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-06-05 09:14:44 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-06-08 06:39:38 +0800
commit12e2bfc794831c0008bdbfc27dad9509f2578057 (patch)
tree550261bcf4060337c3f83ab6312c13c653a8d7db /packages/order-utils/src/order_state_utils.ts
parent6e5abade3cad23838fae3108a8de48a1972a9f75 (diff)
downloaddexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar
dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.gz
dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.bz2
dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.lz
dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.xz
dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.tar.zst
dexon-sol-tools-12e2bfc794831c0008bdbfc27dad9509f2578057.zip
Fixes after rebasing
Diffstat (limited to 'packages/order-utils/src/order_state_utils.ts')
-rw-r--r--packages/order-utils/src/order_state_utils.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/order-utils/src/order_state_utils.ts b/packages/order-utils/src/order_state_utils.ts
index ca18097c9..12f5d8f7e 100644
--- a/packages/order-utils/src/order_state_utils.ts
+++ b/packages/order-utils/src/order_state_utils.ts
@@ -111,8 +111,8 @@ export class OrderStateUtils {
const transferrableMakerAssetAmount = BigNumber.min([makerProxyAllowance, makerBalance]);
const transferrableFeeAssetAmount = BigNumber.min([makerFeeProxyAllowance, makerFeeBalance]);
- const zrxAssetData = assetProxyUtils.encodeERC20ProxyData(zrxTokenAddress);
- const isMakerAssetZRX = signedOrder.makerAssetData === zrxAssetData;
+ const zrxAssetData = assetProxyUtils.encodeERC20AssetData(zrxTokenAddress);
+ const isMakerTokenZRX = signedOrder.makerAssetData === zrxAssetData;
const remainingFillableCalculator = new RemainingFillableCalculator(
signedOrder.makerFee,
signedOrder.makerAssetAmount,