Skip to content
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

feat: updated to new fhevm-core-contracts prerelease #698

Merged
merged 1 commit into from
Jan 22, 2025
Merged

feat: updated to new fhevm-core-contracts prerelease #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
node-version: 20.x
- run: cp .env.example .env
- run: npm ci --include=optional
- run: HARDHAT_TFHEEXECUTOR_EVENTS=1 npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
- run: npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
- run: npm run compile
- uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publishprerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
node-version: 20.x
- run: cp .env.example .env
- run: npm ci --include=optional
- run: HARDHAT_TFHEEXECUTOR_EVENTS=1 npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
- run: npx hardhat test test/encryptedERC20/EncryptedERC20.ts --network hardhat
- run: npm run compile
- uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
with:
Expand Down
8 changes: 4 additions & 4 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: 3 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
"prettier": "prettier --write \"**/*.{js,json,md,sol,ts,yml}\"",
"test:inband": "hardhat test",
"test": "HARDHAT_PARALLEL=1 hardhat test --parallel",
"test:mock": "HARDHAT_TFHEEXECUTOR_EVENTS=1 hardhat test --network hardhat",
"test:mock:original": "hardhat test --network hardhat",
"coverage:mock": "HARDHAT_TFHEEXECUTOR_EVENTS=1 hardhat coverage",
"coverage:mock:original": "hardhat coverage",
"test:mock": "hardhat test --network hardhat",
"coverage:mock": "hardhat coverage",
"typechain": "cross-env TS_NODE_TRANSPILE_ONLY=true hardhat typechain",
"codegen": "npx ts-node codegen/main.ts && npm run prettier",
"codegen:overloads": "npx ts-node codegen/generateOverloads.ts",
Expand Down Expand Up @@ -72,7 +70,7 @@
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"ethers": "^6.8.0",
"fhevm-core-contracts": "0.7.0-3",
"fhevm-core-contracts": "^0.7.0-4",
immortal-tofu marked this conversation as resolved.
Show resolved Hide resolved
"fhevmjs": "^0.6.0-8",
"hardhat": "^2.22.10",
"hardhat-deploy": "^0.11.29",
Expand Down
10 changes: 1 addition & 9 deletions tasks/taskDeploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,7 @@ task('task:deployTFHEExecutor')
'fhevmTemp/contracts/emptyProxy/EmptyUUPSProxy.sol:EmptyUUPSProxy',
deployer,
);
let newImplem;
if (process.env.HARDHAT_TFHEEXECUTOR_EVENTS !== '1') {
newImplem = await ethers.getContractFactory('fhevmTemp/contracts/TFHEExecutor.sol:TFHEExecutor', deployer);
} else {
newImplem = await ethers.getContractFactory(
'fhevmTemp/contracts/TFHEExecutorWithEvents.sol:TFHEExecutorWithEvents',
deployer,
);
}
const newImplem = await ethers.getContractFactory('fhevmTemp/contracts/TFHEExecutor.sol:TFHEExecutor', deployer);
const parsedEnv = dotenv.parse(fs.readFileSync('fhevmTemp/addresses/.env.exec'));
const proxyAddress = parsedEnv.TFHE_EXECUTOR_CONTRACT_ADDRESS;
const proxy = await upgrades.forceImport(proxyAddress, currentImplementation);
Expand Down
Loading
Loading