fix: get contractName

latticexyz · Mar 6, 2024 · 9b42d37 · 9b42d37
1 parent ad187a2
commit 9b42d37
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/packages/cli/src/deploy/deploy.ts b/packages/cli/src/deploy/deploy.ts
@@ -14,7 +14,7 @@ import { debug } from "./debug";
 import { resourceLabel } from "./resourceLabel";
 import { uniqueBy } from "@latticexyz/common/utils";
 import { ensureContractsDeployed } from "./ensureContractsDeployed";
-import { coreModuleBytecode, worldFactoryBytecode, worldFactoryContracts } from "./ensureWorldFactory";
+import { worldFactoryContracts } from "./ensureWorldFactory";
 
 type DeployOptions<configInput extends ConfigInput> = {
   client: Client<Transport, Chain | undefined, Account>;

diff --git a/packages/cli/src/deploy/getPublicLibraries.ts b/packages/cli/src/deploy/getPublicLibraries.ts
@@ -9,8 +9,6 @@ import path from "path";
 
 export async function getPublicLibraries(forgeOutDir: string) {
   const libraryDeps: {
-    contractFullPath: string;
-    libraryFullPath: string;
     libraryFilename: string;
     libraryName: string;
     contractFullyQualifiedName: string;
@@ -22,7 +20,7 @@ export async function getPublicLibraries(forgeOutDir: string) {
     const json = JSON.parse((await readFile(contractOutPath, "utf8")).trim());
     const linkReferences = json.bytecode.linkReferences as LinkReferences;
 
-    const contractFullPath = json.ast.absolutePath;
+    const contractFullPath = Object.keys(json.metadata.settings.compilationTarget)[0];
     // skip files that do not reference any contract/library
     if (!json.metadata) continue;
     const contractName = json.metadata.settings.compilationTarget[contractFullPath];
@@ -31,8 +29,6 @@ export async function getPublicLibraries(forgeOutDir: string) {
       const names = Object.keys(namePositions);
       for (const libraryName of names) {
         libraryDeps.push({
-          contractFullPath: json.ast.absolutePath,
-          libraryFullPath,
           libraryFilename: path.basename(libraryFullPath),
           libraryName,
           contractFullyQualifiedName: `${contractFullPath}:${contractName}`,

diff --git a/packages/cli/src/deploy/resolveConfig.ts b/packages/cli/src/deploy/resolveConfig.ts
@@ -10,7 +10,6 @@ import {
   getCreate2Address,
   getAddress,
   hexToBytes,
-  Abi,
   bytesToHex,
   getFunctionSignature,
 } from "viem";