@@ -156,14 +156,14 @@ export default class Transaction {
...
@@ -156,14 +156,14 @@ export default class Transaction {
this.database.all('SELECT * FROM (SELECT `transaction`.* FROM `transaction` '+
this.database.all('SELECT * FROM (SELECT `transaction`.* FROM `transaction` '+
'INNER JOIN transaction_input ON transaction_input.transaction_id = `transaction`.transaction_id '+
'INNER JOIN transaction_input ON transaction_input.transaction_id = `transaction`.transaction_id '+
'INNER JOIN transaction_output ON transaction_output.transaction_id = transaction_input.transaction_id '+
'INNER JOIN transaction_output ON transaction_output.transaction_id = transaction_input.transaction_id '+
'WHERE transaction_input.address_key_identifier = ?1 '+(excludeTransactionIDList&&excludeTransactionIDList.length>0?'AND `transaction`.transaction_id NOT IN ('+excludeTransactionIDList.map((_,idx)=>`?${idx+2}`).join(',')+')':'')+'AND transaction_output.is_stable = 0 ORDER BY transaction_date LIMIT '+config.CONSENSUS_VALIDATION_PARALLEL_PROCESS_MAX+')'+
'WHERE transaction_input.address_key_identifier = ?1 '+(excludeTransactionIDList&&excludeTransactionIDList.length>0?'AND `transaction`.transaction_id NOT IN ('+excludeTransactionIDList.map((_,idx)=>`?${idx+2}`).join(',')+')':'')+'AND transaction_output.is_stable = 0 ORDER BY transaction_date DESC LIMIT '+config.CONSENSUS_VALIDATION_PARALLEL_PROCESS_MAX+') '+
'UNION SELECT * FROM (SELECT `transaction`.* FROM `transaction` '+
'UNION SELECT * FROM (SELECT `transaction`.* FROM `transaction` '+
'INNER JOIN transaction_output ON transaction_output.transaction_id = `transaction`.transaction_id '+
'INNER JOIN transaction_output ON transaction_output.transaction_id = `transaction`.transaction_id '+
'WHERE transaction_output.address_key_identifier = ?1 '+(excludeTransactionIDList&&excludeTransactionIDList.length>0?'AND `transaction`.transaction_id NOT IN ('+excludeTransactionIDList.map((_,idx)=>`?${idx+2}`).join(',')+')':'')+'AND transaction_output.is_stable = 0 ORDER BY transaction_date LIMIT '+config.CONSENSUS_VALIDATION_PARALLEL_PROCESS_MAX+')'+
'WHERE transaction_output.address_key_identifier = ?1 '+(excludeTransactionIDList&&excludeTransactionIDList.length>0?'AND `transaction`.transaction_id NOT IN ('+excludeTransactionIDList.map((_,idx)=>`?${idx+2}`).join(',')+')':'')+'AND transaction_output.is_stable = 0 ORDER BY transaction_date DESC LIMIT '+config.CONSENSUS_VALIDATION_PARALLEL_PROCESS_MAX+') '+
'UNION SELECT * FROM (SELECT t.* FROM transaction_input i'+
'UNION SELECT * FROM (SELECT `transaction`.* FROM transaction_input'+
'INNER JOIN `transaction` t ON t.transaction_id = i.transaction_id '+
'INNER JOIN `transaction` ON `transaction`.transaction_id = transaction_input.transaction_id '+
'WHERE output_transaction_id IN (SELECT transaction_id FROM transaction_output WHERE address_key_identifier = ?1 '+
'WHERE output_transaction_id IN (SELECT transaction_id FROM transaction_output WHERE address_key_identifier = ?1 '+
'AND is_stable = 1 AND is_spent = 1 AND status = 2) '+(excludeTransactionIDList&&excludeTransactionIDList.length>0?'AND `transaction`.transaction_id NOT IN ('+excludeTransactionIDList.map((_,idx)=>`?${idx+2}`).join(',')+')':'')+'AND t.is_stable = 0 ORDER BY transaction_date LIMIT '+config.CONSENSUS_VALIDATION_PARALLEL_PROCESS_MAX+')',
'AND is_stable = 1 AND is_spent = 1 AND status = 2) '+(excludeTransactionIDList&&excludeTransactionIDList.length>0?'AND `transaction`.transaction_id NOT IN ('+excludeTransactionIDList.map((_,idx)=>`?${idx+2}`).join(',')+')':'')+'AND `transaction`.is_stable = 0 ORDER BY transaction_date DESC LIMIT '+config.CONSENSUS_VALIDATION_PARALLEL_PROCESS_MAX+') ',
[
[
addressKeyIdentifier
addressKeyIdentifier
].concat(excludeTransactionIDList),
].concat(excludeTransactionIDList),
...
@@ -1034,7 +1034,8 @@ export default class Transaction {
...
@@ -1034,7 +1034,8 @@ export default class Transaction {
on i.output_transaction_id = s.transaction_id
on i.output_transaction_id = s.transaction_id
)
)
select transaction_id
select transaction_id
from transaction_invalid_spenders where status != 3;
from transaction_invalid_spenders
where status != 3;
update 'transaction'
update 'transaction'
set status = 3,
set status = 3,
is_stable = 1,
is_stable = 1,
...
@@ -1783,68 +1784,51 @@ export default class Transaction {
...
@@ -1783,68 +1784,51 @@ export default class Transaction {