diff options
| author | Leonid <logvinov.leon@gmail.com> | 2017-07-12 09:22:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 09:22:22 +0800 |
| commit | 5fe128ccf6aa71494b71c6a8ecb07c3a6145140f (patch) | |
| tree | 835a231e28ed0fff4d70e98b46940b5bfe3b4ffa /src/utils/utils.ts | |
| parent | 89236fff410563c0d290e0a8090864cf21bae62e (diff) | |
| parent | 41f0be48f1360ca6241b399593212cdf767c2db0 (diff) | |
| download | dexon-sol-tools-5fe128ccf6aa71494b71c6a8ecb07c3a6145140f.tar dexon-sol-tools-5fe128ccf6aa71494b71c6a8ecb07c3a6145140f.tar.gz dexon-sol-tools-5fe128ccf6aa71494b71c6a8ecb07c3a6145140f.tar.bz2 dexon-sol-tools-5fe128ccf6aa71494b71c6a8ecb07c3a6145140f.tar.lz dexon-sol-tools-5fe128ccf6aa71494b71c6a8ecb07c3a6145140f.tar.xz dexon-sol-tools-5fe128ccf6aa71494b71c6a8ecb07c3a6145140f.tar.zst dexon-sol-tools-5fe128ccf6aa71494b71c6a8ecb07c3a6145140f.zip | |
Merge pull request #104 from 0xProject/ts-2.4
Update to typescript@2.4
Diffstat (limited to 'src/utils/utils.ts')
| -rw-r--r-- | src/utils/utils.ts | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/utils/utils.ts b/src/utils/utils.ts index ecc171bfe..6702de218 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -30,18 +30,18 @@ export const utils = { }, getOrderHashHex(order: Order|SignedOrder): string { const orderParts = [ - {value: order.exchangeContractAddress, type: SolidityTypes.address}, - {value: order.maker, type: SolidityTypes.address}, - {value: order.taker, type: SolidityTypes.address}, - {value: order.makerTokenAddress, type: SolidityTypes.address}, - {value: order.takerTokenAddress, type: SolidityTypes.address}, - {value: order.feeRecipient, type: SolidityTypes.address}, - {value: utils.bigNumberToBN(order.makerTokenAmount), type: SolidityTypes.uint256}, - {value: utils.bigNumberToBN(order.takerTokenAmount), type: SolidityTypes.uint256}, - {value: utils.bigNumberToBN(order.makerFee), type: SolidityTypes.uint256}, - {value: utils.bigNumberToBN(order.takerFee), type: SolidityTypes.uint256}, - {value: utils.bigNumberToBN(order.expirationUnixTimestampSec), type: SolidityTypes.uint256}, - {value: utils.bigNumberToBN(order.salt), type: SolidityTypes.uint256}, + {value: order.exchangeContractAddress, type: SolidityTypes.Address}, + {value: order.maker, type: SolidityTypes.Address}, + {value: order.taker, type: SolidityTypes.Address}, + {value: order.makerTokenAddress, type: SolidityTypes.Address}, + {value: order.takerTokenAddress, type: SolidityTypes.Address}, + {value: order.feeRecipient, type: SolidityTypes.Address}, + {value: utils.bigNumberToBN(order.makerTokenAmount), type: SolidityTypes.Uint256}, + {value: utils.bigNumberToBN(order.takerTokenAmount), type: SolidityTypes.Uint256}, + {value: utils.bigNumberToBN(order.makerFee), type: SolidityTypes.Uint256}, + {value: utils.bigNumberToBN(order.takerFee), type: SolidityTypes.Uint256}, + {value: utils.bigNumberToBN(order.expirationUnixTimestampSec), type: SolidityTypes.Uint256}, + {value: utils.bigNumberToBN(order.salt), type: SolidityTypes.Uint256}, ]; const types = _.map(orderParts, o => o.type); const values = _.map(orderParts, o => o.value); |