diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-07-08 04:49:02 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-07-08 04:49:02 +0800 |
| commit | 712a1ba36ee9f60e56b36533f10e7ad4ce4998e8 (patch) | |
| tree | e637022b237c180c14d9a8f6d54b2551dde2bacf /test | |
| parent | e9509b4ff372f001ad343185f160d452f8f1af7a (diff) | |
| download | dexon-0x-contracts-712a1ba36ee9f60e56b36533f10e7ad4ce4998e8.tar.gz dexon-0x-contracts-712a1ba36ee9f60e56b36533f10e7ad4ce4998e8.tar.zst dexon-0x-contracts-712a1ba36ee9f60e56b36533f10e7ad4ce4998e8.zip | |
Modify signOrderHashAsync to parse the signatureHex string as V + R + S AND R + S + V and check both for a valid signature in order to fix the issue of different nodes returning it differently
Diffstat (limited to 'test')
| -rw-r--r-- | test/0x.js_test.ts | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts index f25f104bd..0c82c803d 100644 --- a/test/0x.js_test.ts +++ b/test/0x.js_test.ts @@ -163,7 +163,7 @@ describe('ZeroEx library', () => { _.each(stubs, s => s.restore()); stubs = []; }); - it('Should return the correct ECSignature on TestPRC nodeVersion', async () => { + it('Should return the correct ECSignature', async () => { const orderHash = '0x6927e990021d23b1eb7b8789f6a6feaf98fe104bb0cf8259421b79f9a34222b0'; const expectedECSignature = { v: 27, @@ -173,8 +173,7 @@ describe('ZeroEx library', () => { const ecSignature = await zeroEx.signOrderHashAsync(orderHash, makerAddress); expect(ecSignature).to.deep.equal(expectedECSignature); }); - it('should return the correct ECSignature on Parity > V1.6.6', async () => { - const newParityNodeVersion = 'Parity//v1.6.7-beta-e128418-20170518/x86_64-macos/rustc1.17.0'; + it('should return the correct ECSignature for signatureHex concatenated as R + S + V', async () => { const orderHash = '0x34decbedc118904df65f379a175bb39ca18209d6ce41d5ed549d54e6e0a95004'; // tslint:disable-next-line: max-line-length const signature = '0x22109d11d79cb8bf96ed88625e1cd9558800c4073332a9a02857499883ee5ce3050aa3cc1f2c435e67e114cdce54b9527b4f50548342401bc5d2b77adbdacb021b'; @@ -184,8 +183,6 @@ describe('ZeroEx library', () => { s: '0x050aa3cc1f2c435e67e114cdce54b9527b4f50548342401bc5d2b77adbdacb02', }; stubs = [ - Sinon.stub((zeroEx as any)._web3Wrapper, 'getNodeVersionAsync') - .returns(Promise.resolve(newParityNodeVersion)), Sinon.stub((zeroEx as any)._web3Wrapper, 'signTransactionAsync') .returns(Promise.resolve(signature)), Sinon.stub(ZeroEx, 'isValidSignature').returns(true), @@ -194,8 +191,7 @@ describe('ZeroEx library', () => { const ecSignature = await zeroEx.signOrderHashAsync(orderHash, makerAddress); expect(ecSignature).to.deep.equal(expectedECSignature); }); - it('should return the correct ECSignature on Parity < V1.6.6', async () => { - const newParityNodeVersion = 'Parity//v1.6.6-beta-8c6e3f3-20170411/x86_64-macos/rustc1.16.0'; + it('should return the correct ECSignature for signatureHex concatenated as V + R + S', async () => { const orderHash = '0xc793e33ffded933b76f2f48d9aa3339fc090399d5e7f5dec8d3660f5480793f7'; // tslint:disable-next-line: max-line-length const signature = '0x1bc80bedc6756722672753413efdd749b5adbd4fd552595f59c13427407ee9aee02dea66f25a608bbae457e020fb6decb763deb8b7192abab624997242da248960'; @@ -205,8 +201,6 @@ describe('ZeroEx library', () => { s: '0x2dea66f25a608bbae457e020fb6decb763deb8b7192abab624997242da248960', }; stubs = [ - Sinon.stub((zeroEx as any)._web3Wrapper, 'getNodeVersionAsync') - .returns(Promise.resolve(newParityNodeVersion)), Sinon.stub((zeroEx as any)._web3Wrapper, 'signTransactionAsync') .returns(Promise.resolve(signature)), Sinon.stub(ZeroEx, 'isValidSignature').returns(true), |