tornadocontrib/tokenbridge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix resend of stuck pending transactions (#514)

Browse Source
This commit is contained in:
Kirill Fedoseev 2021-02-25 01:11:28 +03:00 committed by GitHub
parent 894134ba26
commit 626f9376b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
oracle/src/sender.js
View File

@ -173,15 +173,18 @@ async function main({ msg, ackMsg, nackMsg, channel, scheduleForRetry, scheduleT
`Tx Failed for event Tx ${job.transactionReference}.`, `Tx Failed for event Tx ${job.transactionReference}.`,
e.message e.message
) )
if (!e.message.toLowerCase().includes('transaction with the same hash was already imported')) {
if (isResend) { const message = e.message.toLowerCase()
resendJobs.push(job) if (isResend || message.includes('transaction with the same hash was already imported')) {
} else { resendJobs.push(job)
failedTx.push(job) } else {
} // if initial transaction sending has failed not due to the same hash error
// send it to the failed tx queue
// this will result in the sooner resend attempt than if using resendJobs
failedTx.push(job)
} }
if (e.message.toLowerCase().includes('insufficient funds')) { if (message.includes('insufficient funds')) {
insufficientFunds = true insufficientFunds = true
const currentBalance = await web3Instance.eth.getBalance(ORACLE_VALIDATOR_ADDRESS) const currentBalance = await web3Instance.eth.getBalance(ORACLE_VALIDATOR_ADDRESS)
minimumBalance = gasLimit.multipliedBy(gasPrice) minimumBalance = gasLimit.multipliedBy(gasPrice)