Merge pull request #55 from subquery/update-jay

Fix types and use tx from log

Ethereum/ethereum-uniswap-v3/src/mappings/core.ts

@@ -34,9 +34,10 @@ import {
 } from "../types/contracts/Pool";
 import { Pool__factory } from "../types/contracts/factories/Pool__factory";
 import assert from "assert";
+import {InitializeLog, MintLog, SwapLog, SwapTransaction} from "../types/abi-interfaces/Pool";
 
 export async function handleInitialize(
-  event: EthereumLog<InitializeEvent["args"]>
+  event: InitializeLog
 ): Promise<void> {
   const [pool, ethPrice] = await Promise.all([
     Pool.get(event.address),
@@ -76,8 +77,9 @@ export async function handleInitialize(
 }
 
 export async function handleMint(
-  event: EthereumLog<MintEvent["args"]>
+  event: MintLog
 ): Promise<void> {
+
   const poolAddress = event.address;
   const pool = await Pool.get(poolAddress);
 
@@ -353,7 +355,7 @@ export async function handleBurn(
 }
 
 export async function handleSwap(
-  event: EthereumLog<SwapEvent["args"]>
+  event: SwapLog
 ): Promise<void> {
   const poolContract = Pool__factory.connect(event.address, api);
   const [
@@ -375,6 +377,7 @@ export async function handleSwap(
   ]);
   assert(pool);
 
+
   // hot fix for bad pricing
   if (pool.id == "0x9663f2ca0454accad3e094448ea6f77443880454") {
     return;

Ethereum/ethereum-uniswap-v3/src/mappings/utils/utils.ts

@@ -48,28 +48,20 @@ export function convertTokenToDecimal(
 }
 
 export async function loadTransaction(
-  event: EthereumLog
+  log: EthereumLog
 ): Promise<Transaction> {
-  let transaction = await Transaction.get(event.transactionHash);
+  let transaction = await Transaction.get(log.transactionHash);
   if (transaction === undefined) {
     transaction = Transaction.create({
-      id: event.transactionHash,
-      blockNumber: BigInt(event.blockNumber),
-      timestamp: event.block.timestamp,
+      id: log.transactionHash,
+      blockNumber: BigInt(log.blockNumber),
+      timestamp: log.block.timestamp,
       gasPrice: BigInt(0),
       gasUsed: BigInt(0),
     });
   }
-
-  // transaction.gasPrice = event.block.gasPrice
-  const eventTransaction = event.block.transactions.find(
-    (transaction) =>
-      transaction.transactionIndex ==
-      BigNumber.from(event.transactionIndex).toBigInt()
-  );
-  assert(eventTransaction);
-  transaction.gasUsed = (await eventTransaction.receipt()).gasUsed;
-  transaction.gasPrice = eventTransaction.gasPrice;
+  transaction.gasUsed = (await log.transaction.receipt()).gasUsed;
+  transaction.gasPrice = log.transaction.gasPrice;
   await transaction.save();
   return transaction;
 }