diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-06-27 16:30:45 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-06-29 22:52:52 +0800 |
commit | 532964af4252b7eae108aae204dcf7c400a5b546 (patch) | |
tree | d7ef72943302dff79d28ec0e65122bdfde0e3523 | |
parent | 52d14072154ab772d6cc5ccd1ff242434ff3a448 (diff) | |
download | dexon-sol-tools-532964af4252b7eae108aae204dcf7c400a5b546.tar dexon-sol-tools-532964af4252b7eae108aae204dcf7c400a5b546.tar.gz dexon-sol-tools-532964af4252b7eae108aae204dcf7c400a5b546.tar.bz2 dexon-sol-tools-532964af4252b7eae108aae204dcf7c400a5b546.tar.lz dexon-sol-tools-532964af4252b7eae108aae204dcf7c400a5b546.tar.xz dexon-sol-tools-532964af4252b7eae108aae204dcf7c400a5b546.tar.zst dexon-sol-tools-532964af4252b7eae108aae204dcf7c400a5b546.zip |
Use new signature verification method in assertions
-rw-r--r-- | packages/contract-wrappers/src/utils/assert.ts | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/packages/contract-wrappers/src/utils/assert.ts b/packages/contract-wrappers/src/utils/assert.ts index 140979e7e..76ad06e91 100644 --- a/packages/contract-wrappers/src/utils/assert.ts +++ b/packages/contract-wrappers/src/utils/assert.ts @@ -1,18 +1,21 @@ import { assert as sharedAssert } from '@0xproject/assert'; // We need those two unused imports because they're actually used by sharedAssert which gets injected here -// tslint:disable:no-unused-variable -import { Schema } from '@0xproject/json-schemas'; -import { ECSignature } from '@0xproject/types'; -import { BigNumber } from '@0xproject/utils'; +import { Schema } from '@0xproject/json-schemas'; // tslint:disable-line:no-unused-variable +import { isValidSignatureAsync } from '@0xproject/order-utils'; +import { ECSignature } from '@0xproject/types'; // tslint:disable-line:no-unused-variable +import { BigNumber } from '@0xproject/utils'; // tslint:disable-line:no-unused-variable import { Web3Wrapper } from '@0xproject/web3-wrapper'; -// tslint:enable:no-unused-variable - -import { isValidSignature } from '@0xproject/order-utils'; +import { Provider } from 'ethereum-types'; export const assert = { ...sharedAssert, - isValidSignature(orderHash: string, ecSignature: ECSignature, signerAddress: string): void { - const isValid = isValidSignature(orderHash, ecSignature, signerAddress); + async isValidSignatureAsync( + provider: Provider, + orderHash: string, + signature: string, + signerAddress: string, + ): Promise<void> { + const isValid = await isValidSignatureAsync(provider, orderHash, signature, signerAddress); this.assert(isValid, `Expected order with hash '${orderHash}' to have a valid signature`); }, async isSenderAddressAsync( |