fix: resolve conflicts

sakulstra · sakulstra · commit cef817a0a555 · 2025-05-16T14:52:03.000+02:00
diff --git a/diffs/100_0xb50201558B00496A145fE76f7424749556E326D8_before_100_0xb50201558B00496A145fE76f7424749556E326D8_after.md b/diffs/100_0xb50201558B00496A145fE76f7424749556E326D8_before_100_0xb50201558B00496A145fE76f7424749556E326D8_after.md
@@ -484,7 +484,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x00000000000000000000000077c874799e9564a0d0670ed40bf023d249e7bb21",
-          "newValue": "0x000000000000000000000000988f8e8cce30907873b240eaae8f3602b867c542",
+          "newValue": "0x0000000000000000000000006444aea11a13e4a56b96055bd0c2e1c1fd1d42bc",
           "label": "Implementation slot"
         },
         "0x45fb21bff46f3219261e8dfd39448f990f239040f94fb8fbbbea3b4a28f27697": {
diff --git a/diffs/137_0x794a61358D6845594F94dc1DB02A252b5b4814aD_before_137_0x794a61358D6845594F94dc1DB02A252b5b4814aD_after.md b/diffs/137_0x794a61358D6845594F94dc1DB02A252b5b4814aD_before_137_0x794a61358D6845594F94dc1DB02A252b5b4814aD_after.md
@@ -834,7 +834,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x000000000000000000000000b7467b66d86ce80cc258f28d266a18a51db7fac8",
-          "newValue": "0x000000000000000000000000cf7a0353cfd20b79c1f28bf7edc7379f6e5f9a56",
+          "newValue": "0x0000000000000000000000006e7821aa31a652618c4be58d2ec4a2148e30e82d",
           "label": "Implementation slot"
         },
         "0x36b11cd1c4e5e1587251c74b00c0b8ed2cffd67f65e30014b56f2887c4780880": {
diff --git a/diffs/146_0x5362dBb1e601abF3a4c14c22ffEdA64042E5eAA3_before_146_0x5362dBb1e601abF3a4c14c22ffEdA64042E5eAA3_after.md b/diffs/146_0x5362dBb1e601abF3a4c14c22ffEdA64042E5eAA3_before_146_0x5362dBb1e601abF3a4c14c22ffEdA64042E5eAA3_after.md
@@ -150,7 +150,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x00000000000000000000000046dcd5f4600319b02649fd76b55aa6c1035ca478",
-          "newValue": "0x000000000000000000000000e5f4367407a7036c503360369a63795d15430633",
+          "newValue": "0x0000000000000000000000005decade8774ad2c4d3bd1be2f8a366c4d280ec04",
           "label": "Implementation slot"
         },
         "0x37b7fc6fa4a96109d1745c7f989f397f19e6bafe7d5438dd5a1507240efe1fb6": {
diff --git a/diffs/1_0x0AA97c284e98396202b6A04024F5E2c65026F3c0_before_1_0x0AA97c284e98396202b6A04024F5E2c65026F3c0_after.md b/diffs/1_0x0AA97c284e98396202b6A04024F5E2c65026F3c0_before_1_0x0AA97c284e98396202b6A04024F5E2c65026F3c0_after.md
@@ -23,7 +23,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x00000000000000000000000056401d666f486c495566a29249447c2bb8c56bb2",
-          "newValue": "0x0000000000000000000000002e787641c73cf05f0aa1f349520b245be9d7d0b5",
+          "newValue": "0x0000000000000000000000008cdcde4aad19ce4bbefc4eecf469eaebfebd5a57",
           "label": "Implementation slot"
         },
         "0x5d0932b3bfc1052ccb8f073298333897b875f4c2d9eba20cdc99f93ff1bc187d": {
diff --git a/diffs/1_0x4e033931ad43597d96D6bcc25c280717730B58B1_before_1_0x4e033931ad43597d96D6bcc25c280717730B58B1_after.md b/diffs/1_0x4e033931ad43597d96D6bcc25c280717730B58B1_before_1_0x4e033931ad43597d96D6bcc25c280717730B58B1_after.md
@@ -402,7 +402,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x000000000000000000000000c405a0eab071a085a832f876d8e5be7cfeafb624",
-          "newValue": "0x0000000000000000000000005a238c489ba71010b33ddaa4af5d787d43169ce5",
+          "newValue": "0x000000000000000000000000a313fd9cd56d3419526b914b2d429dd24f2807f2",
           "label": "Implementation slot"
         },
         "0x4ef18721e98712b47bd659171158f093c47a5bb2c0ced3ed1c21e431251550cb": {
diff --git a/diffs/1_0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2_before_1_0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2_after.md b/diffs/1_0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2_before_1_0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2_after.md
@@ -2345,7 +2345,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x0000000000000000000000009aeb8aaa1ca38634aa8c0c8933e7fb4d61091327",
-          "newValue": "0x000000000000000000000000b4626bd40d815f491111e3999f7d37e000843419",
+          "newValue": "0x000000000000000000000000035ae4517a402f99c674f8f150cf362d79bfc3d8",
           "label": "Implementation slot"
         },
         "0x392c0c0c73cb5e05233b1c77b0479a574c988ddf1c183c2c908a622e3cad9d23": {
diff --git a/diffs/43114_0x794a61358D6845594F94dc1DB02A252b5b4814aD_before_43114_0x794a61358D6845594F94dc1DB02A252b5b4814aD_after.md b/diffs/43114_0x794a61358D6845594F94dc1DB02A252b5b4814aD_before_43114_0x794a61358D6845594F94dc1DB02A252b5b4814aD_after.md
@@ -538,7 +538,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x000000000000000000000000b7467b66d86ce80cc258f28d266a18a51db7fac8",
-          "newValue": "0x00000000000000000000000005890fe48ad5d2dbe8f23ceb1421f80d15268057",
+          "newValue": "0x0000000000000000000000000edb6814b2694e78103a11a4a4d9986f401182c3",
           "label": "Implementation slot"
         },
         "0x5a85697c728b95b1bba9fb8db304ba06d5e7263188872ba2eeadc8641e1dbdbb": {
diff --git a/diffs/56_0x6807dc923806fE8Fd134338EABCA509979a7e0cB_before_56_0x6807dc923806fE8Fd134338EABCA509979a7e0cB_after.md b/diffs/56_0x6807dc923806fE8Fd134338EABCA509979a7e0cB_before_56_0x6807dc923806fE8Fd134338EABCA509979a7e0cB_after.md
@@ -316,7 +316,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x0000000000000000000000009e255f9d061405769abb2b583c9b2c4368b482b9",
-          "newValue": "0x000000000000000000000000dbe81683e57160b7922c4f045e707140051b684a",
+          "newValue": "0x000000000000000000000000b25867a09fbbf68c2aa8e9c8f723537f2eb4b20c",
           "label": "Implementation slot"
         },
         "0x4f7e401a3bd0628317467a9b48b7a242cbced3635594d81f505845155d278ce4": {
diff --git a/diffs/59144_0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac_before_59144_0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac_after.md b/diffs/59144_0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac_before_59144_0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac_after.md
@@ -636,7 +636,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x000000000000000000000000e3a01f80c1b5ab2159a3c8b9318c38833011ddf8",
-          "newValue": "0x000000000000000000000000b5b53df974db35feed29d2640489250d09996e6b",
+          "newValue": "0x0000000000000000000000008ceb8bd982220ed3fcf6c9941ae0c61e5f003dcc",
           "label": "Implementation slot"
         },
         "0x47c114f9963ddd74f3ad3dd936164baac6680feef7c147c9d0c0adb8aa15050c": {
diff --git a/reports/100_0xb50201558B00496A145fE76f7424749556E326D8_after.json b/reports/100_0xb50201558B00496A145fE76f7424749556E326D8_after.json
@@ -502,7 +502,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x00000000000000000000000077c874799e9564a0d0670ed40bf023d249e7bb21",
-          "newValue": "0x0000000000000000000000002f4fc5bb7c964d8d3c8a363461fce5f2c4162623"
+          "newValue": "0x00000000000000000000000096861c73ee3387eb6d9488cfba643b64abc66654"
         },
         "0x45fb21bff46f3219261e8dfd39448f990f239040f94fb8fbbbea3b4a28f27697": {
           "previousValue": "0x00000000000000000000000000000000000000000000000000000000014a885e",
diff --git a/reports/137_0x794a61358D6845594F94dc1DB02A252b5b4814aD_after.json b/reports/137_0x794a61358D6845594F94dc1DB02A252b5b4814aD_after.json
@@ -844,7 +844,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x000000000000000000000000b7467b66d86ce80cc258f28d266a18a51db7fac8",
-          "newValue": "0x000000000000000000000000076f4100961412d6a97b6737cfb49ab0004bd73b"
+          "newValue": "0x000000000000000000000000bde1d2fb98681e70a757a3bdb653c8ab285e8ff1"
         },
         "0x36b11cd1c4e5e1587251c74b00c0b8ed2cffd67f65e30014b56f2887c4780880": {
           "previousValue": "0x0000000000000000000000000000000000000000000000000000000000000000",
diff --git a/reports/146_0x5362dBb1e601abF3a4c14c22ffEdA64042E5eAA3_after.json b/reports/146_0x5362dBb1e601abF3a4c14c22ffEdA64042E5eAA3_after.json
@@ -148,7 +148,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x00000000000000000000000046dcd5f4600319b02649fd76b55aa6c1035ca478",
-          "newValue": "0x0000000000000000000000009e9aff308865092c20b98785beb91436be721ca0"
+          "newValue": "0x0000000000000000000000001360167c270893cacd27dc62ade0380c27a21d7d"
         },
         "0x37b7fc6fa4a96109d1745c7f989f397f19e6bafe7d5438dd5a1507240efe1fb6": {
           "previousValue": "0x00000000000000000000000000000000000000000000000000000000cd1d997a",
diff --git a/reports/1_0x0AA97c284e98396202b6A04024F5E2c65026F3c0_after.json b/reports/1_0x0AA97c284e98396202b6A04024F5E2c65026F3c0_after.json
@@ -24,7 +24,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x00000000000000000000000056401d666f486c495566a29249447c2bb8c56bb2",
-          "newValue": "0x000000000000000000000000716b2bc73c65fb2a47ab88b0d9b652f4dfc3b245"
+          "newValue": "0x000000000000000000000000b5e3353289103d698fcb141b921d0e9beccf7ae5"
         },
         "0x5d0932b3bfc1052ccb8f073298333897b875f4c2d9eba20cdc99f93ff1bc187d": {
           "previousValue": "0x0000000000000000000000000000000000000000000000000000000000000000",
diff --git a/reports/1_0x4e033931ad43597d96D6bcc25c280717730B58B1_after.json b/reports/1_0x4e033931ad43597d96D6bcc25c280717730B58B1_after.json
@@ -440,7 +440,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x000000000000000000000000c405a0eab071a085a832f876d8e5be7cfeafb624",
-          "newValue": "0x0000000000000000000000006862ccb9f8297414834ef31e3d400514bbab625e"
+          "newValue": "0x000000000000000000000000643b0bdbeea4272c43ea4f3f31dfc321463121a3"
         },
         "0x4ef18721e98712b47bd659171158f093c47a5bb2c0ced3ed1c21e431251550cb": {
           "previousValue": "0x0000000000000000000000000000000000000000000001138bb68c173af87803",
diff --git a/reports/1_0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2_after.json b/reports/1_0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2_after.json
@@ -2338,7 +2338,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x0000000000000000000000009aeb8aaa1ca38634aa8c0c8933e7fb4d61091327",
-          "newValue": "0x000000000000000000000000d57e66c5a874fd89aedd970b51bfb09dbcd037aa"
+          "newValue": "0x000000000000000000000000665e2ec832b37d39cf4ec3a6abb034ef3fdde28b"
         },
         "0x392c0c0c73cb5e05233b1c77b0479a574c988ddf1c183c2c908a622e3cad9d23": {
           "previousValue": "0x000000000000000000000000000000000000000000000000000175dbfb0e7666",
diff --git a/reports/43114_0x794a61358D6845594F94dc1DB02A252b5b4814aD_after.json b/reports/43114_0x794a61358D6845594F94dc1DB02A252b5b4814aD_after.json
@@ -547,7 +547,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x000000000000000000000000b7467b66d86ce80cc258f28d266a18a51db7fac8",
-          "newValue": "0x0000000000000000000000006588a7ae3d8779b5601a38aa93af46bd2c9f23dc"
+          "newValue": "0x000000000000000000000000b7aa5e319805d908f68a448e3d5638f0d2bd788d"
         },
         "0x5a85697c728b95b1bba9fb8db304ba06d5e7263188872ba2eeadc8641e1dbdbb": {
           "previousValue": "0x000000000000000000000000000000000000000000000000069ba37469073425",
diff --git a/reports/56_0x6807dc923806fE8Fd134338EABCA509979a7e0cB_after.json b/reports/56_0x6807dc923806fE8Fd134338EABCA509979a7e0cB_after.json
@@ -320,7 +320,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x0000000000000000000000009e255f9d061405769abb2b583c9b2c4368b482b9",
-          "newValue": "0x0000000000000000000000009bd876ccdf705ad0aea936378215d85890c04c43"
+          "newValue": "0x000000000000000000000000243041b2cbb87413de6fffabef35411cf48ed7f4"
         },
         "0x4f7e401a3bd0628317467a9b48b7a242cbced3635594d81f505845155d278ce4": {
           "previousValue": "0x0000000000000000000000000000000000000000000000000000c5f323a6b6b1",
diff --git a/reports/59144_0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac_after.json b/reports/59144_0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac_after.json
@@ -650,7 +650,7 @@
         },
         "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc": {
           "previousValue": "0x000000000000000000000000e3a01f80c1b5ab2159a3c8b9318c38833011ddf8",
-          "newValue": "0x0000000000000000000000009121384747199f0def622f022d24d2e77fb28f5e"
+          "newValue": "0x000000000000000000000000f469bae4ebdf19d4944f7222165291bf967f76d9"
         },
         "0x47c114f9963ddd74f3ad3dd936164baac6680feef7c147c9d0c0adb8aa15050c": {
           "previousValue": "0x00000000000000000000000000000000000000000000000000000000000022a8",
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -53,6 +53,7 @@ import {UpgradePayloadMainnet} from "../src/UpgradePayloadMainnet.sol";
 import {ATokenMainnetInstanceGHO} from "../src/ATokenMainnetInstanceGHO.sol";
 import {VariableDebtTokenMainnetInstanceGHO} from "../src/VariableDebtTokenMainnetInstanceGHO.sol";
 import {PoolInstanceWithCustomInitialize} from "../src/PoolInstanceWithCustomInitialize.sol";
+import {MainnetCorePoolInstanceWithCustomInitialize} from "../src/MainnetCorePoolInstanceWithCustomInitialize.sol";
 import {L2PoolInstanceWithCustomInitialize} from "../src/L2PoolInstanceWithCustomInitialize.sol";
 import {PoolConfiguratorWithCustomInitialize} from "../src/PoolConfiguratorWithCustomInitialize.sol";
 
@@ -119,7 +120,7 @@ library DeploymentLibrary {
   }
 
   // L1s
-  function _deployMainnet() internal returns (address) {
+  function _deployMainnetCore() internal returns (address) {
     DeployParameters memory deployParams;
 
     deployParams.pool = address(AaveV3Ethereum.POOL);
@@ -128,7 +129,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3Ethereum.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3Ethereum.COLLECTOR);
 
-    return _deployL1(deployParams, true);
+    return _deployMainnetCore(deployParams);
   }
 
   function _deployMainnetLido() internal returns (address) {
@@ -140,7 +141,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3EthereumLido.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3EthereumLido.COLLECTOR);
 
-    return _deployL1(deployParams, false);
+    return _deployL1(deployParams);
   }
 
   function _deployMainnetEtherfi() internal returns (address) {
@@ -152,7 +153,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3EthereumEtherFi.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3EthereumEtherFi.COLLECTOR);
 
-    return _deployL1(deployParams, false);
+    return _deployL1(deployParams);
   }
 
   function _deployGnosis() internal returns (address) {
@@ -164,7 +165,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3Gnosis.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3Gnosis.COLLECTOR);
 
-    return _deployL1(deployParams, false);
+    return _deployL1(deployParams);
   }
 
   function _deployBNB() internal returns (address) {
@@ -176,7 +177,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3BNB.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3BNB.COLLECTOR);
 
-    return _deployL1(deployParams, false);
+    return _deployL1(deployParams);
   }
 
   function _deployAvalanche() internal returns (address) {
@@ -188,7 +189,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3Avalanche.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3Avalanche.COLLECTOR);
 
-    return _deployL1(deployParams, false);
+    return _deployL1(deployParams);
   }
 
   function _deployPolygon() internal returns (address) {
@@ -200,7 +201,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3Polygon.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3Polygon.COLLECTOR);
 
-    return _deployL1(deployParams, false);
+    return _deployL1(deployParams);
   }
 
   function _deployLinea() internal returns (address) {
@@ -212,7 +213,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3Linea.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3Linea.COLLECTOR);
 
-    return _deployL1(deployParams, false);
+    return _deployL1(deployParams);
   }
 
   function _deploySonic() internal returns (address) {
@@ -224,7 +225,7 @@ library DeploymentLibrary {
     deployParams.rewardsController = AaveV3Sonic.DEFAULT_INCENTIVES_CONTROLLER;
     deployParams.treasury = address(AaveV3Sonic.COLLECTOR);
 
-    return _deployL1(deployParams, false);
+    return _deployL1(deployParams);
   }
 
   function _deployCelo() internal returns (address) {
@@ -259,7 +260,7 @@ library DeploymentLibrary {
     return _deployPayload(deployParams, payloadParams, false);
   }
 
-  function _deployL1(DeployParameters memory deployParams, bool isMainnetCore) internal returns (address) {
+  function _deployL1(DeployParameters memory deployParams) internal returns (address) {
     UpgradePayload.ConstructorParams memory payloadParams;
 
     payloadParams.poolAddressesProvider = IPoolAddressesProvider(deployParams.poolAddressesProvider);
@@ -268,7 +269,19 @@ library DeploymentLibrary {
       abi.encode(deployParams.poolAddressesProvider, deployParams.interestRateStrategy)
     );
 
-    return _deployPayload(deployParams, payloadParams, isMainnetCore);
+    return _deployPayload({deployParams: deployParams, payloadParams: payloadParams, isMainnetCore: false});
+  }
+
+  function _deployMainnetCore(DeployParameters memory deployParams) internal returns (address) {
+    UpgradePayload.ConstructorParams memory payloadParams;
+
+    payloadParams.poolAddressesProvider = IPoolAddressesProvider(deployParams.poolAddressesProvider);
+    payloadParams.poolImpl = GovV3Helpers.deployDeterministic(
+      type(MainnetCorePoolInstanceWithCustomInitialize).creationCode,
+      abi.encode(deployParams.poolAddressesProvider, deployParams.interestRateStrategy)
+    );
+
+    return _deployPayload({deployParams: deployParams, payloadParams: payloadParams, isMainnetCore: true});
   }
 
   function _deployPayload(
@@ -293,13 +306,13 @@ library DeploymentLibrary {
     );
 
     if (isMainnetCore) {
-      return _deployMainnet(payloadParams);
+      return _deployMainnetCore(payloadParams);
     } else {
       return GovV3Helpers.deployDeterministic(type(UpgradePayload).creationCode, abi.encode(payloadParams));
     }
   }
 
-  function _deployMainnet(UpgradePayload.ConstructorParams memory params) private returns (address) {
+  function _deployMainnetCore(UpgradePayload.ConstructorParams memory params) private returns (address) {
     // its the council used on other GHO stewards
     // might make sense to have on address book
     address council = 0x8513e6F37dBc52De87b166980Fa3F50639694B60;
@@ -403,7 +416,7 @@ contract Deploymetis is MetisScript {
 
 contract Deploymainnet is EthereumScript {
   function run() external broadcast {
-    DeploymentLibrary._deployMainnet();
+    DeploymentLibrary._deployMainnetCore();
   }
 }
 
diff --git a/snapshots/Execution.json b/snapshots/Execution.json
@@ -1,17 +1,17 @@
 {
   "arbitrum": "4096640",
-  "avalanche": "2873526",
+  "avalanche": "2873469",
   "base": "2607237",
-  "bnb": "1796383",
+  "bnb": "1796326",
   "celo": "1150360",
-  "gnosis": "1771861",
-  "linea": "1586132",
-  "mainnet": "9528017",
-  "mainnetEtherFi": "1023039",
-  "mainnetLido": "1848600",
+  "gnosis": "1771804",
+  "linea": "1586075",
+  "mainnet": "9527950",
+  "mainnetEtherFi": "1022982",
+  "mainnetLido": "1848543",
   "metis": "1160032",
   "optimism": "3008499",
-  "polygon": "4508240",
+  "polygon": "4508183",
   "scroll": "1169719",
-  "sonic": "747739"
+  "sonic": "747682"
 }
diff --git a/src/MainnetCorePoolInstanceWithCustomInitialize.sol b/src/MainnetCorePoolInstanceWithCustomInitialize.sol
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.10;
+
+import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
+import {IScaledBalanceToken} from "aave-v3-origin/contracts/interfaces/IScaledBalanceToken.sol";
+import {PoolInstance} from "aave-v3-origin/contracts/instances/PoolInstance.sol";
+import {Errors} from "aave-v3-origin/contracts/protocol/libraries/helpers/Errors.sol";
+import {IPoolAddressesProvider} from "aave-v3-origin/contracts/interfaces/IPoolAddressesProvider.sol";
+import {IReserveInterestRateStrategy} from "aave-v3-origin/contracts/interfaces/IReserveInterestRateStrategy.sol";
+import {DataTypes} from "aave-v3-origin/contracts/protocol/pool/Pool.sol";
+import {ReserveConfiguration} from "aave-v3-origin/contracts/protocol/libraries/configuration/ReserveConfiguration.sol";
+
+import {AaveV3EthereumAssets, AaveV3Ethereum} from "aave-address-book/AaveV3Ethereum.sol";
+
+import {CustomInitialize} from "./CustomInitialize.sol";
+
+contract MainnetCorePoolInstanceWithCustomInitialize is PoolInstance {
+  using ReserveConfiguration for DataTypes.ReserveConfigurationMap;
+
+  constructor(IPoolAddressesProvider provider, IReserveInterestRateStrategy interestRateStrategy_)
+    PoolInstance(provider, interestRateStrategy_)
+  {}
+
+  /// @inheritdoc PoolInstance
+  function initialize(IPoolAddressesProvider provider) external virtual override initializer {
+    require(provider == ADDRESSES_PROVIDER, Errors.InvalidAddressesProvider());
+
+    CustomInitialize._initialize(_reservesCount, _reservesList, _reserves);
+
+    // 1. Update the `virtualAcc` configuration of the GHO reserve
+    DataTypes.ReserveData storage ghoReserveData = _reserves[AaveV3EthereumAssets.GHO_UNDERLYING];
+    DataTypes.ReserveConfigurationMap memory ghoConfig = ghoReserveData.configuration;
+
+    ghoConfig.setVirtualAccActive();
+
+    ghoReserveData.configuration = ghoConfig;
+
+    // 2. Update the `accruedToTreasury` variable of the GHO token
+
+    // Variable `accruedToTreasury` should hold all interest that accured (because the reserve
+    // factor of the GHO token is 100%), but not repayed yet.
+    // In the process of the upgrade of the `Pool` contract we've already resolved the AToken of the GHO
+    // as a facilitator and now it has zero capacity and level.
+    // Also, new `GhoDirectMinter` contract has been already added as a facilitator and it has
+    // minted and supplied the initial level of the AToken of the GHO to the Pool. So we can use total
+    // supply of the `GHO_A_TOKEN` as an initial level of the AToken of the GHO.
+    uint256 vTokenTotalSupply = IERC20(ghoReserveData.variableDebtTokenAddress).totalSupply();
+
+    // @note index is 1, we can use scaled
+    uint256 level = IScaledBalanceToken(AaveV3EthereumAssets.GHO_A_TOKEN).scaledTotalSupply();
+
+    ghoReserveData.accruedToTreasury = uint128(vTokenTotalSupply - level);
+  }
+}
diff --git a/src/PoolInstanceWithCustomInitialize.sol b/src/PoolInstanceWithCustomInitialize.sol
diff --git a/test/MainnetCore.t.sol b/test/MainnetCore.t.sol
