Skip to content
This repository was archived by the owner on Apr 3, 2019. It is now read-only.

Read address version as unsigned integer #137

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Read address version as unsigned integer #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/hdprivatekey.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ HDPrivateKey._validateNetwork = function(data, networkArg) {
return new errors.InvalidNetworkArgument(networkArg);
}
var version = data.slice(0, 4);
if (BufferUtil.integerFromBuffer(version) !== network.xprivkey) {
if (BufferUtil.unsignedIntegerFromBuffer(version) !== network.xprivkey) {
return new errors.InvalidNetwork(version);
}
return null;
Expand Down Expand Up @@ -477,7 +477,7 @@ HDPrivateKey.prototype._buildFromBuffers = function(arg) {
}
}

var network = Network.get(BufferUtil.integerFromBuffer(arg.version));
var network = Network.get(BufferUtil.unsignedIntegerFromBuffer(arg.version));
var xprivkey;
xprivkey = Base58Check.encode(buffer.Buffer.concat(sequence));
arg.xprivkey = new Buffer(xprivkey);
Expand Down Expand Up @@ -576,7 +576,7 @@ HDPrivateKey.prototype.inspect = function() {
*/
HDPrivateKey.prototype.toObject = HDPrivateKey.prototype.toJSON = function toObject() {
return {
network: Network.get(BufferUtil.integerFromBuffer(this._buffers.version), 'xprivkey').name,
network: Network.get(BufferUtil.unsignedIntegerFromBuffer(this._buffers.version), 'xprivkey').name,
depth: BufferUtil.integerFromSingleByteBuffer(this._buffers.depth),
fingerPrint: BufferUtil.integerFromBuffer(this.fingerPrint),
parentFingerPrint: BufferUtil.integerFromBuffer(this._buffers.parentFingerPrint),
Expand Down
8 changes: 4 additions & 4 deletions lib/hdpublickey.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ HDPublicKey._validateNetwork = function(data, networkArg) {
return new errors.InvalidNetworkArgument(networkArg);
}
var version = data.slice(HDPublicKey.VersionStart, HDPublicKey.VersionEnd);
if (BufferUtil.integerFromBuffer(version) !== network.xpubkey) {
if (BufferUtil.unsignedIntegerFromBuffer(version) !== network.xpubkey) {
return new errors.InvalidNetwork(version);
}
return null;
Expand All @@ -266,7 +266,7 @@ HDPublicKey.prototype._buildFromPrivate = function (arg) {
var args = _.clone(arg._buffers);
var point = Point.getG().mul(BN.fromBuffer(args.privateKey));
args.publicKey = Point.pointToCompressed(point);
args.version = BufferUtil.integerAsBuffer(Network.get(BufferUtil.integerFromBuffer(args.version)).xpubkey);
args.version = BufferUtil.integerAsBuffer(Network.get(BufferUtil.unsignedIntegerFromBuffer(args.version)).xpubkey);
args.privateKey = undefined;
args.checksum = undefined;
args.xprivkey = undefined;
Expand Down Expand Up @@ -344,7 +344,7 @@ HDPublicKey.prototype._buildFromBuffers = function(arg) {
throw new errors.InvalidB58Checksum(concat, checksum);
}
}
var network = Network.get(BufferUtil.integerFromBuffer(arg.version));
var network = Network.get(BufferUtil.unsignedIntegerFromBuffer(arg.version));

var xpubkey;
xpubkey = Base58Check.encode(BufferUtil.concat(sequence));
Expand Down Expand Up @@ -430,7 +430,7 @@ HDPublicKey.prototype.inspect = function() {
*/
HDPublicKey.prototype.toObject = HDPublicKey.prototype.toJSON = function toObject() {
return {
network: Network.get(BufferUtil.integerFromBuffer(this._buffers.version)).name,
network: Network.get(BufferUtil.unsignedIntegerFromBuffer(this._buffers.version)).name,
depth: BufferUtil.integerFromSingleByteBuffer(this._buffers.depth),
fingerPrint: BufferUtil.integerFromBuffer(this.fingerPrint),
parentFingerPrint: BufferUtil.integerFromBuffer(this._buffers.parentFingerPrint),
Expand Down
11 changes: 11 additions & 0 deletions lib/util/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,17 @@ module.exports = {
return buffer[0] << 24 | buffer[1] << 16 | buffer[2] << 8 | buffer[3];
},

/**
* Transform the first 4 values of a Buffer into a unsigned number, in little endian encoding
*
* @param {Buffer} buffer
* @return {number}
*/
unsignedIntegerFromBuffer: function unsignedIntegerFromBuffer(buffer) {
$.checkArgumentType(buffer, 'Buffer', 'buffer');
return buffer.readUInt32BE(0);
},

/**
* Transforms the first byte of an array into a number ranging from -128 to 127
* @param {Buffer} buffer
Expand Down