Skip to content

Fix toXPubBytes(hdkey, opts) #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coolaj86 merged 3 commits into from
Jul 15, 2023
Merged

Fix toXPubBytes(hdkey, opts) #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44c2c07
fix: use public version ('xpub') for toXPubBytes
coolaj86 Jul 15, 2023
c8118f6
feat: allow custom version for toXPrvBytes & toXPubBytes
coolaj86 Jul 15, 2023
0866607
chore(release): bump to v3.0.6
coolaj86 Jul 15, 2023
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
22 changes: 16 additions & 6 deletions dashhd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ var DashHd = ("object" === typeof module && exports) || {};
let XKEY_SIZE = 74;
let XKEY_DEPTH = 4; // m/44'/5'/0'/<0>[/0]

// Bitcoin hardcoded by default, can use package `coininfo` for others
// Bitcoin defaults hard-coded by default.
// Use package `coininfo` for others.
DashHd.MAINNET = { private: 0x0488ade4, public: 0x0488b21e };
DashHd.TESTNET = { private: 0x043587cf, public: 0x04358394 };

Expand Down Expand Up @@ -306,12 +307,14 @@ var DashHd = ("object" === typeof module && exports) || {};
};

// TODO - missing custom version
DashHd.toXPrvBytes = function (hdkey) {
DashHd.toXPrvBytes = function (hdkey, opts) {
let version = opts?.version || DashHd.MAINNET.private;

//@ts-ignore - will throw if null
let xprvPart = DashHd._toXBytes(hdkey, hdkey.privateKey);
let xprvBytes = new Uint8Array(xprvPart.length + 4);
let xkeyDv = new DataView(xprvBytes.buffer);
xkeyDv.setUint32(0, DashHd.MAINNET.private, BUFFER_BE);
xkeyDv.setUint32(0, version, BUFFER_BE);
xprvBytes.set(xprvPart, 4);
return xprvBytes;
};
Expand All @@ -322,12 +325,13 @@ var DashHd = ("object" === typeof module && exports) || {};
return xpub;
};

// TODO - missing custom version
DashHd.toXPubBytes = function (hdkey) {
DashHd.toXPubBytes = function (hdkey, opts) {
let version = opts?.version || DashHd.MAINNET.public;

let xpubPart = DashHd._toXBytes(hdkey, hdkey.publicKey);
let xpubBytes = new Uint8Array(xpubPart.length + 4);
let xkeyDv = new DataView(xpubBytes.buffer);
xkeyDv.setUint32(0, DashHd.MAINNET.private, BUFFER_BE);
xkeyDv.setUint32(0, version, BUFFER_BE);
xpubBytes.set(xpubPart, 4);
return xpubBytes;
};
Expand Down Expand Up @@ -821,9 +825,15 @@ if ("object" === typeof module) {
/**
* @callback HDToXKeyBytes
* @param {HDKey} hdkey
* @param {HDToXKeyBytesOpts} [opts]
* @returns {Uint8Array}
*/

/**
* @typedef HDToXKeyBytesOpts
* @prop {Number} [version]
*/

/**
* @callback HDToXBytes
* @param {HDKey} hdkey
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dashhd",
"version": "3.0.5",
"version": "3.0.6",
"description": "Manage HD Keys from HD Wallet Seed and Extended (xprv, xpub) Key Paths. Part of $DASH Tools.",
"main": "dashhd.js",
"browser": {
Expand Down