Replace getLinkedContractFactory with ethers implementation

skalenetwork · Sep 19, 2023 · b689987 · b689987
1 parent 9784366
commit b689987
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 57 deletions.
diff --git a/src/contractFactory.ts b/src/contractFactory.ts
@@ -1,7 +1,6 @@
 import {artifacts, ethers} from "hardhat";
 import {
     deployLibraries,
-    getLinkedContractFactory,
     getManifestFile
 } from "./deploy";
 import {LinkReferences} from "hardhat/types";
@@ -129,8 +128,8 @@ export const getContractFactoryAndUpdateManifest = async (contract: string) => {
         libraries,
         oldLibraries
     );
-    return await getLinkedContractFactory(
+    return await ethers.getContractFactory(
         contract,
-        libraries
+        {"libraries": Object.fromEntries(libraries)}
     );
 };
diff --git a/src/deploy.ts b/src/deploy.ts
@@ -1,7 +1,5 @@
 import {Manifest, hashBytecode} from "@openzeppelin/upgrades-core";
 import {artifacts, ethers} from "hardhat";
-import {hexConcat, hexDataSlice} from "ethers/lib/utils";
-import {Artifact} from "hardhat/types";
 import {SkaleManifestData} from "./types/SkaleManifestData";
 import {promises as fs} from "fs";
 import {getLibrariesNames} from "./contractFactory";
@@ -42,56 +40,6 @@ export const deployLibraries = async (libraryNames: string[]) => {
     return libraries;
 };
 
-const firstByteIndex = 0;
-
-const linkBytecode = (artifact: Artifact, libraries: Map<string, string>) => {
-    let {bytecode} = artifact;
-    for (const [, fileReferences] of Object.entries(artifact.linkReferences)) {
-        for (const [
-            libName,
-            fixups
-        ] of Object.entries(fileReferences)) {
-            const libAddress = libraries.get(libName);
-            if (typeof libAddress !== "undefined") {
-                for (const fixup of fixups) {
-                    const bytecodeBefore = hexDataSlice(
-                        bytecode,
-                        firstByteIndex,
-                        fixup.start
-                    );
-                    const bytecodeAfter = hexDataSlice(
-                        bytecode,
-                        fixup.start + fixup.length
-                    );
-                    bytecode = hexConcat([
-                        bytecodeBefore,
-                        libAddress,
-                        bytecodeAfter
-                    ]);
-                }
-            }
-        }
-    }
-    return bytecode;
-};
-
-export const getLinkedContractFactory = async (
-    contractName: string,
-    libraries: Map<string, string>
-) => {
-    const
-        cArtifact = await artifacts.readArtifact(contractName);
-    const linkedBytecode = linkBytecode(
-        cArtifact,
-        libraries
-    );
-    const ContractFactory = await ethers.getContractFactory(
-        cArtifact.abi,
-        linkedBytecode
-    );
-    return ContractFactory;
-};
-
 export const getManifestFile = async function getManifestFile () {
     return (await Manifest.forNetwork(ethers.provider)).file;
 };
@@ -167,8 +115,8 @@ export const getContractFactory = async (contract: string) => {
 
     await updateManifest(libraryArtifacts);
 
-    return await getLinkedContractFactory(
+    return await ethers.getContractFactory(
         contract,
-        libraries
+        {"libraries": Object.fromEntries(libraries)}
     );
 };