fix(pg): fix minor bugs when importing OpenZeppelin storage layout

hujw77 · Apr 9, 2023 · 011f0f6 · 011f0f6
1 parent ba246c5
commit 011f0f6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changeset/lucky-beans-wait.md b/.changeset/lucky-beans-wait.md
@@ -0,0 +1,5 @@
+---
+'@chugsplash/plugins': patch
+---
+
+Fix minor bugs when importing OpenZeppelin storage layout
diff --git a/packages/plugins/src/hardhat/artifacts.ts b/packages/plugins/src/hardhat/artifacts.ts
@@ -7,6 +7,7 @@ import {
   getEIP1967ProxyImplementationAddress,
   BuildInfo,
   ParsedContractConfig,
+  toOpenZeppelinContractKind,
 } from '@chugsplash/core'
 import {
   Manifest,
@@ -109,13 +110,15 @@ export const importOpenZeppelinStorageLayout = async (
     kind === 'oz-access-control-uups'
   ) {
     const proxy = parsedContractConfig.proxy
-    const isProxyDeployed = await hre.ethers.provider.getCode(proxy)
+    const isProxyDeployed = (await hre.ethers.provider.getCode(proxy)) !== '0x'
     if (isProxyDeployed) {
       const manifest = await Manifest.forNetwork(hre.network.provider)
       const deployData = await getDeployData(
         hre,
         await hre.ethers.getContractFactory(parsedContractConfig.contract),
-        withValidationDefaults({})
+        withValidationDefaults({
+          kind: toOpenZeppelinContractKind(kind),
+        })
       )
       const storageLayout = await getStorageLayoutForAddress(
         manifest,