diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-06-08 06:53:30 +0800 |
|---|---|---|
| committer | Greg Hysen <greg.hysen@gmail.com> | 2018-06-08 06:53:30 +0800 |
| commit | d62ff34a5a5794a586c0b4bbf27c51ea36efd659 (patch) | |
| tree | 73d0a32b53d44aedec33dec073b9439f948816b7 /packages/order-utils/src/order_state_utils.ts | |
| parent | 0d4ff5a916694be7cb5772bbd7d3e610522e09df (diff) | |
| download | dexon-sol-tools-d62ff34a5a5794a586c0b4bbf27c51ea36efd659.tar dexon-sol-tools-d62ff34a5a5794a586c0b4bbf27c51ea36efd659.tar.gz dexon-sol-tools-d62ff34a5a5794a586c0b4bbf27c51ea36efd659.tar.bz2 dexon-sol-tools-d62ff34a5a5794a586c0b4bbf27c51ea36efd659.tar.lz dexon-sol-tools-d62ff34a5a5794a586c0b4bbf27c51ea36efd659.tar.xz dexon-sol-tools-d62ff34a5a5794a586c0b4bbf27c51ea36efd659.tar.zst dexon-sol-tools-d62ff34a5a5794a586c0b4bbf27c51ea36efd659.zip | |
Cleanup after last rebase
Diffstat (limited to 'packages/order-utils/src/order_state_utils.ts')
| -rw-r--r-- | packages/order-utils/src/order_state_utils.ts | 4 |
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 12f5d8f7e..40f235da7 100644 --- a/packages/order-utils/src/order_state_utils.ts +++ b/packages/order-utils/src/order_state_utils.ts @@ -79,7 +79,7 @@ export class OrderStateUtils { } public async getOrderRelevantStateAsync(signedOrder: SignedOrder): Promise<OrderRelevantState> { const zrxTokenAddress = this._orderFilledCancelledFetcher.getZRXTokenAddress(); - const makerProxyData = assetProxyUtils.decodeERC20ProxyData(signedOrder.makerAssetData); + const makerProxyData = assetProxyUtils.decodeERC20AssetData(signedOrder.makerAssetData); const makerAssetAddress = makerProxyData.tokenAddress; const orderHash = orderHashUtils.getOrderHashHex(signedOrder); const makerBalance = await this._balanceAndProxyAllowanceFetcher.getBalanceAsync( @@ -112,7 +112,7 @@ export class OrderStateUtils { const transferrableFeeAssetAmount = BigNumber.min([makerFeeProxyAllowance, makerFeeBalance]); const zrxAssetData = assetProxyUtils.encodeERC20AssetData(zrxTokenAddress); - const isMakerTokenZRX = signedOrder.makerAssetData === zrxAssetData; + const isMakerAssetZRX = signedOrder.makerAssetData === zrxAssetData; const remainingFillableCalculator = new RemainingFillableCalculator( signedOrder.makerFee, signedOrder.makerAssetAmount, |