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

Add isSubscriptionToken assertion

Browse Source
This commit is contained in:
Leonid Logvinov 2018-06-29 16:17:25 +03:00
parent ac9175bf88
commit 3d7bcd7ecb
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts
View File

@ -379,6 +379,7 @@ export class ERC20TokenWrapper extends ContractWrapper {
* @param subscriptionToken Subscription token returned by `subscribe()` * @param subscriptionToken Subscription token returned by `subscribe()`
*/ */
public unsubscribe(subscriptionToken: string): void { public unsubscribe(subscriptionToken: string): void {
assert.isValidSubscriptionToken('subscriptionToken', subscriptionToken);
this._unsubscribe(subscriptionToken); this._unsubscribe(subscriptionToken);
} }
/** /**

1
packages/contract-wrappers/src/contract_wrappers/erc721_token_wrapper.ts
View File

@ -411,6 +411,7 @@ export class ERC721TokenWrapper extends ContractWrapper {
* @param subscriptionToken Subscription token returned by `subscribe()` * @param subscriptionToken Subscription token returned by `subscribe()`
*/ */
public unsubscribe(subscriptionToken: string): void { public unsubscribe(subscriptionToken: string): void {
assert.isValidSubscriptionToken('subscriptionToken', subscriptionToken);
this._unsubscribe(subscriptionToken); this._unsubscribe(subscriptionToken);
} }
/** /**

1
packages/contract-wrappers/src/contract_wrappers/ether_token_wrapper.ts
View File

@ -168,6 +168,7 @@ export class EtherTokenWrapper extends ContractWrapper {
* @param subscriptionToken Subscription token returned by `subscribe()` * @param subscriptionToken Subscription token returned by `subscribe()`
*/ */
public unsubscribe(subscriptionToken: string): void { public unsubscribe(subscriptionToken: string): void {
assert.isValidSubscriptionToken('subscriptionToken', subscriptionToken);
this._unsubscribe(subscriptionToken); this._unsubscribe(subscriptionToken);
} }
/** /**

5
packages/contract-wrappers/src/utils/assert.ts
View File

@ -18,6 +18,11 @@ export const assert = {
const isValid = await isValidSignatureAsync(provider, orderHash, signature, signerAddress); const isValid = await isValidSignatureAsync(provider, orderHash, signature, signerAddress);
this.assert(isValid, `Expected order with hash '${orderHash}' to have a valid signature`); this.assert(isValid, `Expected order with hash '${orderHash}' to have a valid signature`);
}, },
isValidSubscriptionToken(variableName: string, subscriptionToken: string): void {
const uuidRegex = new RegExp('^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$');
const isValid = uuidRegex.test(subscriptionToken);
this.assert(isValid, `Expected ${variableName} to be a valid subscription token`);
},
async isSenderAddressAsync( async isSenderAddressAsync(
variableName: string, variableName: string,
senderAddressHex: string, senderAddressHex: string,