From 5d4dd406f2946b43377049d7422c72b433bc64ab Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Fri, 3 Aug 2018 11:53:26 +0800 Subject: Update Changelogs. Rebased from development --- packages/order-utils/CHANGELOG.json | 13 ++++++++++--- packages/order-utils/src/signature_utils.ts | 7 ++++--- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/CHANGELOG.json b/packages/order-utils/CHANGELOG.json index 60f0855c2..c70448d69 100644 --- a/packages/order-utils/CHANGELOG.json +++ b/packages/order-utils/CHANGELOG.json @@ -1,4 +1,14 @@ [ + { + "version": "pending", + "changes": [ + { + "pr": 914, + "note": + "Update ecSignOrderHashAsync to return signature string with signature type byte. Removes messagePrefixOpts." + } + ] + }, { "version": "1.0.1-rc.3", "changes": [ @@ -30,9 +40,6 @@ "changes": [ { "note": "Dependencies updated" - }, - { - "note": "Update ecSignOrderHashAsync to return signature string with signature type byte" } ], "timestamp": 1532605697 diff --git a/packages/order-utils/src/signature_utils.ts b/packages/order-utils/src/signature_utils.ts index 07644ebe2..db5a35f80 100644 --- a/packages/order-utils/src/signature_utils.ts +++ b/packages/order-utils/src/signature_utils.ts @@ -271,11 +271,11 @@ export function convertECSignatureToSignatureHex( /** * Combines the signature proof and the Signature Type. * @param signature The hex encoded signature proof - * @param type The signature type, i.e EthSign, Trezor, Wallet etc. + * @param signatureType The signature type, i.e EthSign, Trezor, Wallet etc. * @return Hex encoded string of signature proof with Signature Type */ -export function convertToSignatureWithType(signature: string, type: SignatureType): string { - const signatureBuffer = Buffer.concat([ethUtil.toBuffer(signature), ethUtil.toBuffer(type)]); +export function convertToSignatureWithType(signature: string, signatureType: SignatureType): string { + const signatureBuffer = Buffer.concat([ethUtil.toBuffer(signature), ethUtil.toBuffer(signatureType)]); const signatureHex = `0x${signatureBuffer.toString('hex')}`; return signatureHex; } @@ -291,6 +291,7 @@ export function addSignedMessagePrefix(message: string, signerProviderType: Sign assert.doesBelongToStringEnum('signerProviderType', signerProviderType, SignerProviderType); switch (signerProviderType) { case SignerProviderType.Metamask: + case SignerProviderType.Ledger: case SignerProviderType.EthSign: { const msgBuff = ethUtil.toBuffer(message); const prefixedMsgBuff = ethUtil.hashPersonalMessage(msgBuff); -- cgit v1.2.3