@cofhe/foundry-plugin 0.0.0-alpha-20260922112054 → 0.0.0-alpha-20261005111047

package/contracts/CofheClient.sol

@@ -50,7 +50,7 @@ contract CofheClient is Test {
   bool private _connected;
 
   constructor() {
-    mockTaskManager = MockTaskManager(TASK_MANAGER_ADDRESS);
+    mockTaskManager = MockTaskManager(address(Common.tm()));
     mockAcl = MockACL(address(mockTaskManager.acl()));
     mockZkVerifier = MockZkVerifier(ZK_VERIFIER_ADDRESS);
     mockZkVerifierSigner = MockZkVerifierSigner(ZK_VERIFIER_SIGNER_ADDRESS);

package/contracts/CofheTest.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.13;
 
 import { Test } from 'forge-std/Test.sol';
 import '@fhenixprotocol/cofhe-contracts/FHE.sol';
+import { MockCoFHEAddressBook } from '@cofhe/mock-contracts/contracts/MockCoFHEAddressBook.sol';
 import { MockTaskManager } from '@cofhe/mock-contracts/contracts/MockTaskManager.sol';
 import { MockACL } from '@cofhe/mock-contracts/contracts/MockACL.sol';
 import { ACPTimestampRevoker } from '@cofhe/mock-contracts/contracts/ACPTimestampRevoker.sol';
@@ -21,6 +22,7 @@ import {
 /// @dev    Inherit this contract and call `deployMocks()` in your `setUp()` function.
 ///         Use `createCofheClient()` to obtain a connected client instance.
 abstract contract CofheTest is Test {
+  MockCoFHEAddressBook public mockAddressBook;
   MockTaskManager public mockTaskManager;
   MockACL public mockAcl;
   ACPTimestampRevoker public acpRevoker;
@@ -31,6 +33,7 @@ abstract contract CofheTest is Test {
   MockThresholdNetworkSigner public mockThresholdNetworkSigner;
 
   // Keep in sync with `packages/sdk/core/consts.ts`
+  address constant MOCKS_TASK_MANAGER_ADDRESS = 0x0000000000000000000000000000000000005000;
   address constant ZK_VERIFIER_ADDRESS = 0x0000000000000000000000000000000000005001;
   address constant THRESHOLD_NETWORK_ADDRESS = 0x0000000000000000000000000000000000005002;
 
@@ -42,20 +45,27 @@ abstract contract CofheTest is Test {
 
   /// @notice Deploys all mock contracts and wires them together, mirroring the Hardhat plugin's deployment order.
   function deployMocks() public {
+    // 0. Address Book (FHE.sol resolves the Task Manager through it)
+    deployCodeTo('MockCoFHEAddressBook.sol:MockCoFHEAddressBook', COFHE_ADDRESS_BOOK);
+    mockAddressBook = MockCoFHEAddressBook(COFHE_ADDRESS_BOOK);
+    vm.label(address(mockAddressBook), 'MockCoFHEAddressBook');
+
     // 1. Task Manager
-    deployCodeTo('MockTaskManager.sol:MockTaskManager', TASK_MANAGER_ADDRESS);
-    mockTaskManager = MockTaskManager(TASK_MANAGER_ADDRESS);
+    deployCodeTo('MockTaskManager.sol:MockTaskManager', MOCKS_TASK_MANAGER_ADDRESS);
+    mockTaskManager = MockTaskManager(MOCKS_TASK_MANAGER_ADDRESS);
+    mockAddressBook.setTm(TASK_MANAGER_ID, MOCKS_TASK_MANAGER_ADDRESS);
     mockTaskManager.initialize(TM_ADMIN);
     mockTaskManager.setLogOps(false);
     // Exclude mock-only plaintext replication from gas metering so reported gas is closer
     // to the real task manager. Requires cheatcode access, which etched contracts don't
     // inherit from the test contract.
-    vm.allowCheatcodes(TASK_MANAGER_ADDRESS);
+    vm.allowCheatcodes(MOCKS_TASK_MANAGER_ADDRESS);
     mockTaskManager.setMockGasExcluded(true);
     vm.label(address(mockTaskManager), 'MockTaskManager');
 
     // 2. ACL (non-fixed deploy so constructor runs and EIP712 domain is set)
     mockAcl = new MockACL();
+    mockAcl.setTaskManager(address(mockTaskManager));
     vm.label(address(mockAcl), 'MockACL');
 
     // ACP (ACP V3): default revoker (verification inherited by the ACL)
@@ -93,7 +103,7 @@ abstract contract CofheTest is Test {
     // 7. Threshold Network
     deployCodeTo('MockThresholdNetwork.sol:MockThresholdNetwork', THRESHOLD_NETWORK_ADDRESS);
     mockThresholdNetwork = MockThresholdNetwork(THRESHOLD_NETWORK_ADDRESS);
-    mockThresholdNetwork.initialize(TASK_MANAGER_ADDRESS, address(mockAcl));
+    mockThresholdNetwork.initialize(address(mockTaskManager), address(mockAcl));
     vm.label(address(mockThresholdNetwork), 'MockThresholdNetwork');
 
     // 8. Threshold Network Signer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cofhe/foundry-plugin",
-  "version": "0.0.0-alpha-20260922112054",
+  "version": "0.0.0-alpha-20261005111047",
   "description": "Foundry plugin for CoFHE — Write and test FHE enabled contracts",
   "license": "MIT",
   "repository": {
@@ -24,9 +24,9 @@
     "fhenix"
   ],
   "dependencies": {
-    "@fhenixprotocol/cofhe-contracts": "0.2.0",
+    "@fhenixprotocol/cofhe-contracts": "file:../../vendor/fhenixprotocol-cofhe-contracts-0.4.0.tgz",
     "@openzeppelin/contracts": "5.4.0",
-    "@cofhe/mock-contracts": "0.0.0-alpha-20260922112054"
+    "@cofhe/mock-contracts": "0.0.0-alpha-20261005111047"
   },
   "devDependencies": {
     "forge-std": "github:foundry-rs/forge-std#c0f966cb111f621bfb283b2a388bc7be18953bba",