🐛 Fix hex buffer behavior to match node 8

src/crypto/convert.js

@@ -24,17 +24,17 @@ export const bufferToBigNumberString = bigNumberBuffer =>
 
 export const bufferToHex = buffer => naclInstance.to_hex(buffer);
 
-const hexRegex = /([0-9]|[a-f])/gim;
+const hexRegex = /^([0-9]|[a-f])+/gi;
 export const hexToBuffer = hex => {
 	if (typeof hex !== 'string') {
-		return Buffer.alloc(0);
+		throw new TypeError('argument must be string');
 	}
 	const matchedHex = hex.match(hexRegex) || [];
 	if (matchedHex.length === 0) {
 		return Buffer.alloc(0);
 	}
-	const evenLength = Math.floor(matchedHex.length / 2) * 2;
-	return Buffer.from(matchedHex.slice(0, evenLength).join(''), 'hex');
+	const evenLength = Math.floor(matchedHex[0].length / 2) * 2;
+	return Buffer.from(matchedHex[0].slice(0, evenLength), 'hex');
 };
 
 export const getFirstEightBytesReversed = publicKeyBytes =>

src/transactions/utils/getTransactionBytes.js

@@ -162,9 +162,10 @@ const getTransactionBytes = transaction => {
 	const transactionSenderPublicKey = cryptoModule.hexToBuffer(
 		transaction.senderPublicKey,
 	);
-	const transactionRequesterPublicKey = cryptoModule.hexToBuffer(
-		transaction.requesterPublicKey,
-	);
+
+	const transactionRequesterPublicKey = transaction.requesterPublicKey
+		? cryptoModule.hexToBuffer(transaction.requesterPublicKey)
+		: Buffer.alloc(0);
 
 	const transactionRecipientID = transaction.recipientId
 		? cryptoModule.bigNumberToBuffer(
@@ -181,12 +182,12 @@ const getTransactionBytes = transaction => {
 	const transactionAssetData = getAssetBytes(transaction);
 
 	const transactionSignature = transaction.signature
-		? Buffer.from(transaction.signature, 'hex')
+		? cryptoModule.hexToBuffer(transaction.signature)
 		: Buffer.alloc(0);
 
-	const transactionSecondSignature = cryptoModule.hexToBuffer(
-		transaction.signSignature,
-	);
+	const transactionSecondSignature = transaction.signSignature
+		? cryptoModule.hexToBuffer(transaction.signSignature)
+		: Buffer.alloc(0);
 
 	return Buffer.concat([
 		transactionType,

test/crypto/convert.js

@@ -65,9 +65,15 @@ describe('convert', () => {
 			const buffer = hexToBuffer(defaultHex);
 			return buffer.should.be.eql(defaultBuffer);
 		});
-		it('should create empty Buffer from non-string', () => {
-			const buffer = hexToBuffer(123);
-			return buffer.should.be.eql(Buffer.alloc(0));
+		it('should throw TypeError with number', () => {
+			return (() => hexToBuffer(123)).should.throw(
+				new TypeError('argument must be string'),
+			);
+		});
+		it('should throw TypeError with object', () => {
+			return (() => hexToBuffer({})).should.throw(
+				new TypeError('argument must be string'),
+			);
 		});
 		it('should create empty Buffer from non hex string', () => {
 			const buffer = hexToBuffer('yKJh');
@@ -77,6 +83,10 @@ describe('convert', () => {
 			const buffer = hexToBuffer('Abxzzzz');
 			return buffer.should.be.eql(Buffer.from('Ab', 'hex'));
 		});
+		it('should create partial Buffer with only first valid hex string', () => {
+			const buffer = hexToBuffer('Abxzzab');
+			return buffer.should.be.eql(Buffer.from('Ab', 'hex'));
+		});
 		it('should create even numbered Buffer from odd number hex string', () => {
 			const buffer = hexToBuffer('c3a5c3a4c3b6a');
 			return buffer.should.be.eql(Buffer.from('c3a5c3a4c3b6', 'hex'));