Add EIP1559 Gas fields

Ktl-XV · Ktl-XV · commit fdee74b40b92 · 2022-04-21T17:00:23.000-05:00
diff --git a/event-pipeline-evm/migrations/avalanche/1650574957000-AddGasMarketFieldsToBlocks.ts b/event-pipeline-evm/migrations/avalanche/1650574957000-AddGasMarketFieldsToBlocks.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToBlocks1650574957000 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks ADD base_fee_per_gas int8 NULL;
+             ALTER TABLE ${schema}.blocks ADD gas_used int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks DROP COLUMN base_fee_per_gas;
+             ALTER TABLE ${schema}.blocks DROP COLUMN gas_used;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/avalanche/1650574957001-AddGasMarketFieldsToTransactions.ts b/event-pipeline-evm/migrations/avalanche/1650574957001-AddGasMarketFieldsToTransactions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToTransactions1650574957001 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions ADD "type" int NULL;
+            ALTER TABLE ${schema}.transactions ADD max_fee_per_gas int8 NULL;
+            ALTER TABLE ${schema}.transactions ADD max_priority_fee_per_gas int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions DROP COLUMN "type";
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_fee_per_gas;
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_priority_fee_per_gas;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/bsc/1650574957000-AddGasMarketFieldsToBlocks.ts b/event-pipeline-evm/migrations/bsc/1650574957000-AddGasMarketFieldsToBlocks.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToBlocks1650574957000 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks ADD base_fee_per_gas int8 NULL;
+             ALTER TABLE ${schema}.blocks ADD gas_used int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks DROP COLUMN base_fee_per_gas;
+             ALTER TABLE ${schema}.blocks DROP COLUMN gas_used;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/bsc/1650574957001-AddGasMarketFieldsToTransactions.ts b/event-pipeline-evm/migrations/bsc/1650574957001-AddGasMarketFieldsToTransactions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToTransactions1650574957001 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions ADD "type" int NULL;
+            ALTER TABLE ${schema}.transactions ADD max_fee_per_gas int8 NULL;
+            ALTER TABLE ${schema}.transactions ADD max_priority_fee_per_gas int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions DROP COLUMN "type";
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_fee_per_gas;
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_priority_fee_per_gas;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/celo/1650574957000-AddGasMarketFieldsToBlocks.ts b/event-pipeline-evm/migrations/celo/1650574957000-AddGasMarketFieldsToBlocks.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToBlocks1650574957000 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks ADD base_fee_per_gas int8 NULL;
+             ALTER TABLE ${schema}.blocks ADD gas_used int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks DROP COLUMN base_fee_per_gas;
+             ALTER TABLE ${schema}.blocks DROP COLUMN gas_used;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/celo/1650574957001-AddGasMarketFieldsToTransactions.ts b/event-pipeline-evm/migrations/celo/1650574957001-AddGasMarketFieldsToTransactions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToTransactions1650574957001 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions ADD "type" int NULL;
+            ALTER TABLE ${schema}.transactions ADD max_fee_per_gas int8 NULL;
+            ALTER TABLE ${schema}.transactions ADD max_priority_fee_per_gas int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions DROP COLUMN "type";
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_fee_per_gas;
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_priority_fee_per_gas;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/ethereum/1650574957000-AddGasMarketFieldsToBlocks.ts b/event-pipeline-evm/migrations/ethereum/1650574957000-AddGasMarketFieldsToBlocks.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToBlocks1650574957000 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks ADD base_fee_per_gas int8 NULL;
+             ALTER TABLE ${schema}.blocks ADD gas_used int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks DROP COLUMN base_fee_per_gas;
+             ALTER TABLE ${schema}.blocks DROP COLUMN gas_used;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/ethereum/1650574957001-AddGasMarketFieldsToTransactions.ts b/event-pipeline-evm/migrations/ethereum/1650574957001-AddGasMarketFieldsToTransactions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToTransactions1650574957001 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions ADD "type" int NULL;
+            ALTER TABLE ${schema}.transactions ADD max_fee_per_gas int8 NULL;
+            ALTER TABLE ${schema}.transactions ADD max_priority_fee_per_gas int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions DROP COLUMN "type";
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_fee_per_gas;
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_priority_fee_per_gas;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/fantom/1650574957000-AddGasMarketFieldsToBlocks.ts b/event-pipeline-evm/migrations/fantom/1650574957000-AddGasMarketFieldsToBlocks.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToBlocks1650574957000 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks ADD base_fee_per_gas int8 NULL;
+             ALTER TABLE ${schema}.blocks ADD gas_used int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks DROP COLUMN base_fee_per_gas;
+             ALTER TABLE ${schema}.blocks DROP COLUMN gas_used;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/fantom/1650574957001-AddGasMarketFieldsToTransactions.ts b/event-pipeline-evm/migrations/fantom/1650574957001-AddGasMarketFieldsToTransactions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToTransactions1650574957001 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions ADD "type" int NULL;
+            ALTER TABLE ${schema}.transactions ADD max_fee_per_gas int8 NULL;
+            ALTER TABLE ${schema}.transactions ADD max_priority_fee_per_gas int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions DROP COLUMN "type";
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_fee_per_gas;
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_priority_fee_per_gas;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/optimism/1650574957000-AddGasMarketFieldsToBlocks.ts b/event-pipeline-evm/migrations/optimism/1650574957000-AddGasMarketFieldsToBlocks.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToBlocks1650574957000 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks ADD base_fee_per_gas int8 NULL;
+             ALTER TABLE ${schema}.blocks ADD gas_used int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks DROP COLUMN base_fee_per_gas;
+             ALTER TABLE ${schema}.blocks DROP COLUMN gas_used;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/optimism/1650574957001-AddGasMarketFieldsToTransactions.ts b/event-pipeline-evm/migrations/optimism/1650574957001-AddGasMarketFieldsToTransactions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToTransactions1650574957001 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions ADD "type" int NULL;
+            ALTER TABLE ${schema}.transactions ADD max_fee_per_gas int8 NULL;
+            ALTER TABLE ${schema}.transactions ADD max_priority_fee_per_gas int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions DROP COLUMN "type";
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_fee_per_gas;
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_priority_fee_per_gas;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/polygon/1650574957000-AddGasMarketFieldsToBlocks.ts b/event-pipeline-evm/migrations/polygon/1650574957000-AddGasMarketFieldsToBlocks.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToBlocks1650574957000 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks ADD base_fee_per_gas int8 NULL;
+             ALTER TABLE ${schema}.blocks ADD gas_used int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks DROP COLUMN base_fee_per_gas;
+             ALTER TABLE ${schema}.blocks DROP COLUMN gas_used;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/polygon/1650574957001-AddGasMarketFieldsToTransactions.ts b/event-pipeline-evm/migrations/polygon/1650574957001-AddGasMarketFieldsToTransactions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToTransactions1650574957001 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions ADD "type" int NULL;
+            ALTER TABLE ${schema}.transactions ADD max_fee_per_gas int8 NULL;
+            ALTER TABLE ${schema}.transactions ADD max_priority_fee_per_gas int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions DROP COLUMN "type";
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_fee_per_gas;
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_priority_fee_per_gas;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/ropsten/1650574957000-AddGasMarketFieldsToBlocks.ts b/event-pipeline-evm/migrations/ropsten/1650574957000-AddGasMarketFieldsToBlocks.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToBlocks1650574957000 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks ADD base_fee_per_gas int8 NULL;
+             ALTER TABLE ${schema}.blocks ADD gas_used int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+             ALTER TABLE ${schema}.blocks DROP COLUMN base_fee_per_gas;
+             ALTER TABLE ${schema}.blocks DROP COLUMN gas_used;
+`);
+    }
+}
diff --git a/event-pipeline-evm/migrations/ropsten/1650574957001-AddGasMarketFieldsToTransactions.ts b/event-pipeline-evm/migrations/ropsten/1650574957001-AddGasMarketFieldsToTransactions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner, getConnection } from 'typeorm';
+
+export class AddGasMarketFieldsToTransactions1650574957001 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions ADD "type" int NULL;
+            ALTER TABLE ${schema}.transactions ADD max_fee_per_gas int8 NULL;
+            ALTER TABLE ${schema}.transactions ADD max_priority_fee_per_gas int8 NULL;
+          `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        const connection = getConnection();
+        const { schema } = connection.options as any;
+        await queryRunner.query(`
+            ALTER TABLE ${schema}.transactions DROP COLUMN "type";
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_fee_per_gas;
+            ALTER TABLE ${schema}.transactions DROP COLUMN max_priority_fee_per_gas;
+`);
+    }
+}
diff --git a/event-pipeline-evm/src/data_sources/events/web3.ts b/event-pipeline-evm/src/data_sources/events/web3.ts
@@ -17,6 +17,10 @@ export interface ContractCallInfo {
     data: string;
 }
 
+export interface BlockWithTransactionData1155 extends BlockWithTransactionData {
+    baseFeePerGas: number;
+}
+
 export class Web3Source {
     private readonly _web3Wrapper: Web3Wrapper;
     private readonly _web3: any;
@@ -33,7 +37,7 @@ export class Web3Source {
             return new Promise((resolve, reject) => {
                 const req = this._web3.eth.getBlock.request(
                     i + startBlock,
-                    (err: any, data: BlockWithTransactionData) => {
+                    (err: any, data: BlockWithTransactionData1155) => {
                         if (err) {
                             logger.error(`Blocks error: ${err}`);
                             reject(err);
diff --git a/event-pipeline-evm/src/entities/block.ts b/event-pipeline-evm/src/entities/block.ts
@@ -16,4 +16,8 @@ export class Block {
     // collation time of the block
     @Column({ name: 'block_timestamp', type: 'bigint', transformer: numberToBigIntTransformer })
     public blockTimestamp!: number;
+    @Column({ name: 'base_fee_per_gas', type: 'bigint', transformer: numberToBigIntTransformer })
+    public baseFeePerGas!: number;
+    @Column({ name: 'gas_used', type: 'bigint', transformer: numberToBigIntTransformer })
+    public gasUsed!: number;
 }
diff --git a/event-pipeline-evm/src/entities/transaction.ts b/event-pipeline-evm/src/entities/transaction.ts
diff --git a/event-pipeline-evm/src/parsers/web3/parse_web3_objects.ts b/event-pipeline-evm/src/parsers/web3/parse_web3_objects.ts
