Skip to content
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

PSS-953 | Soft fork problem #257

Merged
merged 2 commits into from
May 17, 2021
Merged

PSS-953 | Soft fork problem #257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff3052
feat: improve transaction processing, added block confirmation.
Pobepto May 17, 2021
5383f96
Merge branch 'develop' into fix/pss-953
Pobepto May 17, 2021
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
17 changes: 14 additions & 3 deletions src/store/bridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,23 @@ async function waitForApprovedRequest (hash: string): Promise<BridgeApprovedRequ

async function waitForEthereumTransactionStatus (hash: string): Promise<Transaction> {
const web3 = await web3Util.getInstance()
const result = await web3.eth.getTransaction(hash)
if (!result.blockNumber) {
const initialTx = await web3.eth.getTransaction(hash)
const blocksToWait = 5
if (!initialTx.blockNumber) {
await delay(SORA_REQUESTS_TIMEOUT)
return waitForEthereumTransactionStatus(hash)
} else {
const latestBlock = await web3.eth.getBlockNumber()
const blockDiff = latestBlock - initialTx.blockNumber
if (blockDiff >= blocksToWait) {
const currentTx = await web3.eth.getTransaction(hash)
if (currentTx.blockNumber) return currentTx
throw new Error(`Transaction (${hash}) does not exist / ended up as uncle block`)
} else {
await delay(SORA_REQUESTS_TIMEOUT)
return waitForEthereumTransactionStatus(hash)
}
}
return result
}

interface EthLogData {
Expand Down