Skip to content

MILLIX-172: optimization #14

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

Open
antonshulpekov wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

MILLIX-172: optimization #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e80219
MILLIX-172: optimization
AntonSh23 Apr 28, 2022
05c25f5
MILLIX-172: optimization
AntonSh23 Apr 29, 2022
ed0a790
MILLIX-172: remove console.logs
AntonSh23 Apr 29, 2022
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
39 changes: 9 additions & 30 deletions api/P2LMh8NsUTkpWAH3/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,36 +37,15 @@ class _P2LMh8NsUTkpWAH3 extends Endpoint {
});
}

if (_.isArray(transactionIdList)) {
async.eachSeries(transactionIdList, (transaction, callback) => {
wallet.resetTransactionValidationByTransactionId(transaction)
.then(() => callback())
.catch((e) => callback(true, e));
}, (error, exception) => {
if (error) {
res.send({
api_status : 'fail',
api_message: `unexpected generic api error: (${exception})`
});
}
else {
res.send({
api_status: 'success'
});
}
});

}
else {
wallet.resetTransactionValidationByTransactionId(transactionIdList)
.then(() => res.send({
api_status: 'success'
}))
.catch(e => res.send({
api_status : 'fail',
api_message: `unexpected generic api error: (${e})`
}));
}
let transactionIdSet = new Set(transactionIdList);
wallet.resetTransactionValidationByTransactionId(transactionIdSet)
.then(() => res.send({
api_status: 'success'
}))
.catch(e => res.send({
api_status : 'fail',
api_message: `unexpected generic api error: (${e})`
}));
}
}

Expand Down
10 changes: 8 additions & 2 deletions api/QISzUVake29059bi/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@ class _QISzUVake29059bi extends Endpoint {
* @returns {*}
*/
handler(app, req, res) {
wallet.resetTransactionValidationRejected();
res.send({success: true});
wallet.resetTransactionValidationRejected()
.then(() => res.send({
api_status: 'success'
}))
.catch(e => res.send({
api_status : 'fail',
api_message: `unexpected generic api error: (${e})`
}));
}
}

Expand Down
58 changes: 32 additions & 26 deletions core/wallet/wallet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,37 +689,39 @@ class Wallet {
return walletTransactionConsensus;
}

resetTransactionValidationByTransactionId(transactionID) {
resetTransactionValidationByTransactionId(transactionList) {
return database.applyShards(shardID => {
const transactionRepository = database.getRepository('transaction', shardID);
return transactionRepository.getTransactionObject(transactionID)
.then((transaction) => {
if (transaction) { // transaction data not found
return transactionRepository.resetTransaction(transactionID)
.then(() => {
return this.resetValidation(new Set([transaction.transaction_id]), shardID);
});
}
});
return this.resetTransactionValidation(new Set(transactionList), shardID);
});
}

resetTransactionValidation(transactionSet, shardId) {
return new Promise(resolve => {
const transactionRepository = database.getRepository('transaction', shardId);
async.eachSeries(transactionSet, (transaction, callback) => {
walletTransactionConsensus.removeFromRejectedTransactions(transaction);
walletTransactionConsensus.removeFromRetryTransactions(transaction);
transactionRepository.resetTransaction(transaction)
.then(() => callback())
.catch(() => callback());
}, () => {
this.resetValidation(transactionSet, shardId).then(() => {
resolve(transactionSet);
});
});
});

}

resetTransactionValidationRejected() {
walletTransactionConsensus.resetTransactionValidationRejected();
database.applyShards(shardID => {
return database.applyShards(shardID => {
const transactionRepository = database.getRepository('transaction', shardID);
return transactionRepository.listWalletTransactionOutputNotSpent(this.defaultKeyIdentifier)
.then(transactions => new Promise(resolve => {
async.eachSeries(transactions, (transaction, callback) => {
walletTransactionConsensus.removeFromRejectedTransactions(transaction.transaction_id);
walletTransactionConsensus.removeFromRetryTransactions(transaction.transaction_id);
transactionRepository.resetTransaction(transaction.transaction_id)
.then(() => callback())
.catch(() => callback());
}, () => resolve(new Set(_.map(transactions, t => t.transaction_id))));
}))
.then(rootTransactions => this.resetValidation(rootTransactions, shardID));
}).then(_ => _);
.then(transactions => {
return this.resetTransactionValidation(new Set(_.map(transactions, t => t.transaction_id)), shardID)
});
});
}

resetValidation(rootTransactions, shardID) {
Expand All @@ -741,9 +743,13 @@ class Wallet {
}).catch(() => callback());
}, () => {
async.eachSeries(listInputTransactionIdSpendingTransaction, (transactionID, callback) => {
transactionRepository.resetTransaction(transactionID)
.then(() => callback())
.catch(() => callback());
if (!visited.has(transactionID)) {
transactionRepository.resetTransaction(transactionID)
.then(() => callback())
.catch(() => callback());
} else {
callback();
}
}, () => {
if (listInputTransactionIdSpendingTransaction.size > 0) {
dfs(listInputTransactionIdSpendingTransaction, visited);
Expand Down