Merge pull request #24 from skalenetwork/dependabot/npm_and_yarn/type…

…script-4.7.3 Bump typescript from 4.6.4 to 4.7.3
skalenetwork · Jun 22, 2022 · 32477fa · 32477fa
2 parents 8bf17d6 + 1f9f189
commit 32477fa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -18,7 +18,7 @@ const config: HardhatUserConfig = {
         ]
     },
     typechain: {
-        externalArtifacts: ['node_modules/@openzeppelin/upgrades-core/artifacts/*.json']
+        externalArtifacts: ['node_modules/@openzeppelin/upgrades-core/artifacts/[!b]*.json']
     }
 };
 

diff --git a/src/deploy.ts b/src/deploy.ts
@@ -75,7 +75,9 @@ export async function getContractFactory(contract: string) {
         manifest = JSON.parse(await fs.readFile(await getManifestFile(), "utf-8")) as SkaleManifestData;
         Object.assign(libraryArtifacts, manifest.libraries);
     } finally {
-        Object.assign(manifest, {libraries: libraryArtifacts});
+        if (manifest !== undefined) {
+            Object.assign(manifest, {libraries: libraryArtifacts});
+        }
         await fs.writeFile(await getManifestFile(), JSON.stringify(manifest, null, 4));
     }
     return await getLinkedContractFactory(contract, libraries);

diff --git a/src/upgrade.ts b/src/upgrade.ts
@@ -146,7 +146,7 @@ export async function upgrade<ContractManagerType extends OwnableUpgradeable>(
                 unsafeAllowLinkedLibraries: true,
                 unsafeAllowRenames: true
             }
-        );
+        ) as string;
         const currentImplementationAddress = await getImplementationAddress(network.provider, proxyAddress);
         if (newImplementationAddress !== currentImplementationAddress)
         {

diff --git a/yarn.lock b/yarn.lock
@@ -2682,9 +2682,9 @@ typedarray-to-buffer@^3.1.5:
     is-typedarray "^1.0.0"
 
 typescript@^4.5.5:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
-  integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
+  integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
 
 typical@^4.0.0:
   version "4.0.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ const config: HardhatUserConfig = { @@
             ]
         },
         typechain: {
-            externalArtifacts: ['node_modules/@openzeppelin/upgrades-core/artifacts/*.json']
+            externalArtifacts: ['node_modules/@openzeppelin/upgrades-core/artifacts/[!b]*.json']
         }
     };
@@ Expand Down @@