status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(Fix) Duplicated txs (#508) 

* Verify that the last tx was executed before attempting to execute current tx

* fix merge bug

* Properly calculate tx nonce

* rename to a more explanatory name
This commit is contained in:
Fernando 2020-02-10 10:29:33 -03:00 committed by GitHub
parent 165a088b1b
commit 30f3483119
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/routes/safe/store/actions/createTransaction.js
View File

@ -25,24 +25,31 @@ import {
import { getErrorMessage } from '~/test/utils/ethereumErrors'
import { ZERO_ADDRESS } from '~/logic/wallets/ethAddresses'
import { SAFELIST_ADDRESS } from '~/routes/routes'
import type { TransactionProps } from '~/routes/safe/store/models/transaction'
const getLastPendingTxNonce = async (safeAddress: string): Promise<number> => {
let nonce
const getLastTx = async (safeAddress: string): Promise<TransactionProps> => {
try {
const url = buildTxServiceUrl(safeAddress)
const response = await axios.get(url, { params: { limit: 1 } })
const lastTx = response.data.results[0]
nonce = lastTx.nonce + 1
} catch (err) {
// use current's safe nonce as fallback
const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
nonce = (await safeInstance.nonce()).toString()
return response.data.results[0]
} catch (e) {
console.error('failed to retrieve last Tx from server', e)
return null
}
}
return nonce
const getSafeNonce = async (safeAddress: string): Promise<string> => {
// use current's safe nonce as fallback
const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
return (await safeInstance.nonce()).toString()
}
const getNewTxNonce = async (txNonce, lastTx, safeAddress) => {
if (!Number.isInteger(Number.parseInt(txNonce, 10))) {
return lastTx === null ? getSafeNonce(safeAddress) : lastTx.nonce + 1
}
return txNonce
}
type CreateTransactionArgs = {
@ -78,10 +85,9 @@ const createTransaction = ({
const from = userAccountSelector(state)
const safeInstance = await getGnosisSafeInstanceAt(safeAddress)
const threshold = await safeInstance.getThreshold()
const nonce = !Number.isInteger(Number.parseInt(txNonce, 10))
? await getLastPendingTxNonce(safeAddress)
: txNonce
const isExecution = threshold.toNumber() === 1 || shouldExecute
const lastTx = await getLastTx(safeAddress)
const nonce = await getNewTxNonce(txNonce, lastTx, safeAddress)
const isExecution = (lastTx && lastTx.isExecuted && threshold.toNumber() === 1) || shouldExecute
// https://gnosis-safe.readthedocs.io/en/latest/contracts/signatures.html#pre-validated-signatures
const sigs = `0x000000000000000000000000${from.replace(