Use consistent ethers version and JsonFragment instead of abitype

Author: kuzdogan

package-lock.json

@@ -1,4 +1,4 @@
-import { Abi } from "abitype";
+import { JsonFragment } from "ethers";
 import { SolidityOutputError, SoliditySettings } from "./SolidityTypes";
 import { VyperOutputError } from "./VyperTypes";
 
@@ -75,7 +75,7 @@ export interface Userdoc {
 export type OutputError = SolidityOutputError | VyperOutputError;
 
 export interface MetadataOutput {
-  abi: Abi;
+  abi: JsonFragment[];
   devdoc?: Devdoc;
   userdoc?: Userdoc;
 }

packages/compilers-types/src/CompilationTypes.ts

@@ -1,4 +1,4 @@
-import { Abi } from "abitype";
+import { JsonFragment } from "ethers";
 import { Devdoc, Userdoc, LinkReferences } from "./CompilationTypes";
 
 interface File {
@@ -158,7 +158,7 @@ export interface StorageLayout {
   };
 }
 export interface SolidityOutputContract {
-  abi: Abi;
+  abi: JsonFragment[];
   metadata: string;
   userdoc?: Userdoc;
   devdoc?: Devdoc;

packages/compilers-types/src/SolidityTypes.ts

@@ -1,4 +1,4 @@
-import { Abi } from "abitype";
+import { JsonFragment } from "ethers";
 import { Devdoc } from "./CompilationTypes";
 import { Userdoc } from "./CompilationTypes";
 
@@ -63,7 +63,7 @@ export interface VyperOutputSources {
 }
 
 export interface VyperOutputContract {
-  abi: Abi;
+  abi: JsonFragment[];
   userdoc: Userdoc;
   devdoc: Devdoc;
   ir: string;

packages/compilers-types/src/VyperTypes.ts

@@ -41,11 +41,9 @@
     "@ethereumjs/statemanager": "2.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@ethersproject/abi": "5.8.0",
     "@ethersproject/bignumber": "5.8.0",
     "@ethersproject/bytes": "5.8.0",
     "@fairdatasociety/bmt-js": "2.1.0",
-    "abitype": "1.0.8",
     "bs58": "5.0.0",
     "ethers": "6.15.0",
     "jszip": "3.10.1",

packages/lib-sourcify/package.json

@@ -8,11 +8,11 @@ import {
   CompiledContractCborAuxdata,
   StringMap,
 } from '../Compilation/CompilationTypes';
-import { AbiConstructor } from 'abitype';
-import { defaultAbiCoder as abiCoder, ParamType } from '@ethersproject/abi';
-import { id as keccak256Str } from 'ethers';
+import { AbiCoder, id as keccak256Str, Interface } from 'ethers';
 import { logError } from '../logger';
 
+const abiCoder = AbiCoder.defaultAbiCoder();
+
 export type Transformation = {
   type: 'insert' | 'replace';
   reason:
@@ -202,11 +202,8 @@ export function extractConstructorArgumentsTransformation(
     populatedRecompiledBytecode,
     onchainCreationBytecode,
   );
-  const constructorAbiParamInputs = (
-    metadata?.output?.abi?.find(
-      (param) => param.type === 'constructor',
-    ) as AbiConstructor
-  )?.inputs as ParamType[];
+  const constructorAbiParamInputs = new Interface(metadata?.output?.abi).deploy
+    .inputs;
   if (abiEncodedConstructorArguments) {
     if (!constructorAbiParamInputs) {
       throw new Error(

packages/lib-sourcify/src/Verification/Transformations.ts

@@ -1,4 +1,4 @@
-import { Abi } from 'abitype';
+import { JsonFragment } from 'ethers';
 import {
   CompilationLanguage,
   CompilationTarget,
@@ -109,7 +109,7 @@ export interface VerificationExport {
       >;
     };
     contractCompilerOutput: {
-      abi?: Abi;
+      abi?: JsonFragment[];
       userdoc?: Userdoc;
       devdoc?: Devdoc;
       storageLayout?: StorageLayout;

packages/lib-sourcify/src/Verification/VerificationTypes.ts

@@ -56,7 +56,6 @@
     "@google-cloud/cloud-sql-connector": "1.8.2",
     "@shazow/whatsabi": "0.22.2",
     "@solidity-parser/parser": "0.20.2",
-    "abitype": "1.0.8",
     "bunyan": "1.8.15",
     "chalk": "4.1.2",
     "config": "3.3.12",

services/server/package.json

@@ -17,7 +17,7 @@ import {
   rearrangeSources,
 } from "@ethereum-sourcify/lib-sourcify";
 import { Session } from "express-session";
-import { AbiConstructor, AbiParameter } from "abitype";
+import { JsonFragmentType } from "ethers";
 import QueryString from "qs";
 import { VerificationService } from "../../services/VerificationService";
 import {
@@ -144,7 +144,7 @@ export type SendableContract = ContractMeta & {
     invalid: InvalidSources;
   };
   verificationId: string;
-  constructorArgumentsArray?: Mutable<AbiParameter[]>;
+  constructorArgumentsArray?: readonly JsonFragmentType[];
   // creationBytecode?: string; // Not needed without create2
 };
 
@@ -156,11 +156,9 @@ function getSendableContract(
 
   return {
     verificationId,
-    constructorArgumentsArray: (
-      contract?.metadata?.output?.abi?.find(
-        (abi) => abi.type === "constructor",
-      ) as AbiConstructor
-    )?.inputs as Mutable<AbiParameter[]>,
+    constructorArgumentsArray: contract?.metadata?.output?.abi?.find(
+      (abi) => abi.type === "constructor",
+    )?.inputs,
     // : contract?.creationBytecode, // Not needed without create2
     compiledPath: contract.compiledPath,
     name: contract.name,

services/server/src/server/apiv1/verification/verification.common.ts

@@ -21,7 +21,6 @@ import {
   PreRunCompilation,
   splitFullyQualifiedName,
 } from "@ethereum-sourcify/lib-sourcify";
-import { Abi } from "abitype";
 import {
   VerifiedContract as VerifiedContractApiObject,
   Bytes,
@@ -30,7 +29,7 @@ import {
   BytesTypes,
   Nullable,
 } from "../../types";
-import { keccak256 } from "ethers";
+import { keccak256, JsonFragment } from "ethers";
 import { Database } from "./Database";
 import logger from "../../../common/logger";
 
@@ -67,7 +66,7 @@ export namespace Tables {
     name: string;
     fully_qualified_name: string;
     compilation_artifacts: {
-      abi: Nullable<Abi>;
+      abi: Nullable<JsonFragment[]>;
       userdoc: Nullable<any>;
       devdoc: Nullable<any>;
       storageLayout: Nullable<StorageLayout>;