Skip to content

fix!: allow empty memos (NULL op returns) #80

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
Aug 15, 2024
Merged

fix!: allow empty memos (NULL op returns) #80

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
1c2ac1d
fix!: allow empty memos (NULL op returns)
coolaj86 Aug 15, 2024
1f7188c
chore(release): bump to v0.19.0
coolaj86 Aug 15, 2024
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: 12 additions & 10 deletions dashtx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,8 +869,8 @@ var DashTx = ("object" === typeof module && exports) || {};

// memo vs non-memo is settled by 'satoshis' being 0
// (otherwise there's a bug)
if (a.memo) {
if (!b.memo) {
if (typeof a.memo === "string") {
if (typeof b.memo !== "string") {
throw new Error(`'satoshis' must be above 0, except for memos`);
}
if (a.memo < b.memo) {
Expand Down Expand Up @@ -1268,7 +1268,7 @@ var DashTx = ("object" === typeof module && exports) || {};
output.memo = TxUtils.strToHex(output.message);
}
}
if (output.memo) {
if (typeof output.memo === "string") {
let invalid = output.address || output.pubKeyHash;
if (invalid) {
throw new Error(`memo outputs must not have 'address' or 'pubKeyHash'`);
Expand Down Expand Up @@ -1306,7 +1306,7 @@ var DashTx = ("object" === typeof module && exports) || {};
Tx.createDonationOutput = function (opts) {
let satoshis = 0;
let message = opts?.message;
if (!message) {
if (typeof message !== "string") {
let gifts = ["💸", "🎁", "🧧"];
let indexIsh = Math.random() * 3;
let index = Math.floor(indexIsh);
Expand Down Expand Up @@ -1606,8 +1606,10 @@ var DashTx = ("object" === typeof module && exports) || {};
output.scriptTypeHex = output.script.slice(0, 2);
output.scriptType = parseInt(output.scriptTypeHex, 16);
output.pubKeyHash = "";
output.memo = "";
output.message = "";
/**@type {String?}*/
output.memo = null;
/**@type {String?}*/
output.message = null;
if (output.scriptTypeHex === OP_RETURN) {
output.memo = output.script.slice(4, 2 * output.lockScriptSize);
output.message = "";
Expand Down Expand Up @@ -2052,8 +2054,8 @@ if ("object" === typeof module) {

/**
* @typedef TxOutput
* @prop {String} [memo] - hex bytes of a memo (incompatible with pubKeyHash / address)
* @prop {String} [message] - memo, but as a UTF-8 string
* @prop {String?} [memo] - hex bytes of a memo (incompatible with pubKeyHash / address)
* @prop {String?} [message] - memo, but as a UTF-8 string
* @prop {String} [address] - payAddr as Base58Check (human-friendly)
* @prop {String} [pubKeyHash] - payAddr's raw hex value (decoded, not Base58Check)
* @prop {Uint53} satoshis - the number of smallest units of the currency
Expand All @@ -2063,7 +2065,7 @@ if ("object" === typeof module) {
* @typedef TxOutputSortable
* @prop {Uint53} satoshis
* @prop {String} [script] - hex bytes in wire order
* @prop {String} [memo] - 0x6a, hex bytes
* @prop {String?} [memo] - 0x6a, hex bytes
* @prop {String} [pubKeyHash] - 0x76, 0xa9, hex bytes
* @prop {String} [address] - 0x76, 0xa9, base58check bytes
*/
Expand Down Expand Up @@ -2105,7 +2107,7 @@ if ("object" === typeof module) {
* Create a donation output with a nice message.
* @callback TxCreateDonationOutput
* @param {Object} [opts]
* @param {String} [opts.message] - UTF-8 Memo String
* @param {String?} [opts.message] - UTF-8 Memo String
*/

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