diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/ts/0x.js.ts | 13 | ||||
| -rw-r--r-- | src/ts/utils/assert.ts | 2 | ||||
| -rw-r--r-- | test/0x.js.ts | 6 |
4 files changed, 14 insertions, 9 deletions
diff --git a/package.json b/package.json index 950ad0d38..a46ffcaf1 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,9 @@ "devDependencies": { "@types/bignumber.js": "^4.0.2", "@types/chai": "^3.5.2", - "@types/jsonschema": "^1.1.1", "@types/mocha": "^2.2.41", "@types/node": "^7.0.22", + "@types/lodash": "^4.14.64", "awesome-typescript-loader": "^3.1.3", "bignumber.js": "^4.0.2", "chai": "^3.5.0", diff --git a/src/ts/0x.js.ts b/src/ts/0x.js.ts index a3a83670d..bd0ce80e2 100644 --- a/src/ts/0x.js.ts +++ b/src/ts/0x.js.ts @@ -1,5 +1,6 @@ import * as BigNumber from 'bignumber.js'; import * as ethUtil from 'ethereumjs-util'; +import * as _ from 'lodash'; import {assert} from './utils/assert'; import {ECSignatureSchema} from './schemas/ec_signature_schema'; @@ -13,17 +14,16 @@ export interface ECSignature { } const MAX_DIGITS_IN_UNSIGNED_256_INT = 78; -const ORDER_HASH_LENGTH = 66; export class ZeroEx { /** * Verifies that the elliptic curve signature `signature` was generated * by signing `data` with the private key corresponding to the `signer` address. */ - public static isValidSignature(dataHex: string, signature: ECSignature, signerAddress: string): boolean { + public static isValidSignature(dataHex: string, signature: ECSignature, signerETHAddressHex: string): boolean { assert.isHexString('dataHex', dataHex); assert.doesConformToSchema('signature', signature, ECSignatureSchema); - assert.isETHAddressHex('signerAddress', signerAddress); + assert.isETHAddressHex('signerAddress', signerETHAddressHex); const dataBuff = ethUtil.toBuffer(dataHex); const msgHashBuff = ethUtil.hashPersonalMessage(dataBuff); @@ -33,7 +33,7 @@ export class ZeroEx { ethUtil.toBuffer(signature.r), ethUtil.toBuffer(signature.s)); const retrievedAddress = ethUtil.bufferToHex(ethUtil.pubToAddress(pubKey)); - return retrievedAddress === signerAddress; + return retrievedAddress === signerETHAddressHex; } catch (err) { return false; } @@ -53,7 +53,8 @@ export class ZeroEx { } /** Checks if order hash is valid */ public static isValidOrderHash(orderHash: string): boolean { - assert.isHexString('orderHash', orderHash); - return orderHash.length === ORDER_HASH_LENGTH; + assert.isString('orderHash', orderHash); + const isValid = /^0x[0-9A-F]{66}$/i.test(orderHash); + return isValid; } } diff --git a/src/ts/utils/assert.ts b/src/ts/utils/assert.ts index 509590ee6..2f52c6a3b 100644 --- a/src/ts/utils/assert.ts +++ b/src/ts/utils/assert.ts @@ -3,7 +3,7 @@ import * as BigNumber from 'bignumber.js'; import Web3 = require('web3'); import {SchemaValidator} from './schema_validator'; -const HEX_REGEX = /^0x([0-9A-F]{2})*$/i; +const HEX_REGEX = /^0x[0-9A-F]*$/i; export const assert = { isBigNumber(variableName: string, value: BigNumber.BigNumber) { diff --git a/test/0x.js.ts b/test/0x.js.ts index 2ac6a2bea..38c36d248 100644 --- a/test/0x.js.ts +++ b/test/0x.js.ts @@ -52,7 +52,7 @@ describe('ZeroEx library', () => { }); }); it('should return false if the data doesn\'t pertain to the signature & address', () => { - const isValid = ZeroEx.isValidSignature('0x00', signature, address); + const isValid = ZeroEx.isValidSignature('0x0', signature, address); expect(isValid).to.be.false; }); it('should return false if the address doesn\'t pertain to the signature & data', () => { @@ -83,6 +83,10 @@ describe('ZeroEx library', () => { }); }); describe('#isValidOrderHash', () => { + it('returns false if the value is not a hex string', () => { + const isValid = ZeroEx.isValidOrderHash('not a hex'); + expect(isValid).to.be.false; + }); it('returns false if the length is wrong', () => { const isValid = ZeroEx.isValidOrderHash('0xdeadbeef'); expect(isValid).to.be.false; |