From 12a99ed383476ebd54ce682ed0de44a9b3b5f661 Mon Sep 17 00:00:00 2001 From: phamphong9981 Date: Wed, 28 Aug 2024 16:18:51 +0700 Subject: [PATCH] refactor: evm proxy history batch query bytecode --- .../evm/crawl_evm_proxy_history.service.ts | 67 ++++++++++++++----- src/services/evm/helpers/contract_helper.ts | 11 +-- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/src/services/evm/crawl_evm_proxy_history.service.ts b/src/services/evm/crawl_evm_proxy_history.service.ts index b4505e966..daa89c4ff 100644 --- a/src/services/evm/crawl_evm_proxy_history.service.ts +++ b/src/services/evm/crawl_evm_proxy_history.service.ts @@ -2,7 +2,7 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable no-restricted-syntax */ import { Service } from '@ourparentcenter/moleculer-decorators-extended'; -import _ from 'lodash'; +import _, { Dictionary } from 'lodash'; import { ServiceBroker } from 'moleculer'; import { PublicClient, @@ -74,14 +74,31 @@ export default class CrawlProxyContractEVMService extends BullableService { const evmEvents = await EvmEvent.query() .select('*') .where('block_height', '>', startBlock) - .andWhere('block_height', '<=', endBlock); - const proxyContractDb = await EVMSmartContract.query().whereIn('type', [ - EVMSmartContract.TYPES.PROXY_EIP_1967, - EVMSmartContract.TYPES.PROXY_EIP_1822, - EVMSmartContract.TYPES.PROXY_OPEN_ZEPPELIN_IMPLEMENTATION, - EVMSmartContract.TYPES.PROXY_EIP_1167, - ]); - + .andWhere('block_height', '<=', endBlock) + .select('address', 'topic0', 'topic1', 'block_height', 'tx_hash'); + const proxyContractDb = await EVMSmartContract.query() + .whereIn('type', [ + EVMSmartContract.TYPES.PROXY_EIP_1967, + EVMSmartContract.TYPES.PROXY_EIP_1822, + EVMSmartContract.TYPES.PROXY_OPEN_ZEPPELIN_IMPLEMENTATION, + EVMSmartContract.TYPES.PROXY_EIP_1167, + ]) + .select('address'); + const distictAddresses = _.uniq(evmEvents.map((e) => e.address)); + const batchReqs: any[] = []; + distictAddresses.forEach((address) => { + batchReqs.push( + this.viemClient.getBytecode({ + address: address as `0x${string}`, + }) + ); + }); + const results = await Promise.all(batchReqs); + const bytecodes: Dictionary = {}; + distictAddresses.forEach((address, index) => { + bytecodes[address] = results[index]; + }); + const lastUpdatedHeight = await this.viemClient.getBlockNumber(); for (const evmEvent of evmEvents) { let implementationAddress = null; const anyProxyHistory = await EvmProxyHistory.query() @@ -122,11 +139,10 @@ export default class CrawlProxyContractEVMService extends BullableService { _.find( EIPProxyContractSupportByteCode, (value, __) => value.TYPE === evmEventProxy.type - )?.SLOT + )?.SLOT, + undefined, + bytecodes[evmEvent.address] ); - - newJSONProxy.last_updated_height = - await this.viemClient.getBlockNumber(); } break; } @@ -136,14 +152,31 @@ export default class CrawlProxyContractEVMService extends BullableService { _.toLower(implementationAddress as string) || null; newJSONProxy.block_height = evmEvent.block_height; newJSONProxy.tx_hash = evmEvent.tx_hash; - + newJSONProxy.last_updated_height = lastUpdatedHeight; newProxyHistories.push(EvmProxyHistory.fromJson(newJSONProxy)); } - const newProxyContractsToSave = _.filter( - newProxyHistories, - (proxyContract) => proxyContract.implementation_contract !== null + // check evm_smart_contract if proxy_contract is existed + const foundContractsInDB = _.keyBy( + await EVMSmartContract.query().whereIn( + 'address', + newProxyHistories.map((e) => e.proxy_contract) + ), + 'address' ); + const newProxyContractsToSave: EvmProxyHistory[] = []; + newProxyHistories.forEach((proxyHistory) => { + if ( + proxyHistory.implementation_contract !== null && + foundContractsInDB[proxyHistory.proxy_contract] !== undefined + ) { + newProxyContractsToSave.push(proxyHistory); + } else { + this.logger.warn( + `This contract address ${proxyHistory.proxy_contract} is not proxy, at tx hash ${proxyHistory.tx_hash}` + ); + } + }); const newProxyContracts: EvmProxyHistory[] = []; await knex.transaction(async (trx) => { if (newProxyContractsToSave.length > 0) { diff --git a/src/services/evm/helpers/contract_helper.ts b/src/services/evm/helpers/contract_helper.ts index f789f5861..991240802 100644 --- a/src/services/evm/helpers/contract_helper.ts +++ b/src/services/evm/helpers/contract_helper.ts @@ -66,11 +66,14 @@ export class ContractHelper { public async isContractProxy( contractAddress: string, blockHeight?: number | string, - byteCodeSlot?: string + byteCodeSlot?: string, + bytecode?: string ): Promise { - const byteCode = await this.viemClient.getBytecode({ - address: contractAddress as `0x${string}`, - }); + const byteCode = + bytecode || + (await this.viemClient.getBytecode({ + address: contractAddress as `0x${string}`, + })); let result: DetectEVMProxyContract | null; if (!byteCode) { return null;