Reduce instances of cached contract addresses

app/util/transactions.js

@@ -3,6 +3,7 @@ import { rawEncode, rawDecode } from 'ethereumjs-abi';
 import Engine from '../core/Engine';
 import { strings } from '../../locales/i18n';
 import contractMap from 'eth-contract-metadata';
+import { isSmartContractCode } from 'gaba/util';
 
 export const TOKEN_METHOD_TRANSFER = 'transfer';
 export const TOKEN_METHOD_APPROVE = 'approve';
@@ -29,14 +30,6 @@ class ActionKeys {
 	static cache = {};
 }
 
-/**
- * Utility class with the single responsibility
- * of caching SmartContractAddresses
- */
-class SmartContractAddresses {
-	static cache = {};
-}
-
 /**
  * Utility class with the single responsibility
  * of caching CollectibleAddresses
@@ -143,22 +136,15 @@ export function getMethodData(data) {
  * @returns {boolean} - Wether the given address is a contract
  */
 export async function isSmartContractAddress(address) {
-	const cache = SmartContractAddresses.cache[address];
-	if (cache) {
-		return Promise.resolve(cache);
-	}
-
+	address = toChecksumAddress(address);
+	// If in contract map we don't need to cache it
 	if (contractMap[address]) {
-		SmartContractAddresses.cache[address] = true;
 		return Promise.resolve(true);
 	}
-
 	const { TransactionController } = Engine.context;
 	const code = address ? await TransactionController.query('getCode', [address]) : undefined;
-	// Geth will return '0x', and ganache-core v2.2.1 will return '0x0'
-	const codeIsEmpty = !code || code === '0x' || code === '0x0';
-	SmartContractAddresses.cache[address] = !codeIsEmpty;
-	return !codeIsEmpty;
+	const isSmartContract = isSmartContractCode(code);
+	return isSmartContract;
 }
 
 /**
@@ -219,7 +205,8 @@ export async function getTransactionActionKey(transaction) {
 			return ret;
 		}
 	}
-	const toSmartContract = await isSmartContractAddress(to);
+	const toSmartContract =
+		transaction.toSmartContract !== undefined ? transaction.toSmartContract : await isSmartContractAddress(to);
 	if (toSmartContract) {
 		// There is no data or unknown method data, if is smart contract
 		ret = SMART_CONTRACT_INTERACTION_ACTION_KEY;

app/util/transactions.test.js

@@ -98,6 +98,20 @@ describe('Transactions utils :: isSmartContractAddress', () => {
 		await isSmartContractAddress('0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359');
 		expect(stub).not.toBeCalled();
 	});
+
+	it('isSmartContractAddress should call query if not cached', async () => {
+		Engine.context = MOCK_ENGINE.context;
+		const stub = spyOn(Engine.context.TransactionController, 'query');
+		await isSmartContractAddress('0x1', '0x123');
+		expect(stub).toBeCalled();
+	});
+
+	it('isSmartContractAddress should call query if only address was provided', async () => {
+		Engine.context = MOCK_ENGINE.context;
+		const stub = spyOn(Engine.context.TransactionController, 'query');
+		await isSmartContractAddress('0x1');
+		expect(stub).toBeCalled();
+	});
 });
 
 describe('Transactions utils :: getTransactionActionKey', () => {
@@ -109,21 +123,27 @@ describe('Transactions utils :: getTransactionActionKey', () => {
 	const randomData = '0x987654321';
 	const transferFromData = '0x23b872dd0000000000000000000000000000';
 	it('getTransactionActionKey send ether', async () => {
-		const get = await getTransactionActionKey({ transactionHash: '0x1', transaction: {} });
+		const get = await getTransactionActionKey({ transactionHash: '0x1', transaction: { to: '0x0' } });
 		expect(get).toEqual(SEND_ETHER_ACTION_KEY);
 	});
 
 	it('getTransactionActionKey send ether with empty data', async () => {
-		const get = await getTransactionActionKey({ transactionHash: '0x1', transaction: { data: '0x' } });
+		const get = await getTransactionActionKey({ transactionHash: '0x1', transaction: { data: '0x', to: '0x0' } });
 		expect(get).toEqual(SEND_ETHER_ACTION_KEY);
 	});
 	it('getTransactionActionKey send token', async () => {
-		const get = await getTransactionActionKey({ transactionHash: '0x2', transaction: { data: transferData } });
+		const get = await getTransactionActionKey({
+			transactionHash: '0x2',
+			transaction: { data: transferData, to: '0x0' }
+		});
 		expect(get).toEqual(SEND_TOKEN_ACTION_KEY);
 	});
 
 	it('getTransactionActionKey send collectible', async () => {
-		const get = await getTransactionActionKey({ transactionHash: '0x6', transaction: { data: transferFromData } });
+		const get = await getTransactionActionKey({
+			transactionHash: '0x6',
+			transaction: { data: transferFromData, to: '0x0' }
+		});
 		expect(get).toEqual(TRANSFER_FROM_ACTION_KEY);
 	});