Skip to content
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

Jump to bottom

Switch @dashincubator/blocktx to dashtx & upgrade dep versions #57

Open
wants to merge 1 commit into
base: ref-blocktx
Choose a base branch
from
Open

Switch @dashincubator/blocktx to dashtx & upgrade dep versions #57

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
42 changes: 23 additions & 19 deletions dashcore-lit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@
//@ts-ignore
exports.dashcore = Dashcore;

let Base58Check = require("@dashincubator/base58check").Base58Check;
//@ts-ignore
let BlockTx = exports.BlockTx || require("@dashincubator/blocktx");
let Base58Check = exports.Base58Check || require("@dashincubator/base58check").Base58Check;
//@ts-ignore
let DashTx = exports.DashTx || require("dashtx");
//@ts-ignore
let Crypto = exports.crypto || require("./shims/crypto-node.js");
let RIPEMD160 = require("@dashincubator/ripemd160");
let Secp256k1 = require("@dashincubator/secp256k1");
//@ts-ignore
let RIPEMD160 = exports.RIPEMD160 || require("@dashincubator/ripemd160");
//@ts-ignore
let Secp256k1 = exports.Secp256k1 || require("@dashincubator/secp256k1");

let b58c = Base58Check.create({
pubKeyHashVersion: "4c",
privateKeyVersion: "cc",
});

let dashTx = BlockTx.create({
let dashTx = DashTx.create({
version: 3,
/**
* @param {String} addr
Expand All @@ -43,7 +46,7 @@
}
Dashcore.Transaction = Transaction;

// 193 + BlockTx.OUTPUT_SIZE;
// 193 + DashTx.OUTPUT_SIZE;
Transaction.DUST_AMOUNT = 5460;

Transaction.create = function () {
Expand All @@ -53,11 +56,11 @@
/** @type {Array<CoreUtxo>} */
inputs: [],
locktime: 0,
/** @type {Array<import('@dashincubator/blocktx').TxOutput>} */
/** @type {Array<import('dashtx').TxOutput>} */
outputs: [],
version: 3,
};
/** @type {import('@dashincubator/blocktx').TxInfoSigned} */
/** @type {import('dashtx').TxInfoSigned} */
let txSigned;

let coreTx = {};
Expand All @@ -74,7 +77,7 @@
};

/**
* @param {Array<import('@dashincubator/blocktx').TxOutput>} payments
* @param {Array<import('dashtx').TxOutput>} payments
* @param {Number} satoshis - base unit of DASH (a.k.a. "duffs")
*/
coreTx.to = function (payments, satoshis) {
Expand Down Expand Up @@ -121,6 +124,7 @@
if (changeOutput) {
_txInfo.outputs.push(changeOutput);
}
// @ts-ignore
let _keys = await coreTx._mapKeysToUtxos(_txInfo, keys);
console.log(_keys.length, _txInfo.inputs.length);
txSigned = await dashTx.hashAndSignAll(_txInfo, _keys);
Expand All @@ -134,15 +138,15 @@
return total + payment.satoshis;
}, 0);

let [minFee, maxFee] = BlockTx.estimates(txInfo);
let [minFee, maxFee] = DashTx.estimates(txInfo);
let feeSpread = maxFee - minFee;
let halfSpread = Math.ceil(feeSpread / 2);
if (!fee) {
fee = maxFee;
}
if (fee < minFee) {
throw new Error(
`your fees are too powerful: increase fee to at least ${minFee} (absolute possible minimum) + ${halfSpread} (to account for possible byte padding) + ${BlockTx.OUTPUT_SIZE} (if you expect change back)`,
`your fees are too powerful: increase fee to at least ${minFee} (absolute possible minimum) + ${halfSpread} (to account for possible byte padding) + ${DashTx.OUTPUT_SIZE} (if you expect change back)`,
);
}

Expand All @@ -153,7 +157,7 @@
}

let changeFee = 0;
/** @type {import('@dashincubator/blocktx').TxOutput?} */
/** @type {import('dashtx').TxOutput?} */
let changeOutput = null;
if (change) {
if (!changeAddr) {
Expand All @@ -162,7 +166,7 @@
`you must provide 'change(addr)' to collect '${change}' sats or increase 'fee' to '${bigFee}'`,
);
}
changeFee = BlockTx.OUTPUT_SIZE;
changeFee = DashTx.OUTPUT_SIZE;
change -= changeFee;
changeOutput = {
address: changeAddr,
Expand All @@ -182,7 +186,7 @@
};

/**
* @param {import('@dashincubator/blocktx').TxInfo} _txInfo
* @param {import('dashtx').TxInfo} _txInfo
* @param {Array<String|Uint8Array|ArrayBuffer|Buffer>} keys
*/
coreTx._mapKeysToUtxos = async function (_txInfo, keys) {
Expand Down Expand Up @@ -308,7 +312,7 @@
};

pk.toPublicKey = function () {
let pubBuf = BlockTx.utils.toPublicKey(privBuf);
let pubBuf = DashTx.utils.toPublicKey(privBuf);
let pub = PublicKeyFactory.create(pubBuf);
return pub;
};
Expand Down Expand Up @@ -341,7 +345,7 @@

if ("string" === typeof wifHexOrBuf) {
if (64 === wifHexOrBuf.length) {
return BlockTx.utils.hexToU8(wifHexOrBuf);
return DashTx.utils.hexToU8(wifHexOrBuf);
}
if (52 === wifHexOrBuf.length) {
return wifToPrivateKey(wifHexOrBuf);
Expand Down Expand Up @@ -413,7 +417,7 @@
PublicKeyFactory.from = function (hexOrBuf) {
if ("string" === typeof hexOrBuf) {
if (64 === hexOrBuf.length) {
return BlockTx.utils.hexToU8(hexOrBuf);
return DashTx.utils.hexToU8(hexOrBuf);
}
throw new Error("cannot create public key from non-hex strings");
}
Expand All @@ -440,7 +444,7 @@
let shaU8 = new Uint8Array(sha);
let ripemd = RIPEMD160.create();
let hash = ripemd.update(shaU8);
let pkh = hash.digest("hex");
let pkh = hash.digest();
// extra .toString() for tsc
return pkh.toString();
}
Expand All @@ -450,7 +454,7 @@
* @returns {Promise<String>} wif - Base58Check-encoded private key
*/
async function privateKeyToWif(privBuf) {
let privHex = BlockTx.utils.u8ToHex(privBuf);
let privHex = DashTx.utils.u8ToHex(privBuf);
let decoded = {
privateKey: privHex,
};
Expand Down
Loading