diff options
author | Leonid <logvinov.leon@gmail.com> | 2017-07-03 23:18:28 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-03 23:18:28 +0800 |
commit | 5cb1e5853ebfa8843028a52fda1c5a6ce9d84ad5 (patch) | |
tree | bc590faf72778986e7d9bc6b64164a4813d1ec29 /src/0x.ts | |
parent | 6e0edb8d8e8ced3b9e602a5722df859dd34ce563 (diff) | |
parent | 74ef0458f563ab9b82427ce736e90d1e0a922fb3 (diff) | |
download | dexon-sol-tools-5cb1e5853ebfa8843028a52fda1c5a6ce9d84ad5.tar dexon-sol-tools-5cb1e5853ebfa8843028a52fda1c5a6ce9d84ad5.tar.gz dexon-sol-tools-5cb1e5853ebfa8843028a52fda1c5a6ce9d84ad5.tar.bz2 dexon-sol-tools-5cb1e5853ebfa8843028a52fda1c5a6ce9d84ad5.tar.lz dexon-sol-tools-5cb1e5853ebfa8843028a52fda1c5a6ce9d84ad5.tar.xz dexon-sol-tools-5cb1e5853ebfa8843028a52fda1c5a6ce9d84ad5.tar.zst dexon-sol-tools-5cb1e5853ebfa8843028a52fda1c5a6ce9d84ad5.zip |
Merge pull request #85 from 0xProject/greenkeeper/ethereumjs-testrpc-4.0.1
Greenkeeper/ethereumjs testrpc 4.0.1
Diffstat (limited to 'src/0x.ts')
-rw-r--r-- | src/0x.ts | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -199,8 +199,9 @@ export class ZeroEx { let msgHashHex; const nodeVersion = await this._web3Wrapper.getNodeVersionAsync(); const isParityNode = utils.isParityNode(nodeVersion); - if (isParityNode) { - // Parity node adds the personalMessage prefix itself + const isTestRpc = utils.isTestRpc(nodeVersion); + if (isParityNode || isTestRpc) { + // Parity and TestRpc nodes add the personalMessage prefix itself msgHashHex = orderHash; } else { const orderHashBuff = ethUtil.toBuffer(orderHash); |