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

Use assert.isHexString

Browse Source
This commit is contained in:
Fabio Berger
2017-12-06 19:05:22 -06:00
parent e893e8c442
commit b82b50e2f0
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/subproviders/src/subproviders/ledger.ts
View File

@@ -1,6 +1,7 @@
import {assert} from '@0xproject/assert';
import promisify = require('es6-promisify'); import promisify = require('es6-promisify');
import {isAddress} from 'ethereum-address'; import {isAddress} from 'ethereum-address';
import * as EthereumTx from 'ethereumjs-tx'; import EthereumTx from 'ethereumjs-tx';
import ethUtil = require('ethereumjs-util'); import ethUtil = require('ethereumjs-util');
import * as ledger from 'ledgerco'; import * as ledger from 'ledgerco';
import * as _ from 'lodash'; import * as _ from 'lodash';
@@ -53,9 +54,7 @@ export class LedgerSubprovider extends Subprovider {
if (_.isUndefined(msgParams.data)) { if (_.isUndefined(msgParams.data)) {
throw new Error(LedgerSubproviderErrors.DataMissingForSignPersonalMessage); throw new Error(LedgerSubproviderErrors.DataMissingForSignPersonalMessage);
} }
if (!LedgerSubprovider.isValidHex(msgParams.data)) { assert.isHexString('data', msgParams.data);
throw new Error(LedgerSubproviderErrors.DataNotValidHexForSignPersonalMessage);
}
} }
private static validateSender(sender: string) { private static validateSender(sender: string) {
if (_.isUndefined(sender) || !isAddress(sender)) { if (_.isUndefined(sender) || !isAddress(sender)) {

1
packages/subproviders/src/types.ts
View File

@@ -107,7 +107,6 @@ export enum LedgerSubproviderErrors {
TooOldLedgerFirmware = 'TOO_OLD_LEDGER_FIRMWARE', TooOldLedgerFirmware = 'TOO_OLD_LEDGER_FIRMWARE',
FromAddressMissingOrInvalid = 'FROM_ADDRESS_MISSING_OR_INVALID', FromAddressMissingOrInvalid = 'FROM_ADDRESS_MISSING_OR_INVALID',
DataMissingForSignPersonalMessage = 'DATA_MISSING_FOR_SIGN_PERSONAL_MESSAGE', DataMissingForSignPersonalMessage = 'DATA_MISSING_FOR_SIGN_PERSONAL_MESSAGE',
DataNotValidHexForSignPersonalMessage = 'DATA_NOT_VALID_HEX_FOR_SIGN_PERSONAL_MESSAGE',
SenderInvalidOrNotSupplied = 'SENDER_INVALID_OR_NOT_SUPPLIED', SenderInvalidOrNotSupplied = 'SENDER_INVALID_OR_NOT_SUPPLIED',
MultipleOpenConnectionsDisallowed = 'MULTIPLE_OPEN_CONNECTIONS_DISALLOWED', MultipleOpenConnectionsDisallowed = 'MULTIPLE_OPEN_CONNECTIONS_DISALLOWED',
} }