@skalenetwork/upgrade-tools 3.0.0-linter.26 → 3.0.0-linter.27

package/dist/src/contractFactory.js

@@ -78,6 +78,6 @@ const getContractFactoryAndUpdateManifest = async (contract) => {
     const { librariesToUpgrade, oldLibraries } = await getLibrariesToUpgrade(manifest, linkReferences);
     const libraries = await (0, deploy_1.deployLibraries)(librariesToUpgrade);
     await updateManifest(manifest, libraries, oldLibraries);
-    return await (0, deploy_1.getLinkedContractFactory)(contract, libraries);
+    return await hardhat_1.ethers.getContractFactory(contract, { "libraries": Object.fromEntries(libraries) });
 };
 exports.getContractFactoryAndUpdateManifest = getContractFactoryAndUpdateManifest;

package/dist/src/deploy.d.ts

@@ -1,4 +1,3 @@
 export declare const deployLibraries: (libraryNames: string[]) => Promise<Map<string, string>>;
-export declare const getLinkedContractFactory: (contractName: string, libraries: Map<string, string>) => Promise<import("ethers").ContractFactory>;
 export declare const getManifestFile: () => Promise<string>;
 export declare const getContractFactory: (contract: string) => Promise<import("ethers").ContractFactory>;

package/dist/src/deploy.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContractFactory = exports.getManifestFile = exports.getLinkedContractFactory = exports.deployLibraries = void 0;
+exports.getContractFactory = exports.getManifestFile = exports.deployLibraries = void 0;
 const upgrades_core_1 = require("@openzeppelin/upgrades-core");
 const hardhat_1 = require("hardhat");
-const utils_1 = require("ethers/lib/utils");
 const fs_1 = require("fs");
 const contractFactory_1 = require("./contractFactory");
 const deployLibrary = async (libraryName, nonce) => {
@@ -25,34 +24,6 @@ const deployLibraries = async (libraryNames) => {
     return libraries;
 };
 exports.deployLibraries = deployLibraries;
-const firstByteIndex = 0;
-const linkBytecode = (artifact, libraries) => {
-    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 = (0, utils_1.hexDataSlice)(bytecode, firstByteIndex, fixup.start);
-                    const bytecodeAfter = (0, utils_1.hexDataSlice)(bytecode, fixup.start + fixup.length);
-                    bytecode = (0, utils_1.hexConcat)([
-                        bytecodeBefore,
-                        libAddress,
-                        bytecodeAfter
-                    ]);
-                }
-            }
-        }
-    }
-    return bytecode;
-};
-const getLinkedContractFactory = async (contractName, libraries) => {
-    const cArtifact = await hardhat_1.artifacts.readArtifact(contractName);
-    const linkedBytecode = linkBytecode(cArtifact, libraries);
-    const ContractFactory = await hardhat_1.ethers.getContractFactory(cArtifact.abi, linkedBytecode);
-    return ContractFactory;
-};
-exports.getLinkedContractFactory = getLinkedContractFactory;
 const getManifestFile = async function getManifestFile() {
     return (await upgrades_core_1.Manifest.forNetwork(hardhat_1.ethers.provider)).file;
 };
@@ -96,6 +67,6 @@ const getContractFactory = async (contract) => {
     const libraries = await (0, exports.deployLibraries)(libraryNames);
     const libraryArtifacts = await getLibraryArtifacts(libraries);
     await updateManifest(libraryArtifacts);
-    return await (0, exports.getLinkedContractFactory)(contract, libraries);
+    return await hardhat_1.ethers.getContractFactory(contract, { "libraries": Object.fromEntries(libraries) });
 };
 exports.getContractFactory = getContractFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/upgrade-tools",
-  "version": "3.0.0-linter.26",
+  "version": "3.0.0-linter.27",
   "description": "Scripts to support upgrades of smart contracts",
   "files": [
     "dist/**/*"