Skip to content

Migrate @fhevm/solidity to 0.8.0 #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arr00 merged 12 commits into from
Sep 23, 2025
Merged

Migrate @fhevm/solidity to 0.8.0 #202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fb3cd45
chore: install fhevm 0.8.0
RegisGraptin Sep 9, 2025
efc8713
fix: update how to retrieve acl address in tests
RegisGraptin Sep 9, 2025
bba11a7
fix: lint & handle ACL address
RegisGraptin Sep 9, 2025
01d54d5
fix tests
arr00 Sep 23, 2025
e53eaeb
add changeset
arr00 Sep 23, 2025
39ff0ff
Merge branch 'master' into chore-migrate-fhevm-0.8.0
arr00 Sep 23, 2025
912149a
Bump to fhevm 0.8
james-toussaint Sep 23, 2025
e84c2f4
Remove contracts package lock
james-toussaint Sep 23, 2025
a6f5400
Merge branch 'feature/fhevm-0.8' into chore-migrate-fhevm-0.8.0
james-toussaint Sep 23, 2025
8fb4e95
Update contracts/package.json
arr00 Sep 23, 2025
145ef2d
Update package.json
arr00 Sep 23, 2025
38f10bc
Update package lock
james-toussaint Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions contracts/mocks/docs/SwapERC7984ToERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ contract SwapConfidentialToERC20 {
_receivers[requestID] = msg.sender;
}

function finalizeSwap(uint256 requestID, uint64 amount, bytes[] memory signatures) public virtual {
FHE.checkSignatures(requestID, signatures);
function finalizeSwap(uint256 requestID, bytes memory cleartexts, bytes memory signatures) public virtual {
FHE.checkSignatures(requestID, cleartexts, signatures);
uint64 amount = abi.decode(cleartexts, (uint64));
address to = _receivers[requestID];
require(to != address(0), SwapConfidentialToERC20InvalidGatewayRequest(requestID));
delete _receivers[requestID];
Expand Down
1 change: 0 additions & 1 deletion contracts/mocks/finance/VestingWalletConfidentialFactoryMock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,5 @@ contract VestingWalletCliffExecutorConfidential is VestingWalletCliffConfidentia
__ERC7821WithExecutor_init(executor);

FHE.setCoprocessor(ZamaConfig.getSepoliaConfig());
FHE.setDecryptionOracle(ZamaConfig.getSepoliaOracleAddress());
}
}
2 changes: 1 addition & 1 deletion contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"homepage": "https://openzeppelin.com/contracts/",
"peerDependencies": {
"@fhevm/solidity": "0.7.0",
"@fhevm/solidity": "0.8.0",
"@openzeppelin/contracts": "^5.4.0",
"@openzeppelin/contracts-upgradeable": "^5.4.0"
}
Expand Down
7 changes: 4 additions & 3 deletions contracts/token/ERC7984/ERC7984.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,11 @@ abstract contract ERC7984 is IERC7984 {
*/
function finalizeDiscloseEncryptedAmount(
uint256 requestId,
uint64 amount,
bytes[] memory signatures
bytes memory cleartexts,
bytes memory signatures
) public virtual {
FHE.checkSignatures(requestId, signatures);
FHE.checkSignatures(requestId, cleartexts, signatures);
uint64 amount = abi.decode(cleartexts, (uint64));

euint64 requestHandle = euint64.wrap(FHE.loadRequestedHandles(requestId)[0]);
emit AmountDisclosed(requestHandle, amount);
Expand Down
5 changes: 3 additions & 2 deletions contracts/token/ERC7984/extensions/ERC7984ERC20Wrapper.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,9 @@ abstract contract ERC7984ERC20Wrapper is ERC7984, IERC1363Receiver {
/**
* @dev Fills an unwrap request for a given request id related to a decrypted unwrap amount.
*/
function finalizeUnwrap(uint256 requestID, uint64 amount, bytes[] memory signatures) public virtual {
FHE.checkSignatures(requestID, signatures);
function finalizeUnwrap(uint256 requestID, bytes memory cleartexts, bytes memory signatures) public virtual {
FHE.checkSignatures(requestID, cleartexts, signatures);
uint64 amount = abi.decode(cleartexts, (uint64));
address to = _receivers[requestID];
require(to != address(0), ERC7984InvalidGatewayRequest(requestID));
delete _receivers[requestID];
Expand Down
75 changes: 51 additions & 24 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"@changesets/read": "^0.6.0",
"@eslint/compat": "^1.2.8",
"@eslint/js": "^9.9.0",
"@fhevm/core-contracts": "0.7.0-12",
"@fhevm/hardhat-plugin": "0.0.1-3",
"@fhevm/solidity": "0.7.0",
"@fhevm/core-contracts": "0.8.0",
"@fhevm/hardhat-plugin": "0.1.0-0",
"@fhevm/solidity": "0.8.0",
"@nomicfoundation/hardhat-chai-matchers": "^2.0.6",
Copy link
Contributor

@coderabbitai coderabbitai bot Sep 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Verification agent

🧩 Analysis chain

FHE stack bumped (core-contracts 0.8.0, hardhat-plugin 0.1.0-0, solidity 0.8.0, relayer-sdk ^0.2.0).

Looks consistent with contract changes. Please verify Hardhat config still loads the updated plugin and tasks, and that Node 20+ works end-to-end.

  • If the plugin interface changed, ensure hardhat.config.{ts,js} imports "@fhevm/hardhat-plugin" and any config keys were migrated.
  • Consider pinning the prerelease plugin to an exact version in CI to avoid surprise breaks.

Run:

Also applies to: 66-66

🏁 Script executed:

#!/bin/bash
rg -nP '@fhevm/hardhat-plugin|fhevm' -C2 hardhat.config.* scripts || true
node -v
npm ci
npm run compile

Length of output: 2867

🏁 Script executed:

#!/bin/bash
# Show lines around the docs/config import in Hardhat config
sed -n '30,50p' hardhat.config.ts

# Verify existence of docs/config file
find . -type f | grep 'docs/config' || echo 'No docs/config file found'

Length of output: 278

Hardhat configuration broken by missing docs/config import

  • The docgen setting in hardhat.config.ts uses require('./docs/config'), but no such file exists, causing build failures. Add the missing docs/config module or update the import path.
  • Ensure import '@fhevm/hardhat-plugin' and any plugin-specific config keys in hardhat.config.{ts,js} reflect the updated interface.
  • Pin @fhevm/hardhat-plugin to the exact prerelease version in CI to avoid surprise breaks.
🤖 Prompt for AI Agents 
In package.json around lines 47 to 50, the project references
@fhevm/hardhat-plugin but the Hardhat config currently requires a missing
./docs/config module which breaks builds; add the missing docs/config module
(exporting the config object expected by hardhat.config.ts) or update
hardhat.config.ts to import the correct path, update hardhat.config.{ts,js} to
include import '@fhevm/hardhat-plugin' and adjust any plugin-specific config
keys to match the plugin's current interface, and pin @fhevm/hardhat-plugin to
the exact prerelease version in package.json and CI (use the full version
string) so installs are deterministic.

"@nomicfoundation/hardhat-ethers": "^3.0.4",
"@nomicfoundation/hardhat-network-helpers": "^1.0.3",
Expand All @@ -63,7 +63,7 @@
"@types/node": "^18.19.59",
"@typescript-eslint/eslint-plugin": "^8.0.1",
"@typescript-eslint/parser": "^8.0.1",
"@zama-fhe/relayer-sdk": "^0.1.0-5",
"@zama-fhe/relayer-sdk": "^0.2.0",
"chai": "^4.3.7",
"cross-env": "^7.0.3",
"dotenv": "^16.0.3",
Expand Down
Loading