chore: pin OZ confidential to v0.4.0 and simplify test helpers (#3)

Address review feedback:

- Pin @openzeppelin-confidential-contracts to tagged release v0.4.0
  instead of commit hash 6edd293. Add explicit @openzeppelin/contracts(-upgradeable)/
  remappings, since v0.4.0 ships a lib/ folder with alias stubs that
  otherwise hijack forge's auto-remap fallback used by forge-fhevm.
- Replace hardcoded ALICE_PK constant with forge-std's makeAccount("alice")
  helper, which returns an Account { addr, key } and labels the address.
- Add a userDecryptAs(pk, handle, contract) helper that combines
  signUserDecrypt and userDecrypt into a single call site.

Author: poppyseedDev

foundry.toml

@@ -21,7 +21,7 @@ line_length = 120
 "@openzeppelin-contracts" = "5.1.0"
 "@openzeppelin-contracts-upgradeable" = "5.1.0"
 forge-std = "1.14.0"
-"@openzeppelin-confidential-contracts" = { version = "6edd293", git = "https://github.com/OpenZeppelin/openzeppelin-confidential-contracts.git", rev = "6edd293" }
+"@openzeppelin-confidential-contracts" = { version = "0.4.0", git = "https://github.com/OpenZeppelin/openzeppelin-confidential-contracts.git", rev = "v0.4.0" }
 "@encrypted-types" = "0.0.4"
 "@fhevm-solidity" = "0.11.1"
 forge-fhevm = { version = "eba2324", git = "https://github.com/zama-ai/forge-fhevm.git", rev = "eba2324" }

remappings.txt

@@ -2,7 +2,9 @@
 @fhevm/solidity/=dependencies/@fhevm-solidity-0.11.1/
 @openzeppelin-contracts-upgradeable/=dependencies/@openzeppelin-contracts-upgradeable-5.1.0/
 @openzeppelin-contracts/=dependencies/@openzeppelin-contracts-5.1.0/
-@openzeppelin/confidential-contracts/=dependencies/@openzeppelin-confidential-contracts-6edd293/contracts/
+@openzeppelin/contracts-upgradeable/=dependencies/@openzeppelin-contracts-upgradeable-5.1.0/
+@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.1.0/
+@openzeppelin/confidential-contracts/=dependencies/@openzeppelin-confidential-contracts-0.4.0/contracts/
 encrypted-types/=dependencies/@encrypted-types-0.0.4/
 forge-fhevm/=dependencies/forge-fhevm-eba2324/src/
 forge-std/=dependencies/forge-std-1.14.0/src

soldeer.lock

@@ -14,9 +14,9 @@ integrity = "67f415709d30b01d3876addb7e5bbaf3efc119cebe81dda10fb495163297b763"
 
 [[dependencies]]
 name = "@openzeppelin-confidential-contracts"
-version = "6edd293"
+version = "0.4.0"
 git = "https://github.com/OpenZeppelin/openzeppelin-confidential-contracts.git"
-rev = "6edd293165d6dc1fd29fffaa391b370b1888a70d"
+rev = "v0.4.0"
 
 [[dependencies]]
 name = "@openzeppelin-contracts"

test/FHECounter.t.sol

@@ -8,14 +8,19 @@ import {euint32, externalEuint32} from "encrypted-types/EncryptedTypes.sol";
 contract FHECounterTest is FhevmTest {
     FHECounter counter;
     address counterAddress;
-    uint256 internal constant ALICE_PK = 0xA11CE;
-    address alice;
+    Account alice;
 
     function setUp() public override {
         super.setUp();
         counter = new FHECounter();
         counterAddress = address(counter);
-        alice = vm.addr(ALICE_PK);
+        alice = makeAccount("alice");
+    }
+
+    /// @dev Signs the user-decrypt request with `userPk` and decrypts `handle` in one step.
+    function userDecryptAs(uint256 userPk, bytes32 handle, address contractAddress) internal returns (uint256) {
+        bytes memory sig = signUserDecrypt(userPk, contractAddress);
+        return userDecrypt(handle, vm.addr(userPk), contractAddress, sig);
     }
 
     function test_encryptedCountShouldBeUninitializedAfterDeployment() public view {
@@ -31,35 +36,34 @@ contract FHECounterTest is FhevmTest {
 
         // Encrypt constant 1 as a euint32
         uint32 clearOne = 1;
-        (externalEuint32 encryptedOne, bytes memory inputProof) = encryptUint32(clearOne, alice, counterAddress);
+        (externalEuint32 encryptedOne, bytes memory inputProof) = encryptUint32(clearOne, alice.addr, counterAddress);
 
-        vm.prank(alice);
+        vm.prank(alice.addr);
         counter.increment(encryptedOne, inputProof);
 
         euint32 encryptedCountAfterInc = counter.getCount();
-        bytes memory sig = signUserDecrypt(ALICE_PK, counterAddress);
-        uint256 clearCountAfterInc = userDecrypt(euint32.unwrap(encryptedCountAfterInc), alice, counterAddress, sig);
+        uint256 clearCountAfterInc = userDecryptAs(alice.key, euint32.unwrap(encryptedCountAfterInc), counterAddress);
 
         assertEq(clearCountAfterInc, clearCountBeforeInc + clearOne);
     }
 
     function test_decrementTheCounterByOne() public {
         // Encrypt constant 1 as a euint32
         uint32 clearOne = 1;
-        (externalEuint32 encryptedOne, bytes memory inputProof) = encryptUint32(clearOne, alice, counterAddress);
+        (externalEuint32 encryptedOne, bytes memory inputProof) = encryptUint32(clearOne, alice.addr, counterAddress);
 
         // First increment by 1, count becomes 1
-        vm.prank(alice);
+        vm.prank(alice.addr);
         counter.increment(encryptedOne, inputProof);
 
         // Then decrement by 1, count goes back to 0
-        (externalEuint32 encryptedOneDec, bytes memory inputProofDec) = encryptUint32(clearOne, alice, counterAddress);
-        vm.prank(alice);
+        (externalEuint32 encryptedOneDec, bytes memory inputProofDec) =
+            encryptUint32(clearOne, alice.addr, counterAddress);
+        vm.prank(alice.addr);
         counter.decrement(encryptedOneDec, inputProofDec);
 
         euint32 encryptedCountAfterDec = counter.getCount();
-        bytes memory sig = signUserDecrypt(ALICE_PK, counterAddress);
-        uint256 clearCountAfterDec = userDecrypt(euint32.unwrap(encryptedCountAfterDec), alice, counterAddress, sig);
+        uint256 clearCountAfterDec = userDecryptAs(alice.key, euint32.unwrap(encryptedCountAfterDec), counterAddress);
 
         assertEq(clearCountAfterDec, 0);
     }