Skip to content

fix: use nullish coalescing (to allow version and other values to be 0 or "") #88

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
merged 2 commits into from
Feb 15, 2025
Merged

fix: use nullish coalescing (to allow version and other values to be 0 or "") #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aebd10b
fix: use nullish coalescing (to allow version and other values to be …
coolaj86 Feb 14, 2025
cdb5550
chore(release): bump to v0.20.2
coolaj86 Feb 14, 2025
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
21 changes: 12 additions & 9 deletions dashtx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@
* @prop {TxHashAndSignInput} hashAndSignInput
*/

// Based on discoveries from
// https://github.com/jojobyte/browser-import-rabbit-hole

/** @type {Tx} */
//@ts-ignore
var DashTx = ("object" === typeof module && exports) || {};
Expand Down Expand Up @@ -313,13 +316,13 @@ var DashTx = ("object" === typeof module && exports) || {};

/** @type {TxInfoSigned} */
let txInfoSigned = {
version: txInfo.version || CURRENT_VERSION,
type: txInfo.type || TYPE_VERSION,
version: txInfo.version ?? CURRENT_VERSION,
type: txInfo.type ?? TYPE_VERSION,
/** @type {Array<TxInputSigned>} */
inputs: [],
outputs: txInfo.outputs,
locktime: txInfo.locktime || 0x00,
extraPayload: txInfo.extraPayload || "",
locktime: txInfo.locktime ?? 0x00,
extraPayload: txInfo.extraPayload ?? "",
transaction: "",
};

Expand Down Expand Up @@ -578,7 +581,7 @@ var DashTx = ("object" === typeof module && exports) || {};
let txSigned;

for (let n = 0; true; n += 1) {
let changeSats = txDraft.change?.satoshis || 0;
let changeSats = txDraft.change?.satoshis ?? 0;
let hasChange = changeSats > 0;
let canIncreaseFee = txDraft.fullTransfer || hasChange;
if (!canIncreaseFee) {
Expand Down Expand Up @@ -1194,7 +1197,7 @@ var DashTx = ("object" === typeof module && exports) || {};

Tx.serializeInputs = function (inputs, _opts) {
let tx = _opts?._tx || [];
let _sep = _opts?._sep || "";
let _sep = _opts?._sep ?? "";

let nInputs = Tx.utils.toVarInt(inputs.length);
tx.push(nInputs);
Expand Down Expand Up @@ -1276,7 +1279,7 @@ var DashTx = ("object" === typeof module && exports) || {};

Tx.serializeOutputs = function (outputs, opts) {
let tx = opts?._tx || [];
let _sep = opts?._sep || "";
let _sep = opts?._sep ?? "";

if (!outputs.length) {
throw new Error(E_NO_OUTPUTS);
Expand All @@ -1297,7 +1300,7 @@ var DashTx = ("object" === typeof module && exports) || {};

Tx.serializeOutput = function (output, i, _opts) {
let tx = _opts?._tx || [];
let _sep = _opts?._sep || "";
let _sep = _opts?._sep ?? "";

if (output.message) {
if (!output.memo) {
Expand All @@ -1310,7 +1313,7 @@ var DashTx = ("object" === typeof module && exports) || {};
throw new Error(`memo outputs must not have 'address' or 'pubKeyHash'`);
}

let sats = output.satoshis || 0;
let sats = output.satoshis ?? 0;
let memoScriptHex = Tx._createMemoScript(output.memo, sats, i);
let txOut = memoScriptHex.join(_sep);

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": "dashtx",
"version": "0.20.1",
"version": "0.20.2",
"description": "Create DASH Transactions with Vanilla JS (0 deps, cross-platform)",
"main": "dashtx.js",
"module": "dashtx.mjs",
Expand Down