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

bunkTransferTokens: Improvements and fixes

Browse Source 
- Fixes for floBlockchainAPI update (and waitForConfirmation moved to floBlockchainAPI)
- reject when receiver object list is empty
- when only 1 receiver is there, directly send tx using floTokenAPI.sendTx without spliting UTXOs
This commit is contained in:
sairajzero 2023-05-02 21:43:06 +05:30
parent b710826d9b
commit f86818c1cb
1 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
scripts/flo-webwallet.js
View File

@ -110,27 +110,6 @@
}) })
} }
function waitForConfirmation(txid, max_retry = -1, retry_timeout = 20) {
return new Promise((resolve, reject) => {
setTimeout(function () {
floBlockchainAPI.getTx(txid).then(tx => {
if (!tx)
return reject("Transaction not found");
if (tx.confirmations)
return resolve(tx);
else if (max_retry === 0) //no more retries
return reject(false);
else {
max_retry = max_retry < 0 ? -1 : max_retry - 1; //decrease retry count (unless infinite retries)
waitForConfirmation(txid, max_retry, retry_timeout)
.then(result => resolve(result))
.catch(error => reject(error))
}
}).catch(error => reject(error))
}, retry_timeout * 1000)
})
}
function sendRawTransaction(receiver, utxo, vout, scriptPubKey, data, wif) { function sendRawTransaction(receiver, utxo, vout, scriptPubKey, data, wif) {
var trx = bitjs.transaction(); var trx = bitjs.transaction();
trx.addinput(utxo, vout, scriptPubKey) trx.addinput(utxo, vout, scriptPubKey)
@ -162,31 +141,39 @@
else if (invalidAmount.length) else if (invalidAmount.length)
return reject(`Invalid amounts: ${invalidAmount}`); return reject(`Invalid amounts: ${invalidAmount}`);
//check for token balance if (receiver_list.length == 0)
floTokenAPI.getBalance(sender, token).then(token_balance => { return reject("Receivers cannot be empty");
let total_token_amout = amount_list.reduce((a, e) => a + e, 0);
if (total_token_amout > token_balance)
return reject(`Insufficient ${token}# balance`);
//split utxos if (receiver_list.length == 1) {
floBlockchainAPI.splitUTXOs(sender, privKey, receiver_list.length).then(split_txid => { let receiver = receiver_list[0], amount = amount_list[0];
//wait for the split utxo to get confirmation floTokenAPI.sendToken(privKey, amount, receiver, "", token)
waitForConfirmation(split_txid).then(split_tx => { .then(txid => resolve({ success: { [receiver]: txid } }))
//send tokens using the split-utxo .catch(error => reject(error))
var scriptPubKey = split_tx.vout[0].scriptPubKey.hex; } else {
let promises = []; //check for token balance
for (let i in receiver_list) floTokenAPI.getBalance(sender, token).then(token_balance => {
promises.push(sendTokens_raw(privKey, receiver_list[i], token, amount_list[i], split_txid, i, scriptPubKey)); let total_token_amout = amount_list.reduce((a, e) => a + e, 0);
Promise.allSettled(promises).then(results => { if (total_token_amout > token_balance)
let success = Object.fromEntries(results.filter(r => r.status == 'fulfilled').map(r => r.value)); return reject(`Insufficient ${token}# balance`);
let failed = Object.fromEntries(results.filter(r => r.status == 'rejected').map(r => r.reason));
resolve(success, failed); //split utxos
}) floBlockchainAPI.splitUTXOs(sender, privKey, receiver_list.length).then(split_txid => {
//wait for the split utxo to get confirmation
floBlockchainAPI.waitForConfirmation(split_txid).then(split_tx => {
//send tokens using the split-utxo
var scriptPubKey = split_tx.vout[0].scriptPubKey.hex;
let promises = [];
for (let i in receiver_list)
promises.push(sendTokens_raw(privKey, receiver_list[i], token, amount_list[i], split_txid, i, scriptPubKey));
Promise.allSettled(promises).then(results => {
let success = Object.fromEntries(results.filter(r => r.status == 'fulfilled').map(r => r.value));
let failed = Object.fromEntries(results.filter(r => r.status == 'rejected').map(r => r.reason));
resolve({ success, failed });
})
}).catch(error => reject(error))
}).catch(error => reject(error)) }).catch(error => reject(error))
}).catch(error => reject(error)) }).catch(error => reject(error))
}
}).catch(error => reject(error))
}) })
} }