From 123adbd4bb06798e5e47e7cdc2ef2aac12b6e14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joseph-Andr=C3=A9=20Turk?= <josephandre.turk@zama.ai>
Date: Wed, 25 Sep 2024 15:17:49 +0200
Subject: [PATCH 1/2] fix: mocked mode with changing .env

---
 gateway/lib/Gateway.sol | 9 ++++++---
 hardhat.config.ts       | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gateway/lib/Gateway.sol b/gateway/lib/Gateway.sol
index b8357e3e..75bd0a04 100644
--- a/gateway/lib/Gateway.sol
+++ b/gateway/lib/Gateway.sol
@@ -2,13 +2,16 @@
 
 pragma solidity ^0.8.24;
 
+import "./PredeployAddress.sol";
 import "../GatewayContract.sol";
 import "../../lib/ACL.sol";
 import "../../lib/KMSVerifier.sol";
+import "../../lib/ACLAddress.sol";
+import "../../lib/KMSVerifierAddress.sol";
 
-GatewayContract constant gatewayContract = GatewayContract(0xc8c9303Cd7F337fab769686B593B87DC3403E0ce); // Replace by GatewayContract address
-ACL constant acl = ACL(0x2Fb4341027eb1d2aD8B5D9708187df8633cAFA92); // Replace by ACL address
-KMSVerifier constant kmsVerifier = KMSVerifier(address(0x12B064FB845C1cc05e9493856a1D637a73e944bE));
+GatewayContract constant gatewayContract = GatewayContract(GATEWAY_CONTRACT_PREDEPLOY_ADDRESS); // Replace by GatewayContract address
+ACL constant acl = ACL(aclAdd); // Replace by ACL address
+KMSVerifier constant kmsVerifier = KMSVerifier(address(KMS_VERIFIER_CONTRACT_ADDRESS));
 
 library Gateway {
     function GatewayContractAddress() internal pure returns (address) {
diff --git a/hardhat.config.ts b/hardhat.config.ts
index 57fb2251..b54183b8 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -3,8 +3,6 @@ import dotenv from 'dotenv';
 import * as fs from 'fs';
 import 'hardhat-deploy';
 import 'hardhat-ignore-warnings';
-import 'hardhat-preprocessor';
-import { TASK_PREPROCESS } from 'hardhat-preprocessor';
 import type { HardhatUserConfig, extendProvider } from 'hardhat/config';
 import { task } from 'hardhat/config';
 import type { NetworkUserConfig } from 'hardhat/types';

From af6d18df00f730d41141282992b122ff341ca927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joseph-Andr=C3=A9=20Turk?= <josephandre.turk@zama.ai>
Date: Wed, 25 Sep 2024 15:28:56 +0200
Subject: [PATCH 2/2] 0.5.9

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c1d912ec..0de7acf2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "fhevm",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "fhevm",
-      "version": "0.5.8",
+      "version": "0.5.9",
       "license": "BSD-3-Clause-Clear",
       "dependencies": {
         "@openzeppelin/contracts": "^5.0.1"
diff --git a/package.json b/package.json
index d38fa6bc..1c46fe32 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fhevm",
   "description": "A Solidity library for interacting with the Zama Blockchain",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "engines": {
     "node": ">=20.0.0"
   },