From 9e98ccdd01f4c86b21ffc15be7ce23ac65ecaeae Mon Sep 17 00:00:00 2001
From: Ed Zynda <ezynda3@gmail.com>
Date: Thu, 13 Feb 2025 17:06:00 +0300
Subject: [PATCH] flip the config structure

---
 config/chainflip.json                              | 8 +++-----
 script/deploy/facets/DeployChainflipFacet.s.sol    | 2 +-
 script/deploy/facets/DeployReceiverChainflip.s.sol | 2 +-
 script/deploy/resources/deployRequirements.json    | 4 ++--
 test/solidity/Facets/ChainflipFacet.t.sol          | 2 +-
 test/solidity/Periphery/ReceiverChainflip.t.sol    | 9 +++------
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/config/chainflip.json b/config/chainflip.json
index c589d50ea..1235df3ae 100644
--- a/config/chainflip.json
+++ b/config/chainflip.json
@@ -1,8 +1,6 @@
 {
-  "mainnet": {
-    "chainflipVault": "0xF5e10380213880111522dd0efD3dbb45b9f62Bcc"
-  },
-  "arbitrum": {
-    "chainflipVault": "0x79001a5e762f3bEFC8e5871b42F6734e00498920"
+  "chainflipVault": {
+    "mainnet": "0xF5e10380213880111522dd0efD3dbb45b9f62Bcc",
+    "arbitrum": "0x79001a5e762f3bEFC8e5871b42F6734e00498920"
   }
 }
diff --git a/script/deploy/facets/DeployChainflipFacet.s.sol b/script/deploy/facets/DeployChainflipFacet.s.sol
index ee45e1a3c..9353420f6 100644
--- a/script/deploy/facets/DeployChainflipFacet.s.sol
+++ b/script/deploy/facets/DeployChainflipFacet.s.sol
@@ -26,7 +26,7 @@ contract DeployScript is DeployScriptBase {
         // Read the Chainflip vault address from config
         address chainflipVault = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".chainflipVault")
+            string.concat(".chainflipVault.", network)
         );
 
         return abi.encode(chainflipVault);
diff --git a/script/deploy/facets/DeployReceiverChainflip.s.sol b/script/deploy/facets/DeployReceiverChainflip.s.sol
index 09be37722..4557e2a93 100644
--- a/script/deploy/facets/DeployReceiverChainflip.s.sol
+++ b/script/deploy/facets/DeployReceiverChainflip.s.sol
@@ -41,7 +41,7 @@ contract DeployScript is DeployScriptBase {
 
         address chainflipVault = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".chainflipVault")
+            string.concat(".chainflipVault.", network)
         );
 
         // get Executor address from deploy log
diff --git a/script/deploy/resources/deployRequirements.json b/script/deploy/resources/deployRequirements.json
index 112c3dc6a..4c707f8fb 100644
--- a/script/deploy/resources/deployRequirements.json
+++ b/script/deploy/resources/deployRequirements.json
@@ -574,7 +574,7 @@
     "configData": {
       "_chainflipVault": {
         "configFileName": "chainflip.json",
-        "keyInConfigFile": ".<NETWORK>.chainflipVault",
+        "keyInConfigFile": ".chainflipVault.<NETWORK>",
         "allowToDeployWithZeroAddress": "false"
       }
     }
@@ -588,7 +588,7 @@
       },
       "_chainflipVault": {
         "configFileName": "chainflip.json",
-        "keyInConfigFile": ".<NETWORK>.chainflipVault",
+        "keyInConfigFile": ".chainflipVault.<NETWORK>",
         "allowToDeployWithZeroAddress": "false"
       }
     },
diff --git a/test/solidity/Facets/ChainflipFacet.t.sol b/test/solidity/Facets/ChainflipFacet.t.sol
index 50b21ffbc..0c241d6ed 100644
--- a/test/solidity/Facets/ChainflipFacet.t.sol
+++ b/test/solidity/Facets/ChainflipFacet.t.sol
@@ -36,7 +36,7 @@ contract ChainflipFacetTest is TestBaseFacet {
         // Read chainflip vault address from config using the new helper
         CHAINFLIP_VAULT = getConfigAddressFromPath(
             "chainflip.json",
-            ".mainnet.chainflipVault"
+            ".chainflipVault.mainnet"
         );
         vm.label(CHAINFLIP_VAULT, "Chainflip Vault");
         console.log("Chainflip Vault Address:", CHAINFLIP_VAULT);
diff --git a/test/solidity/Periphery/ReceiverChainflip.t.sol b/test/solidity/Periphery/ReceiverChainflip.t.sol
index f1aed817e..69966f8af 100644
--- a/test/solidity/Periphery/ReceiverChainflip.t.sol
+++ b/test/solidity/Periphery/ReceiverChainflip.t.sol
@@ -26,13 +26,10 @@ contract ReceiverChainflipTest is TestBase {
         customBlockNumberForForking = 18277082;
         initTestBase();
 
-        // Read chainflip vault address from config
-        string memory path = string.concat(
-            vm.projectRoot(),
-            "/config/chainflip.json"
+        chainflipVault = getConfigAddressFromPath(
+            "chainflip.json",
+            ".chainflipVault.mainnet"
         );
-        string memory json = vm.readFile(path);
-        chainflipVault = json.readAddress(".mainnet.chainflipVault");
         vm.label(chainflipVault, "Chainflip Vault");
 
         erc20Proxy = new ERC20Proxy(address(this));