thirdweb 5.29.1-nightly-1b15e7b1f2714200e522f3ce8dbe8f91ee987c6e-20240614065154 → 5.29.2-nightly-7768067bf4f571a8c8ee6b646a58e2fc5f6bd052-20240614163812

package/src/extensions/prebuilts/deploy-modular-core.test.ts

@@ -0,0 +1,158 @@
+import { describe, expect, it } from "vitest";
+import { ANVIL_CHAIN } from "../../../test/src/chains.js";
+import { TEST_CLIENT } from "../../../test/src/test-clients.js";
+import { TEST_ACCOUNT_A } from "../../../test/src/test-wallets.js";
+import { ADDRESS_ZERO } from "../../constants/addresses.js";
+import { getContract } from "../../contract/contract.js";
+import { sendTransaction } from "../../transaction/actions/send-transaction.js";
+import { installPublishedExtension } from "../modular/ModularCore/write/installPublishedExtension.js";
+import { uninstallExtensionByProxy } from "../modular/ModularCore/write/uninstallExtensionByProxy.js";
+import { uninstallPublishedExtension } from "../modular/ModularCore/write/uninstallPublishedExtension.js";
+import { getInstalledExtensions } from "../modular/__generated__/ModularCore/read/getInstalledExtensions.js";
+import { deployPublishedContract } from "./deploy-published.js";
+
+describe.runIf(process.env.TW_SECRET_KEY)(
+  "deployModularCore",
+  {
+    timeout: 120000,
+  },
+  () => {
+    it("should deploy a published autofactory modular core contract", async () => {
+      const address = await deployPublishedContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        account: TEST_ACCOUNT_A,
+        contractId: "DemoCore",
+        contractParams: [TEST_ACCOUNT_A.address, [], ["0x"]],
+        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
+      });
+      expect(address).toBeDefined();
+      expect(address.length).toBe(42);
+
+      const installedExtensions = await getInstalledExtensions({
+        contract: getContract({
+          client: TEST_CLIENT,
+          chain: ANVIL_CHAIN,
+          address,
+        }),
+      });
+      expect(installedExtensions.length).toBe(0);
+    });
+
+    it("should install and uninstall an extension by proxy address", async () => {
+      // deploy core contract with extension
+      const address = await deployPublishedContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        account: TEST_ACCOUNT_A,
+        contractId: "DemoCore",
+        contractParams: [TEST_ACCOUNT_A.address, [], ["0x"]],
+        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
+      });
+
+      const core = getContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        address,
+      });
+
+      // install extension with published name
+      const installTransaction = installPublishedExtension({
+        contract: core,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+        account: TEST_ACCOUNT_A,
+        extensionName: "DemoExtensionWithFunctions",
+        publisherAddress: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
+      });
+      await sendTransaction({
+        transaction: installTransaction,
+        account: TEST_ACCOUNT_A,
+      });
+
+      // get installed extension proxy address
+      let installedExtensions = await getInstalledExtensions({
+        contract: core,
+      });
+      const extensionAddress = installedExtensions[0]?.implementation;
+      expect(extensionAddress).to.not.equal(ADDRESS_ZERO);
+
+      // uninstall extension
+      const uninstallTransaction = uninstallExtensionByProxy({
+        contract: core,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+        extensionProxyAddress: extensionAddress as string,
+        extensionData: "0x",
+      });
+      await sendTransaction({
+        transaction: uninstallTransaction,
+        account: TEST_ACCOUNT_A,
+      });
+
+      installedExtensions = await getInstalledExtensions({
+        contract: core,
+      });
+
+      expect(installedExtensions.length).toBe(0);
+    });
+
+    it("should install and uninstall extensions by publish name", async () => {
+      // deploy core contract with extension
+      const address = await deployPublishedContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        account: TEST_ACCOUNT_A,
+        contractId: "DemoCore",
+        contractParams: [TEST_ACCOUNT_A.address, [], ["0x"]],
+        publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
+      });
+
+      const core = getContract({
+        client: TEST_CLIENT,
+        chain: ANVIL_CHAIN,
+        address,
+      });
+
+      // install extension with published name
+      const installTransaction = installPublishedExtension({
+        contract: core,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+        account: TEST_ACCOUNT_A,
+        extensionName: "DemoExtensionWithFunctions",
+        publisherAddress: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
+      });
+      await sendTransaction({
+        transaction: installTransaction,
+        account: TEST_ACCOUNT_A,
+      });
+
+      let installedExtensions = await getInstalledExtensions({
+        contract: core,
+      });
+
+      expect(installedExtensions.length).toBe(1);
+
+      // uninstall extension
+      const uninstallTransaction = uninstallPublishedExtension({
+        contract: core,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+        extensionName: "DemoExtensionWithFunctions",
+        publisherAddress: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
+        extensionData: "0x",
+      });
+      await sendTransaction({
+        transaction: uninstallTransaction,
+        account: TEST_ACCOUNT_A,
+      });
+
+      installedExtensions = await getInstalledExtensions({
+        contract: core,
+      });
+
+      expect(installedExtensions.length).toBe(0);
+    });
+  },
+);

package/src/utils/any-evm/deploy-metadata.ts

@@ -180,11 +180,14 @@ export type ExtendedMetadata = {
           params: Array<{ name: string; type: string }>;
           customFactoryAddresses: Record<string, string>;
         };
+        modularFactoryInput?: {
+          hooksParamName: string;
+        };
         factoryAddresses?: Record<string, string>;
       }
     | undefined;
   deployType?: "standard" | "autoFactory" | "customFactory";
-  routerType?: "none" | "plugin" | "dynamic";
+  routerType?: "none" | "plugin" | "dynamic" | "modular";
   networksForDeployment?: {
     allNetworks?: boolean;
     networksEnabled?: number[];

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.29.1-nightly-1b15e7b1f2714200e522f3ce8dbe8f91ee987c6e-20240614065154";
+export const version = "5.29.2-nightly-7768067bf4f571a8c8ee6b646a58e2fc5f6bd052-20240614163812";