From 8cbef7a4fa4f667eade0f2e72372dd5f2c855a36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20P=C3=A9rez?= Date: Mon, 9 Oct 2023 17:25:42 +0200 Subject: [PATCH] Pass topic1 to (un/wrap) event decoders) --- ...57001-CreateWrapUnwrapNativeEventsTable.ts | 4 +- ...57002-CreateWrapUnwrapNativeEventsTable.ts | 4 +- ...57003-CreateWrapUnwrapNativeEventsTable.ts | 4 +- ...57004-CreateWrapUnwrapNativeEventsTable.ts | 4 +- ...57005-CreateWrapUnwrapNativeEventsTable.ts | 73 ------------------- ...57000-CreateWrapUnwrapNativeEventsTable.ts | 4 +- ...57006-CreateWrapUnwrapNativeEventsTable.ts | 4 +- ...57007-CreateWrapUnwrapNativeEventsTable.ts | 4 +- ...57008-CreateWrapUnwrapNativeEventsTable.ts | 4 +- src/abis.ts | 9 +-- src/config.ts | 6 +- .../events/wrap_unwrap_native_events.ts | 10 +-- src/scripts/pull_and_save_events_by_topic.ts | 1 - 13 files changed, 28 insertions(+), 103 deletions(-) delete mode 100644 migrations/celo/1696555657005-CreateWrapUnwrapNativeEventsTable.ts diff --git a/migrations/arbitrum/1696555657001-CreateWrapUnwrapNativeEventsTable.ts b/migrations/arbitrum/1696555657001-CreateWrapUnwrapNativeEventsTable.ts index 99128873..780df030 100644 --- a/migrations/arbitrum/1696555657001-CreateWrapUnwrapNativeEventsTable.ts +++ b/migrations/arbitrum/1696555657001-CreateWrapUnwrapNativeEventsTable.ts @@ -11,7 +11,7 @@ const wrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); @@ -39,7 +39,7 @@ const unwrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); diff --git a/migrations/avalanche/1696555657002-CreateWrapUnwrapNativeEventsTable.ts b/migrations/avalanche/1696555657002-CreateWrapUnwrapNativeEventsTable.ts index a637c12b..7a686431 100644 --- a/migrations/avalanche/1696555657002-CreateWrapUnwrapNativeEventsTable.ts +++ b/migrations/avalanche/1696555657002-CreateWrapUnwrapNativeEventsTable.ts @@ -11,7 +11,7 @@ const wrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); @@ -39,7 +39,7 @@ const unwrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); diff --git a/migrations/base/1696555657003-CreateWrapUnwrapNativeEventsTable.ts b/migrations/base/1696555657003-CreateWrapUnwrapNativeEventsTable.ts index a1f4ed4e..bec53b92 100644 --- a/migrations/base/1696555657003-CreateWrapUnwrapNativeEventsTable.ts +++ b/migrations/base/1696555657003-CreateWrapUnwrapNativeEventsTable.ts @@ -11,7 +11,7 @@ const wrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); @@ -39,7 +39,7 @@ const unwrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); diff --git a/migrations/bsc/1696555657004-CreateWrapUnwrapNativeEventsTable.ts b/migrations/bsc/1696555657004-CreateWrapUnwrapNativeEventsTable.ts index a207cc1b..7858ba09 100644 --- a/migrations/bsc/1696555657004-CreateWrapUnwrapNativeEventsTable.ts +++ b/migrations/bsc/1696555657004-CreateWrapUnwrapNativeEventsTable.ts @@ -11,7 +11,7 @@ const wrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); @@ -39,7 +39,7 @@ const unwrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); diff --git a/migrations/celo/1696555657005-CreateWrapUnwrapNativeEventsTable.ts b/migrations/celo/1696555657005-CreateWrapUnwrapNativeEventsTable.ts deleted file mode 100644 index 1940f649..00000000 --- a/migrations/celo/1696555657005-CreateWrapUnwrapNativeEventsTable.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { MigrationInterface, QueryRunner, Table } from 'typeorm'; - -const wrapNativeEvent = new Table({ - name: 'events_celo.wrap_native_events', - columns: [ - { name: 'observed_timestamp', type: 'bigint' }, - { name: 'contract_address', type: 'varchar' }, - { name: 'transaction_hash', type: 'varchar', isPrimary: true }, - { name: 'transaction_index', type: 'bigint' }, - { name: 'log_index', type: 'bigint', isPrimary: true }, - { name: 'block_hash', type: 'varchar' }, - { name: 'block_number', type: 'bigint' }, - { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, - ], -}); - -const createWrapNativeEventIndexQuery = ` - CREATE INDEX wrap_native_events_transaction_hash_index - ON events_celo.wrap_native_events (transaction_hash); - - CREATE INDEX wrap_native_events_block_number_index - ON events_celo.wrap_native_events (block_number); -`; - -const dropWrapNativeEventIndexQuery = ` - DROP INDEX events_celo.wrap_native_events_transaction_hash_index; - DROP INDEX events_celo.wrap_native_events_block_number_index; -`; - -const unwrapNativeEvent = new Table({ - name: 'events_celo.unwrap_native_events', - columns: [ - { name: 'observed_timestamp', type: 'bigint' }, - { name: 'contract_address', type: 'varchar' }, - { name: 'transaction_hash', type: 'varchar', isPrimary: true }, - { name: 'transaction_index', type: 'bigint' }, - { name: 'log_index', type: 'bigint', isPrimary: true }, - { name: 'block_hash', type: 'varchar' }, - { name: 'block_number', type: 'bigint' }, - { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, - ], -}); - -const createUnwrapNativeEventIndexQuery = ` - CREATE INDEX unwrap_native_events_transaction_hash_index - ON events_celo.unwrap_native_events (transaction_hash); - - CREATE INDEX unwrap_native_events_block_number_index - ON events_celo.unwrap_native_events (block_number); -`; - -const dropUnwrapNativeEventIndexQuery = ` - DROP INDEX events_celo.unwrap_native_events_transaction_hash_index; - DROP INDEX events_celo.unwrap_native_events_block_number_index; -`; - -export class CreateWrapUnwrapNativeEventsTable1696555657005 implements MigrationInterface { - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.createTable(wrapNativeEvent); - await queryRunner.query(createWrapNativeEventIndexQuery); - await queryRunner.createTable(unwrapNativeEvent); - await queryRunner.query(createUnwrapNativeEventIndexQuery); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(dropWrapNativeEventIndexQuery); - await queryRunner.dropTable(wrapNativeEvent); - await queryRunner.query(dropUnwrapNativeEventIndexQuery); - await queryRunner.dropTable(unwrapNativeEvent); - } -} diff --git a/migrations/ethereum/1696555657000-CreateWrapUnwrapNativeEventsTable.ts b/migrations/ethereum/1696555657000-CreateWrapUnwrapNativeEventsTable.ts index 611a1512..f806616a 100644 --- a/migrations/ethereum/1696555657000-CreateWrapUnwrapNativeEventsTable.ts +++ b/migrations/ethereum/1696555657000-CreateWrapUnwrapNativeEventsTable.ts @@ -11,7 +11,7 @@ const wrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); @@ -39,7 +39,7 @@ const unwrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); diff --git a/migrations/fantom/1696555657006-CreateWrapUnwrapNativeEventsTable.ts b/migrations/fantom/1696555657006-CreateWrapUnwrapNativeEventsTable.ts index 08b66f86..6118d1d0 100644 --- a/migrations/fantom/1696555657006-CreateWrapUnwrapNativeEventsTable.ts +++ b/migrations/fantom/1696555657006-CreateWrapUnwrapNativeEventsTable.ts @@ -11,7 +11,7 @@ const wrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); @@ -39,7 +39,7 @@ const unwrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); diff --git a/migrations/optimism/1696555657007-CreateWrapUnwrapNativeEventsTable.ts b/migrations/optimism/1696555657007-CreateWrapUnwrapNativeEventsTable.ts index 6288a370..f17d2a8e 100644 --- a/migrations/optimism/1696555657007-CreateWrapUnwrapNativeEventsTable.ts +++ b/migrations/optimism/1696555657007-CreateWrapUnwrapNativeEventsTable.ts @@ -11,7 +11,7 @@ const wrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); @@ -39,7 +39,7 @@ const unwrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); diff --git a/migrations/polygon/1696555657008-CreateWrapUnwrapNativeEventsTable.ts b/migrations/polygon/1696555657008-CreateWrapUnwrapNativeEventsTable.ts index 8d08fea9..ebaaf2fa 100644 --- a/migrations/polygon/1696555657008-CreateWrapUnwrapNativeEventsTable.ts +++ b/migrations/polygon/1696555657008-CreateWrapUnwrapNativeEventsTable.ts @@ -11,7 +11,7 @@ const wrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'dst', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); @@ -39,7 +39,7 @@ const unwrapNativeEvent = new Table({ { name: 'block_hash', type: 'varchar' }, { name: 'block_number', type: 'bigint' }, { name: 'src', type: 'varchar' }, - { name: 'wad', type: 'bigint' }, + { name: 'wad', type: 'numeric' }, ], }); diff --git a/src/abis.ts b/src/abis.ts index 7ea351ab..fef291de 100644 --- a/src/abis.ts +++ b/src/abis.ts @@ -997,18 +997,17 @@ export const ONCHAIN_GOVERNANCE_CALL_SCHEDULED_ABI = { export const WRAP_NATIVE_ABI = { anonymous: false, inputs: [ - { indexed: true, internalType: 'address', name: 'dst', type: 'address' }, - { indexed: false, internalType: 'uint256', name: 'wad', type: 'uint256' }, + { indexed: true, name: 'dst', type: 'address' }, + { indexed: false, name: 'wad', type: 'uint256' }, ], name: 'Deposit', type: 'event', }; - export const UNWRAP_NATIVE_ABI = { anonymous: false, inputs: [ - { indexed: true, internalType: 'address', name: 'src', type: 'address' }, - { indexed: false, internalType: 'uint256', name: 'wad', type: 'uint256' }, + { indexed: true, name: 'src', type: 'address' }, + { indexed: false, name: 'wad', type: 'uint256' }, ], name: 'Withdrawal', type: 'event', diff --git a/src/config.ts b/src/config.ts index f60b761b..283541fd 100644 --- a/src/config.ts +++ b/src/config.ts @@ -390,7 +390,9 @@ validateStartBlock( DEFAULT_FEAT_WRAP_UNWRAP_NATIVE_EVENT, ); -export const WRAP_UNWRAP_NATIVE_CONTRACT_ADDRESS = process.env.WRAP_UNWRAP_NATIVE_CONTRACT_ADDRESS ? process.env.WRAP_UNWRAP_NATIVE_CONTRACT_ADDRESS : DEFAULT_WRAP_UNWRAP_NATIVE_CONTRACT_ADDRESS; +export const WRAP_UNWRAP_NATIVE_CONTRACT_ADDRESS = process.env.WRAP_UNWRAP_NATIVE_CONTRACT_ADDRESS + ? process.env.WRAP_UNWRAP_NATIVE_CONTRACT_ADDRESS + : DEFAULT_WRAP_UNWRAP_NATIVE_CONTRACT_ADDRESS; export const KAFKA_BROKERS = process.env.KAFKA_BROKERS ? process.env.KAFKA_BROKERS.split(',') : []; if (KAFKA_BROKERS.length === 0) { @@ -421,6 +423,4 @@ function validateStartBlock(startBlockVar: string, startBlock: number, featureFl `${featureFlagVar} is enabled but ${startBlockVar} is not set. Please set ${startBlockVar} or disable the feature`, ); } - console.log(startBlock) - console.log(featureFlag) } diff --git a/src/parsers/events/wrap_unwrap_native_events.ts b/src/parsers/events/wrap_unwrap_native_events.ts index 0fa4ec95..e2fdab88 100644 --- a/src/parsers/events/wrap_unwrap_native_events.ts +++ b/src/parsers/events/wrap_unwrap_native_events.ts @@ -8,15 +8,16 @@ import { BigNumber } from '@0x/utils'; export function parseWrapNativeEvent(eventLog: RawLogEntry): WrapNativeEvent { const wrapNativeEvent = new WrapNativeEvent(); + parseEvent(eventLog, wrapNativeEvent); // decode the basic info - const decodedLog = abiCoder.decodeLog(WRAP_NATIVE_ABI.inputs, eventLog.data); + // + + const decodedLog = abiCoder.decodeLog(WRAP_NATIVE_ABI.inputs, eventLog.data, [eventLog.topics[1]]); wrapNativeEvent.dst = decodedLog.dst.toLowerCase(); wrapNativeEvent.wad = new BigNumber(decodedLog.wad); - console.log(decodedLog); - return wrapNativeEvent; } @@ -24,8 +25,7 @@ export function parseUnwrapNativeEvent(eventLog: RawLogEntry): UnwrapNativeEvent const unwrapNativeEvent = new UnwrapNativeEvent(); parseEvent(eventLog, unwrapNativeEvent); // decode the basic info - const decodedLog = abiCoder.decodeLog(UNWRAP_NATIVE_ABI.inputs, eventLog.data); - console.log(decodedLog); + const decodedLog = abiCoder.decodeLog(UNWRAP_NATIVE_ABI.inputs, eventLog.data, [eventLog.topics[1]]); unwrapNativeEvent.src = decodedLog.src.toLowerCase(); unwrapNativeEvent.wad = new BigNumber(decodedLog.wad); diff --git a/src/scripts/pull_and_save_events_by_topic.ts b/src/scripts/pull_and_save_events_by_topic.ts index 568eb3a9..385b2f78 100644 --- a/src/scripts/pull_and_save_events_by_topic.ts +++ b/src/scripts/pull_and_save_events_by_topic.ts @@ -57,7 +57,6 @@ export class EventsByTopicScraper { ), ); } - console.log(props.name); }); const txHashes = [