From 3242513f99dbd0a9a0f47546b386d9b9fad24142 Mon Sep 17 00:00:00 2001
From: Aleksandr Tarelkin <tarelkinaa@bk.ru>
Date: Tue, 13 Feb 2024 12:33:15 +0300
Subject: [PATCH] proxy init

---
 contracts/Escrow.sol       | 8 +++++---
 test/scenario/escrow.t.sol | 9 ++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/contracts/Escrow.sol b/contracts/Escrow.sol
index bf2ff4b6..c48ca5dc 100644
--- a/contracts/Escrow.sol
+++ b/contracts/Escrow.sol
@@ -113,12 +113,12 @@ contract Escrow {
     address internal _govState;
     State internal _state;
 
-    uint256 internal _totalStEthInEthLocked = 1;
+    uint256 internal _totalStEthInEthLocked;
     uint256 internal _totalWstEthInEthLocked;
     uint256 internal _totalWithdrawalNftsAmountLocked;
     uint256 internal _totalFinalizedWithdrawalNftsAmountLocked;
 
-    uint256 internal _totalEscrowShares = 1;
+    uint256 internal _totalEscrowShares;
     uint256 internal _claimedWQRequestsAmount;
 
     uint256 internal _rageQuitAmountTotal;
@@ -135,13 +135,15 @@ contract Escrow {
         WITHDRAWAL_QUEUE = withdrawalQueue;
         BURNER_VAULT = burnerVault;
 
-        // _govState = address(this);
+        _govState = address(this);
     }
 
     function initialize(address governanceState) external {
         if (_govState != address(0)) {
             revert Unauthorized();
         }
+        _totalStEthInEthLocked = 1;
+        _totalEscrowShares = 1;
         _govState = governanceState;
     }
 
diff --git a/test/scenario/escrow.t.sol b/test/scenario/escrow.t.sol
index a796d72e..4c7e825c 100644
--- a/test/scenario/escrow.t.sol
+++ b/test/scenario/escrow.t.sol
@@ -56,6 +56,8 @@ contract EscrowHappyPath is TestHelpers {
     address internal stEthHolder1;
     address internal stEthHolder2;
 
+    address internal proxyAdmin = makeAddr("proxy_admin");
+
     function assertEq(Escrow.Balance memory a, Escrow.Balance memory b) internal {
         assertApproxEqAbs(a.stEth, b.stEth, 2, "StEth balance missmatched");
         assertApproxEqAbs(a.wstEth, b.wstEth, 2, "WstEth balance missmatched");
@@ -72,7 +74,12 @@ contract EscrowHappyPath is TestHelpers {
         TransparentUpgradeableProxy config;
         (, config,) = deployConfig(DAO_VOTING);
 
-        (escrow, burnerVault) = deployEscrowImplementation(ST_ETH, WST_ETH, WITHDRAWAL_QUEUE, BURNER, address(config));
+        Escrow escrowImpl;
+        (escrowImpl, burnerVault) =
+            deployEscrowImplementation(ST_ETH, WST_ETH, WITHDRAWAL_QUEUE, BURNER, address(config));
+
+        escrow =
+            Escrow(payable(address(new TransparentUpgradeableProxy(address(escrowImpl), proxyAdmin, new bytes(0)))));
 
         govState = new GovernanceState__mock();