default prepareDeploy param

latticexyz · Sep 19, 2024 · 0bce659 · 0bce659
1 parent 50d4b9c
commit 0bce659
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/packages/cli/src/deploy/common.ts b/packages/cli/src/deploy/common.ts
@@ -62,7 +62,7 @@ export type LibraryPlaceholder = {
 export type DeterministicContract = {
   readonly prepareDeploy: (
     deployer: Address,
-    libraryMap: LibraryMap,
+    libraryMap?: LibraryMap,
   ) => {
     readonly address: Address;
     readonly bytecode: Hex;

diff --git a/packages/cli/src/deploy/createPrepareDeploy.ts b/packages/cli/src/deploy/createPrepareDeploy.ts
@@ -7,8 +7,17 @@ export function createPrepareDeploy(
   bytecodeWithPlaceholders: Hex,
   placeholders: readonly LibraryPlaceholder[],
 ): DeterministicContract["prepareDeploy"] {
-  return function prepareDeploy(deployer: Address, libraryMap: LibraryMap) {
+  return function prepareDeploy(deployer: Address, libraryMap?: LibraryMap) {
     let bytecode = bytecodeWithPlaceholders;
+
+    if (placeholders.length === 0) {
+      return { bytecode, address: getCreate2Address({ from: deployer, bytecode, salt }) };
+    }
+
+    if (!libraryMap) {
+      throw new Error("Libraries must be provided if there are placeholders");
+    }
+
     for (const placeholder of placeholders) {
       const address = libraryMap.getAddress({ name: placeholder.name, path: placeholder.path, deployer });
       bytecode = spliceHex(bytecode, placeholder.start, placeholder.length, address);

diff --git a/packages/cli/src/verify.ts b/packages/cli/src/verify.ts
@@ -105,7 +105,7 @@ export async function verify({
     );
 
     modules.map(({ name, prepareDeploy }) => {
-      const { address } = prepareDeploy(deployerAddress, {});
+      const { address } = prepareDeploy(deployerAddress);
       return verifyQueue.add(() =>
         verifyContract({
           // TODO: figure out dir from artifactPath via import.meta.resolve?