btcOperator v1.0.7a
- Adding auto fee calculation - Optimized the code - Fixed minor bugs
This commit is contained in:
parent
4244774635
commit
bc44405102
133
btcOperator.js
133
btcOperator.js
@ -1,4 +1,4 @@
|
|||||||
(function(EXPORTS) { //btcOperator v1.0.7
|
(function(EXPORTS) { //btcOperator v1.0.7a
|
||||||
/* BTC Crypto and API Operator */
|
/* BTC Crypto and API Operator */
|
||||||
const btcOperator = EXPORTS;
|
const btcOperator = EXPORTS;
|
||||||
|
|
||||||
@ -16,6 +16,21 @@
|
|||||||
})
|
})
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const SIGN_SIZE = 73;
|
||||||
|
|
||||||
|
function get_fee_rate() {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
fetch('https://api.blockchain.info/mempool/fees').then(response => {
|
||||||
|
if (response.ok)
|
||||||
|
response.json()
|
||||||
|
.then(result => resolve(result.regular))
|
||||||
|
.catch(error => reject(error));
|
||||||
|
else
|
||||||
|
reject(response);
|
||||||
|
}).catch(error => reject(error))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
const broadcast = btcOperator.broadcast = rawtx => new Promise((resolve, reject) => {
|
const broadcast = btcOperator.broadcast = rawtx => new Promise((resolve, reject) => {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: "POST",
|
type: "POST",
|
||||||
@ -229,7 +244,7 @@
|
|||||||
if (parameters.change_addr && !validateAddress(parameters.change_addr))
|
if (parameters.change_addr && !validateAddress(parameters.change_addr))
|
||||||
throw "Invalid change_address:" + parameters.change_addr;
|
throw "Invalid change_address:" + parameters.change_addr;
|
||||||
//fee and amounts
|
//fee and amounts
|
||||||
if (typeof parameters.fee !== "number" || parameters.fee <= 0)
|
if ((typeof parameters.fee !== "number" || parameters.fee <= 0) && parameters.fee !== null) //fee = null (auto calc)
|
||||||
throw "Invalid fee:" + parameters.fee;
|
throw "Invalid fee:" + parameters.fee;
|
||||||
if (!Array.isArray(parameters.amounts))
|
if (!Array.isArray(parameters.amounts))
|
||||||
parameters.amounts = [parameters.amounts];
|
parameters.amounts = [parameters.amounts];
|
||||||
@ -242,6 +257,32 @@
|
|||||||
return parameters;
|
return parameters;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const TMP_FEE = 0.00001;
|
||||||
|
|
||||||
|
function createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr) {
|
||||||
|
let auto_fee = false,
|
||||||
|
total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8));
|
||||||
|
if (fee === null) {
|
||||||
|
auto_fee = true;
|
||||||
|
fee = TMP_FEE;
|
||||||
|
}
|
||||||
|
const tx = coinjs.transaction();
|
||||||
|
addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => {
|
||||||
|
if (result > 0)
|
||||||
|
return reject("Insufficient Balance");
|
||||||
|
let change = addOutputs(tx, receivers, amounts, Math.abs(result), change_addr);
|
||||||
|
if (!auto_fee)
|
||||||
|
return resolve(tx);
|
||||||
|
autoFeeCalc(tx).then(fee_calc => {
|
||||||
|
fee = Math.round((fee * 1) * 1e8); //satoshi convertion
|
||||||
|
if (!change)
|
||||||
|
tx.addoutput(change_addr, 0);
|
||||||
|
editFee(tx, fee, fee_calc);
|
||||||
|
resolve(tx);
|
||||||
|
}).catch(error => reject(error))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
function addUTXOs(tx, senders, redeemScripts, required_amount, n = 0) {
|
function addUTXOs(tx, senders, redeemScripts, required_amount, n = 0) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
required_amount = parseFloat(required_amount.toFixed(8));
|
required_amount = parseFloat(required_amount.toFixed(8));
|
||||||
@ -277,8 +318,47 @@
|
|||||||
function addOutputs(tx, receivers, amounts, change, change_addr) {
|
function addOutputs(tx, receivers, amounts, change, change_addr) {
|
||||||
for (let i in receivers)
|
for (let i in receivers)
|
||||||
tx.addoutput(receivers[i], amounts[i]);
|
tx.addoutput(receivers[i], amounts[i]);
|
||||||
if (parseFloat(change.toFixed(8)) > 0)
|
if (parseFloat(change.toFixed(8)) > 0) {
|
||||||
tx.addoutput(change_addr || senders[0], change);
|
tx.addoutput(change_addr, change);
|
||||||
|
return true;
|
||||||
|
} else
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
function autoFeeCalc(tx) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
get_fee_rate().then(fee_rate => {
|
||||||
|
let tx_size = tx.size();
|
||||||
|
for (var i = 0; i < this.ins.length; i++)
|
||||||
|
switch (tx.extractScriptKey(i).type) {
|
||||||
|
case 'scriptpubkey':
|
||||||
|
tx_size += SIGN_SIZE;
|
||||||
|
break;
|
||||||
|
case 'segwit':
|
||||||
|
case 'multisig':
|
||||||
|
tx_size += SIGN_SIZE * 0.25;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
console.warn('Unknown script-type');
|
||||||
|
tx_size += SIGN_SIZE;
|
||||||
|
}
|
||||||
|
resolve(tx_size * fee_rate);
|
||||||
|
}).catch(error => reject(error))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function editFee(tx, current_fee, target_fee, index = -1) {
|
||||||
|
//values are in satoshi
|
||||||
|
index = parseInt(index >= 0 ? index : tx.out.length - index);
|
||||||
|
if (index < 0 || index >= tx.out.length)
|
||||||
|
throw "Invalid index";
|
||||||
|
let edit_value = parseInt(current_fee - target_fee), //rip of any decimal places
|
||||||
|
current_value = tx.out[index].value; //could be BigInterger
|
||||||
|
if (edit_value < 0 && edit_value > current_value)
|
||||||
|
throw "Insufficient value at vout";
|
||||||
|
tx.out[index].value = current_value instanceof BigInteger ?
|
||||||
|
current_value.add(new BigInteger('' + edit_value)) : parseInt(current_value + edit_value);
|
||||||
}
|
}
|
||||||
|
|
||||||
btcOperator.sendTx = function(senders, privkeys, receivers, amounts, fee, change_addr = null) {
|
btcOperator.sendTx = function(senders, privkeys, receivers, amounts, fee, change_addr = null) {
|
||||||
@ -299,8 +379,7 @@
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
return reject(e)
|
return reject(e)
|
||||||
}
|
}
|
||||||
let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)),
|
let redeemScripts = [],
|
||||||
redeemScripts = [],
|
|
||||||
wif_keys = [];
|
wif_keys = [];
|
||||||
for (let i in senders) {
|
for (let i in senders) {
|
||||||
let rs = _redeemScript(senders[i], privkeys[i]); //get redeem-script (segwit/bech32)
|
let rs = _redeemScript(senders[i], privkeys[i]); //get redeem-script (segwit/bech32)
|
||||||
@ -309,26 +388,20 @@
|
|||||||
}
|
}
|
||||||
if (redeemScripts.includes(null)) //TODO: segwit
|
if (redeemScripts.includes(null)) //TODO: segwit
|
||||||
return reject("Unable to get redeem-script");
|
return reject("Unable to get redeem-script");
|
||||||
|
|
||||||
//create transaction
|
//create transaction
|
||||||
const tx = coinjs.transaction();
|
createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0]).then(tx => {
|
||||||
addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => {
|
|
||||||
if (result > 0)
|
|
||||||
return reject("Insufficient Balance");
|
|
||||||
addOutputs(tx, receivers, amounts, Math.abs(result), change_addr || senders[0])
|
|
||||||
console.debug("Unsigned:", tx.serialize());
|
console.debug("Unsigned:", tx.serialize());
|
||||||
new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF
|
new Set(wif_keys).forEach(key => console.debug("Signing key:", key, tx.sign(key, 1 /*sighashtype*/ ))); //Sign the tx using private key WIF
|
||||||
|
|
||||||
console.debug("Signed:", tx.serialize());
|
console.debug("Signed:", tx.serialize());
|
||||||
debugger;
|
debugger;
|
||||||
broadcast(tx.serialize())
|
broadcast(tx.serialize())
|
||||||
.then(result => resolve(result))
|
.then(result => resolve(result))
|
||||||
.catch(error => reject(error));
|
.catch(error => reject(error));
|
||||||
});
|
}).catch(error => reject(error));
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
btcOperator.createTx = function(senders, receivers, amounts, fee, change_addr = null) {
|
btcOperator.createTx = function(senders, receivers, amounts, fee = null, change_addr = null) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
try {
|
try {
|
||||||
({
|
({
|
||||||
@ -345,25 +418,18 @@
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
return reject(e)
|
return reject(e)
|
||||||
}
|
}
|
||||||
let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8)),
|
let redeemScripts = senders.map(id => _redeemScript(id));
|
||||||
redeemScripts = senders.map(id => _redeemScript(id));
|
|
||||||
if (redeemScripts.includes(null)) //TODO: segwit
|
if (redeemScripts.includes(null)) //TODO: segwit
|
||||||
return reject("Unable to get redeem-script");
|
return reject("Unable to get redeem-script");
|
||||||
|
|
||||||
//create transaction
|
//create transaction
|
||||||
const tx = coinjs.transaction();
|
createTransaction(senders, redeemScripts, receivers, amounts, fee, change_addr || senders[0])
|
||||||
addUTXOs(tx, senders, redeemScripts, total_amount + fee).then(result => {
|
.then(tx => resolve(tx.serialize()))
|
||||||
if (result > 0)
|
.catch(error => reject(error))
|
||||||
return reject("Insufficient Balance");
|
|
||||||
addOutputs(tx, receivers, amounts, Math.abs(result), change_addr || senders[0])
|
|
||||||
resolve(tx.serialize());
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
btcOperator.createMultiSigTx = function(sender, redeemScript, receivers, amounts, fee) {
|
btcOperator.createMultiSigTx = function(sender, redeemScript, receivers, amounts, fee) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
|
|
||||||
//validate tx parameters
|
//validate tx parameters
|
||||||
if (validateAddress(sender) !== "multisig")
|
if (validateAddress(sender) !== "multisig")
|
||||||
return reject("Invalid sender (multisig):" + sender);
|
return reject("Invalid sender (multisig):" + sender);
|
||||||
@ -380,22 +446,15 @@
|
|||||||
} = validateTxParameters({
|
} = validateTxParameters({
|
||||||
receivers,
|
receivers,
|
||||||
amounts,
|
amounts,
|
||||||
fee,
|
fee
|
||||||
change_addr
|
|
||||||
}));
|
}));
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return reject(e)
|
return reject(e)
|
||||||
}
|
}
|
||||||
let total_amount = parseFloat(amounts.reduce((t, a) => t + a, 0).toFixed(8))
|
|
||||||
|
|
||||||
//create transaction
|
//create transaction
|
||||||
const tx = coinjs.transaction();
|
createTransaction([sender], [redeemScript], receivers, amounts, fee, sender)
|
||||||
addUTXOs(tx, senders, redeemScript, total_amount + fee).then(result => {
|
.then(tx => resolve(tx.serialize()))
|
||||||
if (result > 0)
|
.catch(error => reject(error))
|
||||||
return reject("Insufficient Balance");
|
|
||||||
addOutputs(tx, receivers, amounts, Math.abs(result), sender);
|
|
||||||
resolve(tx.serialize());
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
2
lib.js
2
lib.js
@ -6676,7 +6676,7 @@
|
|||||||
throw "Invalid checksum";
|
throw "Invalid checksum";
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
bech32rs = coinjs.bech32redeemscript(addr);
|
let bech32rs = coinjs.bech32redeemscript(addr);
|
||||||
if (bech32rs) {
|
if (bech32rs) {
|
||||||
return {
|
return {
|
||||||
'type': 'bech32',
|
'type': 'bech32',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user