status-im/safe-react
2
0
Fork 0
mirror of https://github.com/status-im/safe-react.git synced 2025-01-26 17:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Bug: incoming transactions do not load if it fails to fetch gas for a transaction (#1321)

Browse Source 
* check if gas returned values are valid when loading token info for incoming tx

* Fix generateBatchRequests

Co-authored-by: Daniel Sanchez <daniel.sanchez@gnosis.pm>
This commit is contained in:
Mikhail Mikheev 2020-09-04 18:25:25 +04:00 committed by GitHub
parent bfed9679f7
commit 372d27f5a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/logic/contracts/generateBatchRequests.ts
View File

@ -10,8 +10,9 @@ import { web3ReadOnly as web3 } from 'src/logic/wallets/getWeb3'
* @param {array<{ args: [any], method: string, type: 'eth'|undefined } | string>} args.methods - methods to be called * @param {array<{ args: [any], method: string, type: 'eth'|undefined } | string>} args.methods - methods to be called
* @returns {Promise<[*]>} * @returns {Promise<[*]>}
*/ */
const generateBatchRequests = ({ abi, address, batch = new web3.BatchRequest() , context, methods }: any): any => { const generateBatchRequests = ({ abi, address, batch, context, methods }: any): any => {
const contractInstance: any = new web3.eth.Contract(abi, address) const contractInstance: any = new web3.eth.Contract(abi, address)
const localBatch = new web3.BatchRequest()
const values = methods.map((methodObject) => { const values = methods.map((methodObject) => {
let method, type, args = [] let method, type, args = []
@ -39,14 +40,14 @@ const generateBatchRequests = ({ abi, address, batch = new web3.BatchRequest() ,
request = contractInstance.methods[method](...args).call.request(resolver) request = contractInstance.methods[method](...args).call.request(resolver)
} }
batch.add(request) batch ? batch.add(request) : localBatch.add(request)
} catch (e) { } catch (e) {
resolve(null) resolve(null)
} }
}) })
}) })
batch.execute() !batch && localBatch.execute()
const returnValues = context ? [context, ...values] : values const returnValues = context ? [context, ...values] : values