@cofhe/hardhat-plugin 0.1.1 → 0.2.1

package/dist/index.mjs

@@ -4,7 +4,9 @@ import "viem";
 import { extendConfig, extendEnvironment, task, types } from "hardhat/config";
 import { TASK_TEST, TASK_NODE } from "hardhat/builtin-tasks/task-names";
 import "@nomicfoundation/hardhat-ethers/signers";
-import "@cofhe/sdk";
+import {
+  MOCKS_ZK_VERIFIER_SIGNER_ADDRESS as MOCKS_ZK_VERIFIER_SIGNER_ADDRESS2
+} from "@cofhe/sdk";
 import { createCofhesdkClient, createCofhesdkConfig } from "@cofhe/sdk/node";
 import { HardhatSignerAdapter } from "@cofhe/sdk/adapters";
 
@@ -64,12 +66,6 @@ async function localcofheFundWalletIfNeeded(hre, walletAddress) {
 var TASK_COFHE_USE_FAUCET = "task:cofhe:usefaucet";
 var TASK_COFHE_MOCKS_SET_LOG_OPS = "task:cofhe-mocks:setlogops";
 var TASK_COFHE_MOCKS_DEPLOY = "task:cofhe-mocks:deploy";
-var TASK_MANAGER_ADDRESS = "0xeA30c4B8b44078Bbf8a6ef5b9f1eC1626C7848D9";
-var MOCKS_ACL_ADDRESS = "0x0000000000000000000000000000000000000400";
-var MOCKS_ZK_VERIFIER_ADDRESS = "0x0000000000000000000000000000000000000100";
-var MOCKS_QUERY_DECRYPTER_ADDRESS = "0x0000000000000000000000000000000000000200";
-var TEST_BED_ADDRESS = "0x0000000000000000000000000000000000000300";
-var MOCKS_ZK_VERIFIER_SIGNER_ADDRESS = "0x6E12D8C87503D4287c294f2Fdef96ACd9DFf6bd2";
 
 // src/deploy.ts
 import "hardhat/types";
@@ -82,10 +78,122 @@ import {
   MockQueryDecrypterArtifact,
   TestBedArtifact
 } from "@cofhe/mock-contracts";
+import { TASK_MANAGER_ADDRESS as TASK_MANAGER_ADDRESS2, MOCKS_ZK_VERIFIER_SIGNER_ADDRESS } from "@cofhe/sdk";
+
+// src/utils.ts
+import { TASK_MANAGER_ADDRESS, MOCKS_ZK_VERIFIER_ADDRESS } from "@cofhe/sdk";
+import { expect } from "chai";
+import { ethers } from "ethers";
+import "@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider";
+var deployMockContractFromArtifact = async (hre, artifact) => {
+  if (artifact.isFixed) {
+    await hre.network.provider.send("hardhat_setCode", [artifact.fixedAddress, artifact.deployedBytecode]);
+    return getFixedMockContract(hre, artifact);
+  }
+  const [signer] = await hre.ethers.getSigners();
+  const factory = new hre.ethers.ContractFactory(artifact.abi, artifact.bytecode, signer);
+  const contract = await factory.deploy(
+    /* constructor args */
+  );
+  await contract.waitForDeployment();
+  return contract;
+};
+var getFixedMockContract = async (hre, artifact) => {
+  if (!artifact.isFixed) {
+    throw new Error("Artifact is not fixed");
+  }
+  return await hre.ethers.getContractAt(artifact.abi, artifact.fixedAddress);
+};
+var mock_checkIsTestnet = async (fnName, provider) => {
+  const bytecode = await provider.getCode(MOCKS_ZK_VERIFIER_ADDRESS);
+  const isTestnet = bytecode.length === 0;
+  if (isTestnet) {
+    console.log(`${fnName} - skipped on non-testnet chain`);
+  }
+  return isTestnet;
+};
+var mock_getPlaintext = async (provider, ctHash) => {
+  if (await mock_checkIsTestnet(mock_getPlaintext.name, provider))
+    return;
+  const taskManager = new ethers.Contract(
+    TASK_MANAGER_ADDRESS,
+    ["function mockStorage(uint256) view returns (uint256)"],
+    provider
+  );
+  const plaintext = await taskManager.mockStorage(ctHash);
+  return plaintext;
+};
+var mock_getPlaintextExists = async (provider, ctHash) => {
+  if (await mock_checkIsTestnet(mock_getPlaintextExists.name, provider))
+    return;
+  const taskManager = new ethers.Contract(
+    TASK_MANAGER_ADDRESS,
+    ["function inMockStorage(uint256) view returns (bool)"],
+    provider
+  );
+  const plaintextExists = await taskManager.inMockStorage(ctHash);
+  return plaintextExists;
+};
+var mock_expectPlaintext = async (provider, ctHash, expectedValue) => {
+  if (await mock_checkIsTestnet(mock_expectPlaintext.name, provider))
+    return;
+  const plaintextExists = await mock_getPlaintextExists(provider, ctHash);
+  expect(plaintextExists).equal(true, "Plaintext does not exist");
+  const plaintext = await mock_getPlaintext(provider, ctHash);
+  expect(plaintext).equal(expectedValue, "Plaintext value is incorrect");
+};
+
+// src/deploy.ts
+var deployMocks = async (hre, options = {
+  deployTestBed: true,
+  gasWarning: true,
+  silent: false
+}) => {
+  const isHardhat = await getIsHardhat(hre);
+  if (!isHardhat) {
+    logSuccess(`cofhe-hardhat-plugin - deploy mocks - skipped on non-hardhat network ${hre.network.name}`, 0);
+    return;
+  }
+  isSilent = options.silent ?? false;
+  logEmpty();
+  logSuccess(chalk.bold("cofhe-hardhat-plugin :: deploy mocks"), 0);
+  logEmpty();
+  const taskManager = await deployMockTaskManager(hre);
+  logDeployment("MockTaskManager", await taskManager.getAddress());
+  const acl = await deployMockACL(hre);
+  logDeployment("MockACL", await acl.getAddress());
+  await linkTaskManagerAndACL(taskManager, acl);
+  logSuccess("ACL address set in TaskManager", 2);
+  await fundZkVerifierSigner(hre);
+  logSuccess(`ZkVerifier signer (${MOCKS_ZK_VERIFIER_SIGNER_ADDRESS}) funded`, 1);
+  const zkVerifierSignerBalance = await getZkVerifierSignerBalance(hre);
+  logSuccess(`ETH balance: ${zkVerifierSignerBalance.toString()}`, 2);
+  const zkVerifier = await deployMockZkVerifier(hre);
+  logDeployment("MockZkVerifier", await zkVerifier.getAddress());
+  const queryDecrypter = await deployMockQueryDecrypter(hre, acl);
+  logDeployment("MockQueryDecrypter", await queryDecrypter.getAddress());
+  if (options.deployTestBed) {
+    logSuccess("TestBed deployment enabled", 2);
+    const testBed = await deployTestBedContract(hre);
+    logDeployment("TestBed", await testBed.getAddress());
+  }
+  logEmpty();
+  logSuccess(chalk.bold("cofhe-hardhat-plugin :: mocks deployed successfully"), 0);
+  if (options.gasWarning) {
+    logEmpty();
+    logWarning(
+      "When using mocks, FHE operations (eg FHE.add / FHE.mul) report a higher gas price due to additional on-chain mocking logic. Deploy your contracts on a testnet chain to check the true gas costs.\n(Disable this warning by setting '@cofhe/sdk.gasWarning' to false in your hardhat config",
+      0
+    );
+  }
+  logEmpty();
+};
+var getIsHardhat = async (hre) => {
+  return hre.network.name === "hardhat";
+};
 var deployMockTaskManager = async (hre) => {
   const [signer] = await hre.ethers.getSigners();
-  await hardhatSetCode(hre, TASK_MANAGER_ADDRESS, MockTaskManagerArtifact.deployedBytecode);
-  const taskManager = await hre.ethers.getContractAt(MockTaskManagerArtifact.abi, TASK_MANAGER_ADDRESS);
+  const taskManager = await deployMockContractFromArtifact(hre, MockTaskManagerArtifact);
   const initTx = await taskManager.initialize(signer.address);
   await initTx.wait();
   const tmExists = await taskManager.exists();
@@ -95,140 +203,68 @@ var deployMockTaskManager = async (hre) => {
   return taskManager;
 };
 var deployMockACL = async (hre) => {
-  await hardhatSetCode(hre, MOCKS_ACL_ADDRESS, MockACLArtifact.deployedBytecode);
-  const acl = await hre.ethers.getContractAt(MockACLArtifact.abi, MOCKS_ACL_ADDRESS);
+  const acl = await deployMockContractFromArtifact(hre, MockACLArtifact);
   const exists = await acl.exists();
   if (!exists) {
-    logError("MockACL does not exist", 2);
     throw new Error("MockACL does not exist");
   }
   return acl;
 };
+var fundZkVerifierSigner = async (hre) => {
+  const zkVerifierSigner = await hre.ethers.getSigner(MOCKS_ZK_VERIFIER_SIGNER_ADDRESS);
+  await hre.network.provider.send("hardhat_setBalance", [
+    zkVerifierSigner.address,
+    "0x" + hre.ethers.parseEther("10").toString(16)
+  ]);
+};
+var getZkVerifierSignerBalance = async (hre) => {
+  return hre.ethers.provider.getBalance(MOCKS_ZK_VERIFIER_SIGNER_ADDRESS);
+};
+var linkTaskManagerAndACL = async (taskManager, acl) => {
+  const aclAddress = await acl.getAddress();
+  const linkAclTx = await taskManager.setACLContract(aclAddress);
+  await linkAclTx.wait();
+};
 var deployMockZkVerifier = async (hre) => {
-  await hardhatSetCode(hre, MOCKS_ZK_VERIFIER_ADDRESS, MockZkVerifierArtifact.deployedBytecode);
-  const zkVerifier = await hre.ethers.getContractAt(MockZkVerifierArtifact.abi, MOCKS_ZK_VERIFIER_ADDRESS);
+  const zkVerifier = await deployMockContractFromArtifact(hre, MockZkVerifierArtifact);
   const zkVerifierExists = await zkVerifier.exists();
   if (!zkVerifierExists) {
-    logError("MockZkVerifier does not exist", 2);
     throw new Error("MockZkVerifier does not exist");
   }
   return zkVerifier;
 };
 var deployMockQueryDecrypter = async (hre, acl) => {
-  await hardhatSetCode(hre, MOCKS_QUERY_DECRYPTER_ADDRESS, MockQueryDecrypterArtifact.deployedBytecode);
-  const queryDecrypter = await hre.ethers.getContractAt(MockQueryDecrypterArtifact.abi, MOCKS_QUERY_DECRYPTER_ADDRESS);
-  const initTx = await queryDecrypter.initialize(TASK_MANAGER_ADDRESS, await acl.getAddress());
+  const queryDecrypter = await deployMockContractFromArtifact(hre, MockQueryDecrypterArtifact);
+  const initTx = await queryDecrypter.initialize(TASK_MANAGER_ADDRESS2, await acl.getAddress());
   await initTx.wait();
   const queryDecrypterExists = await queryDecrypter.exists();
   if (!queryDecrypterExists) {
-    logError("MockQueryDecrypter does not exist", 2);
     throw new Error("MockQueryDecrypter does not exist");
   }
   return queryDecrypter;
 };
 var deployTestBedContract = async (hre) => {
-  await hardhatSetCode(hre, TEST_BED_ADDRESS, TestBedArtifact.deployedBytecode);
-  const testBed = await hre.ethers.getContractAt(TestBedArtifact.abi, TEST_BED_ADDRESS);
-  await testBed.waitForDeployment();
-  return testBed;
-};
-var fundZkVerifierSigner = async (hre) => {
-  const zkVerifierSigner = await hre.ethers.getSigner(MOCKS_ZK_VERIFIER_SIGNER_ADDRESS);
-  await hre.network.provider.send("hardhat_setBalance", [
-    zkVerifierSigner.address,
-    "0x" + hre.ethers.parseEther("10").toString(16)
-  ]);
-};
-var setTaskManagerACL = async (taskManager, acl) => {
-  const setAclTx = await taskManager.setACLContract(await acl.getAddress());
-  await setAclTx.wait();
-};
-var deployMocks = async (hre, options = {
-  deployTestBed: true,
-  gasWarning: true,
-  silent: false
-}) => {
-  const isHardhat = await checkNetworkAndSkip(hre);
-  if (!isHardhat)
-    return;
-  const logEmptyIfNoisy = () => {
-    if (!options.silent) {
-      logEmpty();
-    }
-  };
-  const logSuccessIfNoisy = (message, indent = 0) => {
-    if (!options.silent) {
-      logSuccess(message, indent);
-    }
-  };
-  const logDeploymentIfNoisy = (contractName, address) => {
-    if (!options.silent) {
-      logDeployment(contractName, address);
-    }
-  };
-  const logWarningIfNoisy = (message, indent = 0) => {
-    if (!options.silent) {
-      logWarning(message, indent);
-    }
-  };
-  logEmptyIfNoisy();
-  logSuccessIfNoisy(chalk.bold("cofhe-hardhat-plugin :: deploy mocks"), 0);
-  logEmptyIfNoisy();
-  logEmptyIfNoisy();
-  logSuccessIfNoisy("Mock contracts compiled", 1);
-  const taskManager = await deployMockTaskManager(hre);
-  logDeploymentIfNoisy("MockTaskManager", await taskManager.getAddress());
-  const acl = await deployMockACL(hre);
-  logDeploymentIfNoisy("MockACL", await acl.getAddress());
-  await setTaskManagerACL(taskManager, acl);
-  logSuccessIfNoisy("ACL address set in TaskManager", 2);
-  await fundZkVerifierSigner(hre);
-  logSuccessIfNoisy(`ZkVerifier signer (${MOCKS_ZK_VERIFIER_SIGNER_ADDRESS}) funded`, 1);
-  const zkVerifierSignerBalance = await hre.ethers.provider.getBalance(MOCKS_ZK_VERIFIER_SIGNER_ADDRESS);
-  logSuccessIfNoisy(`ETH balance: ${zkVerifierSignerBalance.toString()}`, 2);
-  const zkVerifier = await deployMockZkVerifier(hre);
-  logDeploymentIfNoisy("MockZkVerifier", await zkVerifier.getAddress());
-  const queryDecrypter = await deployMockQueryDecrypter(hre, acl);
-  logDeploymentIfNoisy("MockQueryDecrypter", await queryDecrypter.getAddress());
-  if (options.deployTestBed) {
-    logSuccessIfNoisy("TestBed deployment enabled", 2);
-    const testBed = await deployTestBedContract(hre);
-    logDeploymentIfNoisy("TestBed", await testBed.getAddress());
-  }
-  logEmptyIfNoisy();
-  logSuccessIfNoisy(chalk.bold("cofhe-hardhat-plugin :: mocks deployed successfully"), 0);
-  if (options.gasWarning) {
-    logEmptyIfNoisy();
-    logWarningIfNoisy(
-      "When using mocks, FHE operations (eg FHE.add / FHE.mul) report a higher gas price due to additional on-chain mocking logic. Deploy your contracts on a testnet chain to check the true gas costs.\n(Disable this warning by setting '@cofhe/sdk.gasWarning' to false in your hardhat config",
-      0
-    );
-  }
-  logEmptyIfNoisy();
-};
-var hardhatSetCode = async (hre, address, bytecode) => {
-  await hre.network.provider.send("hardhat_setCode", [address, bytecode]);
-};
-var checkNetworkAndSkip = async (hre) => {
-  const network = hre.network.name;
-  const isHardhat = network === "hardhat";
-  if (!isHardhat)
-    logSuccess(`cofhe-hardhat-plugin - deploy mocks - skipped on non-hardhat network ${network}`, 0);
-  return isHardhat;
+  return deployMockContractFromArtifact(hre, TestBedArtifact);
 };
+var isSilent = false;
 var logEmpty = () => {
+  if (isSilent)
+    return;
   console.log("");
 };
 var logSuccess = (message, indent = 1) => {
+  if (isSilent)
+    return;
   console.log(chalk.green(`${"  ".repeat(indent)}\u2713 ${message}`));
 };
 var logWarning = (message, indent = 1) => {
+  if (isSilent)
+    return;
   console.log(chalk.bold(chalk.yellow(`${"  ".repeat(indent)}\u26A0 NOTE:`)), message);
 };
-var logError = (message, indent = 1) => {
-  console.log(chalk.red(`${"  ".repeat(indent)}\u2717 ${message}`));
-};
 var logDeployment = (contractName, address) => {
+  if (isSilent)
+    return;
   const paddedName = `${contractName} deployed`.padEnd(36);
   logSuccess(`${paddedName} ${chalk.bold(address)}`);
 };
@@ -237,17 +273,14 @@ var logDeployment = (contractName, address) => {
 import chalk2 from "chalk";
 import "hardhat/types";
 import { MockTaskManagerArtifact as MockTaskManagerArtifact2 } from "@cofhe/mock-contracts";
-var getDeployedMockTaskManager = async (hre) => {
-  const taskManager = await hre.ethers.getContractAt(MockTaskManagerArtifact2.abi, TASK_MANAGER_ADDRESS);
-  return taskManager;
-};
 var getLoggingEnabled = async (hre) => {
-  const taskManager = await getDeployedMockTaskManager(hre);
-  return await taskManager.logOps();
+  const taskManager = await getFixedMockContract(hre, MockTaskManagerArtifact2);
+  return taskManager.logOps();
 };
 var setLoggingEnabled = async (hre, enabled) => {
-  const taskManager = await getDeployedMockTaskManager(hre);
-  await taskManager.setLogOps(enabled);
+  const taskManager = await getFixedMockContract(hre, MockTaskManagerArtifact2);
+  const tx = await taskManager.setLogOps(enabled);
+  await tx.wait();
 };
 var printLogsEnabledMessage = (closureMessage) => {
   console.log("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u252C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500");
@@ -282,72 +315,8 @@ var mock_withLogs = async (hre, closureName, closure) => {
   }
 };
 
-// src/utils.ts
-import { expect } from "chai";
-import { ethers } from "ethers";
-import "@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider";
-var mock_checkIsTestnet = async (fnName, provider) => {
-  const bytecode = await provider.getCode(MOCKS_ZK_VERIFIER_ADDRESS);
-  const isTestnet = bytecode.length === 0;
-  if (isTestnet) {
-    console.log(`${fnName} - skipped on non-testnet chain`);
-  }
-  return isTestnet;
-};
-var mock_getPlaintext = async (provider, ctHash) => {
-  if (await mock_checkIsTestnet(mock_getPlaintext.name, provider))
-    return;
-  const taskManager = new ethers.Contract(
-    TASK_MANAGER_ADDRESS,
-    ["function mockStorage(uint256) view returns (uint256)"],
-    provider
-  );
-  const plaintext = await taskManager.mockStorage(ctHash);
-  return plaintext;
-};
-var mock_getPlaintextExists = async (provider, ctHash) => {
-  if (await mock_checkIsTestnet(mock_getPlaintextExists.name, provider))
-    return;
-  const taskManager = new ethers.Contract(
-    TASK_MANAGER_ADDRESS,
-    ["function inMockStorage(uint256) view returns (bool)"],
-    provider
-  );
-  const plaintextExists = await taskManager.inMockStorage(ctHash);
-  return plaintextExists;
-};
-var mock_expectPlaintext = async (provider, ctHash, expectedValue) => {
-  if (await mock_checkIsTestnet(mock_expectPlaintext.name, provider))
-    return;
-  const plaintextExists = await mock_getPlaintextExists(provider, ctHash);
-  expect(plaintextExists).equal(true, "Plaintext does not exist");
-  const plaintext = await mock_getPlaintext(provider, ctHash);
-  expect(plaintext).equal(expectedValue, "Plaintext value is incorrect");
-};
-
-// src/expectResultUtils.ts
-import "@cofhe/sdk";
-import { expect as expect2 } from "chai";
-var expectResultError = (result, errorPartial) => {
-  expect2(result.success).to.eq(false, "Result should be an error");
-  expect2(result.error).to.include(errorPartial, `Error should contain error partial: ${errorPartial}`);
-};
-var expectResultSuccess = (result) => {
-  expect2(result.success).to.eq(true, "Result should be a success");
-  return result.data;
-};
-var expectResultValue = (result, value) => {
-  expect2(result.success).to.eq(true, "Result should be a success");
-  expect2(result.data).to.eq(value, `Result should have the expected value ${value}`);
-  return result.data;
-};
-var expectResultPartialValue = (result, partial) => {
-  expect2(result.success).to.eq(true, "Result should be a success");
-  expect2(result.data).to.include(partial, `Result should have the expected partial ${partial}`);
-  return result.data;
-};
-
 // src/index.ts
+import { hardhat } from "@cofhe/sdk/chains";
 import {
   MockACLArtifact as MockACLArtifact2,
   MockQueryDecrypterArtifact as MockQueryDecrypterArtifact2,
@@ -447,9 +416,10 @@ task(TASK_COFHE_MOCKS_SET_LOG_OPS, "Set logging for the Mock CoFHE contracts").a
 extendEnvironment((hre) => {
   hre.cofhesdk = {
     createCofhesdkConfig: async (config) => {
-      const zkvHhSigner = await hre.ethers.getImpersonatedSigner(MOCKS_ZK_VERIFIER_SIGNER_ADDRESS);
+      const zkvHhSigner = await hre.ethers.getImpersonatedSigner(MOCKS_ZK_VERIFIER_SIGNER_ADDRESS2);
       const { walletClient: zkvWalletClient } = await HardhatSignerAdapter(zkvHhSigner);
       const configWithZkvWalletClient = {
+        environment: "hardhat",
         ...config,
         _internal: {
           ...config._internal,
@@ -464,21 +434,24 @@ extendEnvironment((hre) => {
     hardhatSignerAdapter: async (signer) => {
       return HardhatSignerAdapter(signer);
     },
-    expectResultSuccess: async (result) => {
-      const awaitedResult = await result;
-      return expectResultSuccess(awaitedResult);
-    },
-    expectResultError: async (result, errorPartial) => {
-      const awaitedResult = await result;
-      return expectResultError(awaitedResult, errorPartial);
+    connectWithHardhatSigner: async (client, signer) => {
+      const { publicClient, walletClient } = await HardhatSignerAdapter(signer);
+      return client.connect(publicClient, walletClient);
     },
-    expectResultValue: async (result, value) => {
-      const awaitedResult = await result;
-      return expectResultValue(awaitedResult, value);
-    },
-    expectResultPartialValue: async (result, partial) => {
-      const awaitedResult = await result;
-      return expectResultPartialValue(awaitedResult, partial);
+    createBatteriesIncludedCofhesdkClient: async (signer) => {
+      if (!signer) {
+        [signer] = await hre.ethers.getSigners();
+      }
+      const config = await hre.cofhesdk.createCofhesdkConfig({
+        environment: "hardhat",
+        supportedChains: [hardhat]
+      });
+      const client = hre.cofhesdk.createCofhesdkClient(config);
+      await hre.cofhesdk.connectWithHardhatSigner(client, signer);
+      await client.permits.createSelf({
+        issuer: signer.address
+      });
+      return client;
     },
     mocks: {
       withLogs: async (closureName, closure) => {
@@ -500,21 +473,26 @@ extendEnvironment((hre) => {
       expectPlaintext: async (ctHash, expectedValue) => {
         const [signer] = await hre.ethers.getSigners();
         return mock_expectPlaintext(signer.provider, ctHash, expectedValue);
-      }
+      },
+      getMockTaskManager: async () => getFixedMockContract(hre, MockTaskManagerArtifact3),
+      getMockACL: async () => {
+        const taskManager = await getFixedMockContract(hre, MockTaskManagerArtifact3);
+        const aclAddress = await taskManager.acl();
+        return hre.ethers.getContractAt(MockACLArtifact2.abi, aclAddress);
+      },
+      getMockQueryDecrypter: async () => getFixedMockContract(hre, MockQueryDecrypterArtifact2),
+      getMockZkVerifier: async () => getFixedMockContract(hre, MockZkVerifierArtifact2),
+      getTestBed: async () => getFixedMockContract(hre, TestBedArtifact2)
     }
   };
 });
 export {
-  MockACLArtifact2 as MockACLArtifact,
-  MockQueryDecrypterArtifact2 as MockQueryDecrypterArtifact,
-  MockTaskManagerArtifact3 as MockTaskManagerArtifact,
-  MockZkVerifierArtifact2 as MockZkVerifierArtifact,
-  TestBedArtifact2 as TestBedArtifact,
+  TASK_COFHE_MOCKS_DEPLOY,
+  TASK_COFHE_MOCKS_SET_LOG_OPS,
+  TASK_COFHE_USE_FAUCET,
+  deployMockContractFromArtifact,
   deployMocks,
-  expectResultError,
-  expectResultPartialValue,
-  expectResultSuccess,
-  expectResultValue,
+  getFixedMockContract,
   localcofheFundAccount,
   localcofheFundWalletIfNeeded,
   mock_expectPlaintext,