From 09f2a2a5476c4c119c7294f496f6590156d8d07a Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 16 Apr 2019 17:07:47 -0230 Subject: Adds 4byte registry fallback to getMethodData() (#6435) * Get contract method data from 4byte if we can't get it from eth-method-registry * Clarify token method name fallback code in getMethodData * Bugfix: don't attempt to translate falsy actionKeys in confirm-transaction-base.component.js * Rewrite getMethodFrom4Byte with async-await * Call four byte and method-registry requests in parallel in getMethodData() --- ui/app/helpers/utils/transactions.util.js | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'ui/app/helpers/utils/transactions.util.js') diff --git a/ui/app/helpers/utils/transactions.util.js b/ui/app/helpers/utils/transactions.util.js index cb6c9536c..8d96b1487 100644 --- a/ui/app/helpers/utils/transactions.util.js +++ b/ui/app/helpers/utils/transactions.util.js @@ -30,6 +30,21 @@ export function getTokenData (data = '') { return abiDecoder.decodeMethod(data) } +async function getMethodFrom4Byte (fourBytePrefix) { + const fourByteResponse = (await fetch(`https://www.4byte.directory/api/v1/signatures/?hex_signature=${fourBytePrefix}`, { + referrerPolicy: 'no-referrer-when-downgrade', + body: null, + method: 'GET', + mode: 'cors', + })).json() + + if (fourByteResponse.count === 1) { + return fourByteResponse.results[0].text_signature + } else { + return null + } +} + const registry = new MethodRegistry({ provider: global.ethereumProvider }) /** @@ -43,7 +58,16 @@ const registry = new MethodRegistry({ provider: global.ethereumProvider }) const fourBytePrefix = prefixedData.slice(0, 10) try { - const sig = await registry.lookup(fourBytePrefix) + const fourByteSig = getMethodFrom4Byte(fourBytePrefix).catch((e) => { + log.error(e) + return null + }) + + let sig = await registry.lookup(fourBytePrefix) + + if (!sig) { + sig = await fourByteSig + } if (!sig) { return {} @@ -57,8 +81,8 @@ const registry = new MethodRegistry({ provider: global.ethereumProvider }) } } catch (error) { log.error(error) - const contractData = getTokenData(data) - const { name } = contractData || {} + const tokenData = getTokenData(data) + const { name } = tokenData || {} return { name } } -- cgit