@cofhe/foundry-plugin 0.8.0 → 1.0.0-alpha.0

package/README.md

@@ -18,6 +18,7 @@ libs = ["node_modules", "lib"]
 remappings = [
   "forge-std/=node_modules/forge-std/src/",
   "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/",
+  "@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/",
   "@fhenixprotocol/cofhe-contracts/=node_modules/@fhenixprotocol/cofhe-contracts/",
   "@cofhe/mock-contracts/=node_modules/@cofhe/mock-contracts/",
   "@cofhe/foundry-plugin/=node_modules/@cofhe/foundry-plugin/contracts/"

package/contracts/CofheClient.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.25;
 
 import { Test } from 'forge-std/Test.sol';
 import { MessageHashUtils } from '@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol';

package/contracts/CofheTest.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.13;
+pragma solidity ^0.8.25;
 
 import { Test } from 'forge-std/Test.sol';
 import '@fhenixprotocol/cofhe-contracts/FHE.sol';
@@ -8,6 +8,7 @@ import { MockTaskManager } from '@cofhe/mock-contracts/contracts/MockTaskManager
 import { MockACL } from '@cofhe/mock-contracts/contracts/MockACL.sol';
 import { ACPTimestampRevoker } from '@cofhe/mock-contracts/contracts/ACPTimestampRevoker.sol';
 import { ACPShareRegistry } from '@cofhe/mock-contracts/contracts/ACPShareRegistry.sol';
+import { MockERC1967Proxy } from '@cofhe/mock-contracts/contracts/MockERC1967Proxy.sol';
 import { MockZkVerifier } from '@cofhe/mock-contracts/contracts/MockZkVerifier.sol';
 import { MockZkVerifierSigner } from './MockZkVerifierSigner.sol';
 import { MockThresholdNetwork } from '@cofhe/mock-contracts/contracts/MockThresholdNetwork.sol';
@@ -74,7 +75,16 @@ abstract contract CofheTest is Test {
     mockAcl.setDefaultRevokerContract(address(acpRevoker));
 
     // ACP: on-chain hand-off for sharing ACPs
-    acpShareRegistry = new ACPShareRegistry();
+    // the production contract (upgradeable): behind a proxy, initialized with this test as admin
+    ACPShareRegistry acpShareRegistryImpl = new ACPShareRegistry();
+    acpShareRegistry = ACPShareRegistry(
+      address(
+        new MockERC1967Proxy(
+          address(acpShareRegistryImpl),
+          abi.encodeCall(ACPShareRegistry.initialize, (address(this)))
+        )
+      )
+    );
     vm.label(address(acpShareRegistry), 'ACPShareRegistry');
     mockAcl.setShareRegistry(address(acpShareRegistry));
 

package/foundry.toml

@@ -7,6 +7,7 @@ remappings = [
   "forge-std/=node_modules/forge-std/src/",
   "hardhat/=node_modules/forge-std/src/",
   "@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/",
+  "@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/",
   "@fhenixprotocol/cofhe-contracts/=node_modules/@fhenixprotocol/cofhe-contracts/",
   "@cofhe/mock-contracts/=node_modules/@cofhe/mock-contracts/"
 ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cofhe/foundry-plugin",
-  "version": "0.8.0",
+  "version": "1.0.0-alpha.0",
   "description": "Foundry plugin for CoFHE — Write and test FHE enabled contracts",
   "license": "MIT",
   "repository": {
@@ -26,7 +26,8 @@
   "dependencies": {
     "@fhenixprotocol/cofhe-contracts": "1.0.0",
     "@openzeppelin/contracts": "5.4.0",
-    "@cofhe/mock-contracts": "0.8.0"
+    "@openzeppelin/contracts-upgradeable": "5.4.0",
+    "@cofhe/mock-contracts": "1.0.0-alpha.0"
   },
   "devDependencies": {
     "forge-std": "github:foundry-rs/forge-std#c0f966cb111f621bfb283b2a388bc7be18953bba",