RanchiMall/localbitcoinplusplus
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed output greater than input error in sendtransaction, sending update to backups when btc withdraw is complete

Browse Source
This commit is contained in:
Abhishek Sinha 2019-07-22 15:42:06 +05:30
parent d39d7abc6f
commit 8ac62c34f1
1 changed files with 180 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
supernode/index.html
View File

@ -12610,65 +12610,98 @@
************************************************************************************************************************************/ ************************************************************************************************************************************/
readDBbyIndex('deposit', 'btc_address', withdraw_res.utxo_addr) readDBbyIndex('deposit', 'btc_address', withdraw_res.utxo_addr)
.then(async function (deposit_arr_resp) { .then(deposit_arr_resp => {
if (typeof deposit_arr_resp == "object") { if (typeof deposit_arr_resp == "object") {
deposit_arr_resp.map(deposit_arr => { deposit_arr_resp.map(async deposit_arr => {
let explorer; let explorer;
let decimal = 100000000; let decimal = 100000000;
switch (deposit_arr.product) { switch (deposit_arr.product) {
case "BTC": case "BTC":
explorer = localbitcoinplusplus.server.btc_mainnet; explorer = localbitcoinplusplus.server.btc_mainnet;
break; break;
case "BTC_TEST": case "BTC_TEST":
explorer = localbitcoinplusplus.server.btc_testnet; explorer = localbitcoinplusplus.server.btc_testnet;
break; break;
case "FLO": case "FLO":
explorer = localbitcoinplusplus.server.flo_mainnet; explorer = localbitcoinplusplus.server.flo_mainnet;
decimal = 1; decimal = 1;
break; break;
case "FLO_TEST": case "FLO_TEST":
explorer = localbitcoinplusplus.server.flo_testnet; explorer = localbitcoinplusplus.server.flo_testnet;
decimal = 1; decimal = 1;
break; break;
default: default:
break; break;
} }
if(typeof explorer !== "string") { if(typeof explorer !== "string") {
throw new Error(`WARNING: Invalid product value: ${deposit_arr.product}.`); throw new Error(`WARNING: Invalid product value: ${deposit_arr.product}.`);
return false; return false;
} }
const bal_url = `${explorer}/api/addr/${withdraw_res.utxo_addr}/balance`; const bal_url = `${explorer}/api/addr/${withdraw_res.utxo_addr}/balance`;
console.log(bal_url); console.log(bal_url);
const current_balance = await helper_functions.ajaxGet(bal_url); let current_balance = await helper_functions.ajaxGet(bal_url);
if (!isNaN(current_balance) && parseFloat(current_balance) > 0) { if (!isNaN(current_balance) && parseFloat(current_balance) > 0) {
current_balance = Number(parseFloat(current_balance/decimal)); current_balance = Number(parseFloat(current_balance/decimal));
} }
if (typeof current_balance=="number") { if (typeof current_balance=="number") {
deposit_arr.bitcoinToBePaid = current_balance; deposit_arr.bitcoinToBePaid = current_balance;
} else { } else {
deposit_arr.bitcoinToBePaid -= EqCryptoWd; deposit_arr.bitcoinToBePaid -= EqCryptoWd;
} }
if (deposit_arr.bitcoinToBePaid > 0) { if (deposit_arr.bitcoinToBePaid > 0) {
// update deposits in db // update deposits in db
deposit_arr.status = 2; // UTXO ready to be used again deposit_arr.status = 2; // UTXO ready to be used again
updateinDB("deposit", deposit_arr, deposit_arr.id); updateinDB("deposit", deposit_arr, deposit_arr.id);
} else { // Do not delete these data instantly as the data
// delete entry in deposits in db // may be required by a follow-up withdraw request
removeinDB("deposit", deposit_arr.id); localbitcoinplusplus.actions.delay(900000).then(()=>{
removeinDB('system_btc_reserves_private_keys', retrieve_pvtkey_req_id); removeinDB('withdraw_btc', withdraw_id);
}
} RM_RPC
); .send_rpc(
// Delete the withdrawal request "delete_deposited_crypto_instance",
removeinDB('withdraw_btc', withdraw_id); {
return true; withdraw_btc_id: withdraw_id,
db_inst: params.db_inst,
trader_flo_address: deposit_arr.trader_flo_address
}
).then(delRequestObject=>
doSend(delRequestObject));
});
} else {
// Do not delete these data instantly as the data
// may be required by a follow-up withdraw request
localbitcoinplusplus.actions.delay(900000).then(()=>{
// delete entry in deposits in db
removeinDB("deposit", deposit_arr.id);
removeinDB('system_btc_reserves_private_keys', retrieve_pvtkey_req_id);
removeinDB('withdraw_btc', withdraw_id);
RM_RPC
.send_rpc(
"delete_deposited_crypto_instance",
{
deposit_id: deposit_arr.id,
btc_reserve_id: retrieve_pvtkey_req_id,
withdraw_btc_id: withdraw_id,
db_inst: params.db_inst,
trader_flo_address: deposit_arr.trader_flo_address
}
).then(delRequestObject=>
doSend(delRequestObject));
});
}
});
return true;
} }
}); });
@ -13900,8 +13933,7 @@
"object" "object"
) { ) {
deposit_arr_resp deposit_arr_resp
.map( .map(async deposit_arr => {
deposit_arr => {
let explorer; let explorer;
let decimal = 100000000; let decimal = 100000000;
switch (deposit_arr.product) { switch (deposit_arr.product) {
@ -13931,7 +13963,7 @@
const bal_url = `${explorer}/api/addr/${withdraw_res.utxo_addr}/balance`; const bal_url = `${explorer}/api/addr/${withdraw_res.utxo_addr}/balance`;
console.log(bal_url); console.log(bal_url);
const current_balance = await helper_functions.ajaxGet(bal_url); let current_balance = await helper_functions.ajaxGet(bal_url);
if (!isNaN(current_balance) && parseFloat(current_balance) > 0) { if (!isNaN(current_balance) && parseFloat(current_balance) > 0) {
current_balance = Number(parseFloat(current_balance/decimal)); current_balance = Number(parseFloat(current_balance/decimal));
} }
@ -13952,22 +13984,54 @@
deposit_arr.id deposit_arr.id
); );
localbitcoinplusplus.actions.delay(900000).then(()=>{
backup_server_db_instance.backup_removeinDB('withdraw_btc', withdraw_id);
RM_RPC
.send_rpc(
"delete_deposited_crypto_instance",
{
withdraw_btc_id: withdraw_id,
db_inst: params.db_inst,
trader_flo_address: deposit_arr.trader_flo_address
}
).then(delRequestObject=>
doSend(delRequestObject));
});
} else { } else {
// delete entry in deposits in db
backup_server_db_instance.backup_removeinDB localbitcoinplusplus.actions.delay(900000).then(()=>{
// delete entry in deposits in db
backup_server_db_instance.backup_removeinDB
( (
"deposit", "deposit",
deposit_arr.id deposit_arr.id
); );
backup_server_db_instance backup_server_db_instance
.backup_removeinDB('system_btc_reserves_private_keys', .backup_removeinDB('system_btc_reserves_private_keys',
retrieve_pvtkey_req_id); retrieve_pvtkey_req_id);
backup_server_db_instance.backup_removeinDB('withdraw_btc', withdraw_id);
RM_RPC
.send_rpc(
"delete_deposited_crypto_instance",
{
deposit_id: deposit_arr.id,
btc_reserve_id: retrieve_pvtkey_req_id,
withdraw_btc_id: withdraw_id,
db_inst: params.db_inst,
trader_flo_address: deposit_arr.trader_flo_address
}
).then(delRequestObject=>
doSend(delRequestObject));
});
} }
} }
); );
// Delete the withdrawal request
backup_server_db_instance.backup_removeinDB('withdraw_btc', withdraw_id);
return true; return true;
} }
}); });
@ -14708,6 +14772,11 @@
} }
} }
// Output cannot be greater than input
if (sum < btc_eq_receiving_amount) {
btc_eq_receiving_amount = sum;
}
btc_eq_receiving_amount = btc_eq_receiving_amount - miners_fee; btc_eq_receiving_amount = btc_eq_receiving_amount - miners_fee;
trx.addoutput(receiver_address, btc_eq_receiving_amount); trx.addoutput(receiver_address, btc_eq_receiving_amount);
@ -16395,8 +16464,10 @@
let seen_chunk_id_list = []; let seen_chunk_id_list = [];
btc_pvt_arr[retrieve_pvtkey_req_id].filter(function(item) { btc_pvt_arr[retrieve_pvtkey_req_id].filter(function(item) {
return seen_chunk_id_list.hasOwnProperty(item.private_key_chunk.id) if (typeof item.private_key_chunk !== "undefined") {
return seen_chunk_id_list.hasOwnProperty(item.private_key_chunk.id)
? false : (seen_chunk_id_list.push(item.private_key_chunk.id)); ? false : (seen_chunk_id_list.push(item.private_key_chunk.id));
}
}); });
if (!seen_chunk_id_list if (!seen_chunk_id_list
@ -18675,6 +18746,29 @@
} }
break; break;
case "delete_deposited_crypto_instance":
if (localbitcoinplusplus.master_configurations.supernodesPubKeys
.includes(res_obj.nodePubKey)) {
const res_data = res_obj.params[0];
const backup_db = res_data.db_inst;
try {
if (typeof backup_db=="string" && backup_db.length>0) {
if (typeof localbitcoinplusplus.newBackupDatabase.db[backup_db] == "object") {
const foreign_db = localbitcoinplusplus.newBackupDatabase.db[backup_db];
const _removeinDB = foreign_db.backup_removeinDB.bind(foreign_db);
if (typeof res_data.withdraw_btc_id == "string") _removeinDB('withdraw_btc', res_data.withdraw_btc_id);
if (typeof res_data.deposit_id == "string") _removeinDB('deposit', res_data.deposit_id);
if (typeof res_data.btc_reserve_id == "string") _removeinDB('system_btc_reserves_private_keys', res_data.btc_reserve_id);
}
}
} catch (e) {
console.error(e);
}
}
break;
default: default:
break; break;
} }
@ -19842,6 +19936,29 @@
} }
break; break;
case "delete_deposited_crypto_instance":
if (localbitcoinplusplus.master_configurations.supernodesPubKeys
.includes(res_obj.nodePubKey)) {
const res_data = res_obj.params[0];
const backup_db = res_data.db_inst;
try {
if (typeof backup_db=="string" && backup_db.length>0) {
if (typeof localbitcoinplusplus.newBackupDatabase.db[backup_db] == "object") {
const foreign_db = localbitcoinplusplus.newBackupDatabase.db[backup_db];
const _removeinDB = foreign_db.backup_removeinDB.bind(foreign_db);
if (typeof res_data.withdraw_btc_id == "string") _removeinDB('withdraw_btc', res_data.withdraw_btc_id);
if (typeof res_data.deposit_id == "string") _removeinDB('deposit', res_data.deposit_id);
if (typeof res_data.btc_reserve_id == "string") _removeinDB('system_btc_reserves_private_keys', res_data.btc_reserve_id);
}
}
} catch (e) {
console.error(e);
}
}
break;
default: default:
break; break;
} }