crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup isValidSignature method

Browse Source
This commit is contained in:
Fabio Berger 2017-05-26 17:10:02 +02:00
parent 123cfb7c00
commit 5a6df03b64
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ts/contract_wrappers/exchange_wrapper.ts
View File

@ -10,20 +10,21 @@ export class ExchangeWrapper extends ContractWrapper {
constructor(web3Wrapper: Web3Wrapper) { constructor(web3Wrapper: Web3Wrapper) {
super(web3Wrapper); super(web3Wrapper);
} }
public async isValidSignatureAsync(dataHex: string, ecSignature: ECSignature, maker: string) { public async isValidSignatureAsync(dataHex: string, ecSignature: ECSignature,
signerAddressHex: string): Promise<boolean> {
assert.isHexString('dataHex', dataHex); assert.isHexString('dataHex', dataHex);
assert.doesConformToSchema('ecSignature', ecSignature, ECSignatureSchema); assert.doesConformToSchema('ecSignature', ecSignature, ECSignatureSchema);
assert.isString('maker', maker); assert.isETHAddressHex('signerAddressHex', signerAddressHex);
const senderAddressIfExists = this.web3Wrapper.getSenderAddressIfExistsAsync(); const senderAddressIfExists = await this.web3Wrapper.getSenderAddressIfExistsAsync();
assert.assert(!_.isUndefined(senderAddressIfExists), ZeroExError.USER_HAS_NO_ASSOCIATED_ADDRESSES); assert.assert(!_.isUndefined(senderAddressIfExists), ZeroExError.USER_HAS_NO_ASSOCIATED_ADDRESSES);
// TODO: remove any here // TODO: remove `any` here
const contractInstance = await this.instantiateContractIfExistsAsync((ExchangeArtifacts as any)); const contractInstance = await this.instantiateContractIfExistsAsync((ExchangeArtifacts as any));
const exchangeInstance = contractInstance as ExchangeContract; const exchangeInstance = contractInstance as ExchangeContract;
const isValidSignature = await exchangeInstance.isValidSignature.call( const isValidSignature = await exchangeInstance.isValidSignature.call(
maker, signerAddressHex,
dataHex, dataHex,
ecSignature.v, ecSignature.v,
ecSignature.r, ecSignature.r,