fix: make isEvmLike not nullable, update on contract change

matter-labs · Dec 19, 2024 · 93ff034 · 93ff034
1 parent e37496e
commit 93ff034
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 33 deletions.
diff --git a/packages/api/src/address/address.entity.ts b/packages/api/src/address/address.entity.ts
@@ -22,6 +22,6 @@ export class Address extends BaseEntity {
   @Column({ type: "bytea", nullable: true, transformer: normalizeAddressTransformer })
   public readonly creatorAddress?: string;
 
-  @Column({ type: "boolean", nullable: true })
-  public readonly isEvmLike?: boolean;
+  @Column({ type: "boolean", default: false })
+  public readonly isEvmLike: boolean;
 }
diff --git a/packages/api/test/address.e2e-spec.ts b/packages/api/test/address.e2e-spec.ts
@@ -790,7 +790,7 @@ describe("AddressController (e2e)", () => {
               createdInBlockNumber: 10,
               creatorAddress: "0x91d0a23f34e535e44Df8Ba84c53a0945cf0eEB60",
               creatorTxHash: "0x8a008b8dbbc18035e56370abb820e736b705d68d6ac12b203603db8d9ea87e15",
-              isEvmLike: null,
+              isEvmLike: false,
               totalTransactions: 4,
               type: "contract",
             })
@@ -850,7 +850,7 @@ describe("AddressController (e2e)", () => {
               createdInBlockNumber: 10,
               creatorAddress: "0x91d0a23f34e535e44Df8Ba84c53a0945cf0eEB60",
               creatorTxHash: "0x8a008b8dbbc18035e56370abb820e736b705d68d6ac12b203603db8d9ea87e15",
-              isEvmLike: null,
+              isEvmLike: false,
               totalTransactions: 4,
               type: "contract",
             })
@@ -910,7 +910,7 @@ describe("AddressController (e2e)", () => {
               createdInBlockNumber: 10,
               creatorAddress: "0x91d0a23f34e535e44Df8Ba84c53a0945cf0eEB60",
               creatorTxHash: "0x8a008b8dbbc18035e56370abb820e736b705d68d6ac12b203603db8d9ea87e15",
-              isEvmLike: null,
+              isEvmLike: false,
               totalTransactions: 4,
               type: "contract",
             })
@@ -970,7 +970,7 @@ describe("AddressController (e2e)", () => {
               createdInBlockNumber: 10,
               creatorAddress: "0x91d0a23f34e535e44Df8Ba84c53a0945cf0eEB60",
               creatorTxHash: "0x8a008b8dbbc18035e56370abb820e736b705d68d6ac12b203603db8d9ea87e15",
-              isEvmLike: null,
+              isEvmLike: false,
               totalTransactions: 4,
               type: "contract",
             })
@@ -991,7 +991,7 @@ describe("AddressController (e2e)", () => {
                 createdInBlockNumber: 10,
                 creatorAddress: "0x91d0a23f34e535e44Df8Ba84c53a0945cf0eEB60",
                 creatorTxHash: "0x8a008b8dbbc18035e56370abb820e736b705d68d6ac12b203603db8d9ea87e15",
-                isEvmLike: null,
+                isEvmLike: false,
                 totalTransactions: 0,
                 type: "contract",
               })

diff --git a/packages/app/src/components/common/Title.vue b/packages/app/src/components/common/Title.vue
@@ -22,8 +22,6 @@ import Badge from "./Badge.vue";
 
 import CopyButton from "@/components/common/CopyButton.vue";
 
-import type { PropType } from "vue";
-
 import { shortValue } from "@/utils/formatters";
 
 defineProps({
@@ -38,7 +36,7 @@ defineProps({
     type: Boolean,
   },
   isEvmLike: {
-    type: [Boolean, null] as PropType<boolean | null>,
+    type: Boolean,
     default: false,
     required: false,
   },

diff --git a/packages/app/src/composables/common/Api.d.ts b/packages/app/src/composables/common/Api.d.ts
@@ -137,6 +137,7 @@ declare namespace Api {
       creatorTxHash: string;
       createdInBlockNumber: number;
       totalTransactions: number;
+      isEvmLike: boolean;
     };
   }
 }
diff --git a/packages/app/src/composables/useAddress.ts b/packages/app/src/composables/useAddress.ts
@@ -76,7 +76,7 @@ export type Balances = Api.Response.Balances;
 export type Account = Api.Response.Account;
 export type Contract = Api.Response.Contract & {
   verificationInfo: null | ContractVerificationInfo;
-  isEvmLike?: boolean | null;
+  isEvmLike: boolean;
   proxyInfo: null | {
     implementation: {
       address: string;

diff --git a/packages/data-fetcher/src/address/interface/contractAddress.interface.ts b/packages/data-fetcher/src/address/interface/contractAddress.interface.ts
@@ -5,5 +5,5 @@ export interface ContractAddress {
   creatorAddress: string;
   logIndex: number;
   bytecode?: string;
-  isEvmLike?: boolean;
+  isEvmLike: boolean;
 }
diff --git a/packages/worker/src/dataFetcher/types.ts b/packages/worker/src/dataFetcher/types.ts
@@ -51,7 +51,7 @@ export interface ContractAddress {
   creatorAddress: string;
   logIndex: number;
   bytecode?: string;
-  isEvmLike?: boolean;
+  isEvmLike: boolean;
 }
 
 export interface LogsData {

diff --git a/packages/worker/src/entities/address.entity.ts b/packages/worker/src/entities/address.entity.ts
@@ -36,6 +36,6 @@ export class Address extends BaseEntity {
   @Column({ type: "bytea", nullable: true, transformer: hexTransformer })
   public readonly creatorAddress?: string;
 
-  @Column({ type: "boolean", nullable: true })
-  public readonly isEvmLike?: boolean;
+  @Column({ type: "boolean", default: false })
+  public readonly isEvmLike: boolean;
 }
diff --git a/packages/worker/src/migrations/1732834401560-AddIsEvmLikeField.ts b/packages/worker/src/migrations/1732834401560-AddIsEvmLikeField.ts
diff --git a/...3474315-MakeTransactionToFieldOptional.ts → ...1734649984378-ChangesForEvmEquivalence.ts b/...3474315-MakeTransactionToFieldOptional.ts → ...1734649984378-ChangesForEvmEquivalence.ts
@@ -1,17 +1,19 @@
 import { MigrationInterface, QueryRunner } from "typeorm";
 
-export class MakeTransactionToFieldOptional1734453474315 implements MigrationInterface {
-  name = "MakeTransactionToFieldOptional1734453474315";
+export class ChangesForEvmEquivalence1734649984378 implements MigrationInterface {
+  name = "ChangesForEvmEquivalence1734649984378";
 
   public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "addresses" ADD "isEvmLike" boolean NOT NULL DEFAULT false`);
     await queryRunner.query(`ALTER TABLE "transactions" ALTER COLUMN "to" DROP NOT NULL`);
-    await queryRunner.query(`ALTER TABLE "addressTransactions" ALTER COLUMN "address" DROP NOT NULL`);
     await queryRunner.query(`ALTER TABLE "transactionReceipts" ALTER COLUMN "to" DROP NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "addressTransactions" ALTER COLUMN "address" DROP NOT NULL`);
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE "transactionReceipts" ALTER COLUMN "to" SET NOT NULL`);
     await queryRunner.query(`ALTER TABLE "addressTransactions" ALTER COLUMN "address" SET NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "transactionReceipts" ALTER COLUMN "to" SET NOT NULL`);
     await queryRunner.query(`ALTER TABLE "transactions" ALTER COLUMN "to" SET NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "addresses" DROP COLUMN "isEvmLike"`);
   }
 }
diff --git a/packages/worker/src/repositories/address.repository.ts b/packages/worker/src/repositories/address.repository.ts
@@ -22,7 +22,8 @@ export class AddressRepository extends BaseRepository<Address> {
           "createdInBlockNumber" = EXCLUDED."createdInBlockNumber",
           "creatorTxHash" = EXCLUDED."creatorTxHash",
           "creatorAddress" = EXCLUDED."creatorAddress",
-          "createdInLogIndex" = EXCLUDED."createdInLogIndex"
+          "createdInLogIndex" = EXCLUDED."createdInLogIndex",
+          "isEvmLike" = EXCLUDED."isEvmLike"
         WHERE 
           addresses."createdInBlockNumber" IS NULL OR
           EXCLUDED."createdInBlockNumber" > addresses."createdInBlockNumber" OR