Merge branch 'deploy-berachain-lf-12119' of github.com:lifinance/cont…

…racts into deploy-berachain-lf-12119
lifinance · Feb 11, 2025 · 30ac373 · 30ac373
2 parents 3836af1 + d5d03f0
commit 30ac373
Show file tree

Hide file tree

Showing 53 changed files with 104 additions and 203 deletions.
diff --git a/script/deploy/facets/DeployAcrossFacet.s.sol b/script/deploy/facets/DeployAcrossFacet.s.sol
@@ -24,13 +24,11 @@ contract DeployScript is DeployScriptBase {
 
         address acrossSpokePool = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".acrossSpokePool"),
-            false
+            string.concat(".", network, ".acrossSpokePool")
         );
         address weth = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".weth"),
-            false
+            string.concat(".", network, ".weth")
         );
 
         return abi.encode(acrossSpokePool, weth);

diff --git a/script/deploy/facets/DeployAcrossFacetPacked.s.sol b/script/deploy/facets/DeployAcrossFacetPacked.s.sol
@@ -26,13 +26,11 @@ contract DeployScript is DeployScriptBase {
 
         address acrossSpokePool = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".acrossSpokePool"),
-            false
+            string.concat(".", network, ".acrossSpokePool")
         );
         address weth = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".weth"),
-            false
+            string.concat(".", network, ".weth")
         );
 
         return abi.encode(acrossSpokePool, weth, deployerAddress);

diff --git a/script/deploy/facets/DeployAcrossFacetPackedV3.s.sol b/script/deploy/facets/DeployAcrossFacetPackedV3.s.sol
@@ -26,13 +26,11 @@ contract DeployScript is DeployScriptBase {
 
         address acrossSpokePool = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".acrossSpokePool"),
-            false
+            string.concat(".", network, ".acrossSpokePool")
         );
         address weth = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".weth"),
-            false
+            string.concat(".", network, ".weth")
         );
 
         return abi.encode(acrossSpokePool, weth, deployerAddress);

diff --git a/script/deploy/facets/DeployAcrossFacetV3.s.sol b/script/deploy/facets/DeployAcrossFacetV3.s.sol
@@ -24,13 +24,11 @@ contract DeployScript is DeployScriptBase {
 
         address acrossSpokePool = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".acrossSpokePool"),
-            false
+            string.concat(".", network, ".acrossSpokePool")
         );
         address weth = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".weth"),
-            false
+            string.concat(".", network, ".weth")
         );
 
         return abi.encode(acrossSpokePool, weth);

diff --git a/script/deploy/facets/DeployAllBridgeFacet.s.sol b/script/deploy/facets/DeployAllBridgeFacet.s.sol
@@ -24,8 +24,7 @@ contract DeployScript is DeployScriptBase {
 
         address allBridge = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".allBridge"),
-            false
+            string.concat(".", network, ".allBridge")
         );
 
         return abi.encode(allBridge);

diff --git a/script/deploy/facets/DeployAmarokFacet.s.sol b/script/deploy/facets/DeployAmarokFacet.s.sol
@@ -24,8 +24,7 @@ contract DeployScript is DeployScriptBase {
 
         address connextHandler = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".connextHandler"),
-            false
+            string.concat(".", network, ".connextHandler")
         );
 
         return abi.encode(connextHandler);

diff --git a/script/deploy/facets/DeployAmarokFacetPacked.s.sol b/script/deploy/facets/DeployAmarokFacetPacked.s.sol
@@ -26,8 +26,7 @@ contract DeployScript is DeployScriptBase {
 
         address connextHandler = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".connextHandler"),
-            false
+            string.concat(".", network, ".connextHandler")
         );
 
         return abi.encode(connextHandler, deployerAddress);

diff --git a/script/deploy/facets/DeployArbitrumBridgeFacet.s.sol b/script/deploy/facets/DeployArbitrumBridgeFacet.s.sol
@@ -26,14 +26,12 @@ contract DeployScript is DeployScriptBase {
 
         address gatewayRouter = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".gatewayRouter"),
-            false
+            string.concat(".", network, ".gatewayRouter")
         );
 
         address inbox = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".inbox"),
-            false
+            string.concat(".", network, ".inbox")
         );
 
         return abi.encode(gatewayRouter, inbox);

diff --git a/script/deploy/facets/DeployCBridgeFacet.s.sol b/script/deploy/facets/DeployCBridgeFacet.s.sol
@@ -24,8 +24,7 @@ contract DeployScript is DeployScriptBase {
 
         address cBridge = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".cBridge"),
-            false
+            string.concat(".", network, ".cBridge")
         );
 
         return abi.encode(cBridge);

diff --git a/script/deploy/facets/DeployCBridgeFacetPacked.s.sol b/script/deploy/facets/DeployCBridgeFacetPacked.s.sol
@@ -26,8 +26,7 @@ contract DeployScript is DeployScriptBase {
 
         address cBridge = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".cBridge"),
-            false
+            string.concat(".", network, ".cBridge")
         );
 
         return abi.encode(cBridge, deployerAddress);

diff --git a/script/deploy/facets/DeployCelerCircleBridgeFacet.s.sol b/script/deploy/facets/DeployCelerCircleBridgeFacet.s.sol
@@ -26,14 +26,12 @@ contract DeployScript is DeployScriptBase {
 
         address circleBridgeProxy = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".circleBridgeProxy"),
-            false
+            string.concat(".", network, ".circleBridgeProxy")
         );
 
         address usdc = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".usdc"),
-            false
+            string.concat(".", network, ".usdc")
         );
 
         return abi.encode(circleBridgeProxy, usdc);

diff --git a/script/deploy/facets/DeployCelerIMFacet.s.sol b/script/deploy/facets/DeployCelerIMFacet.s.sol
@@ -41,8 +41,7 @@ contract DeployScript is DeployScriptBase {
 
         address messageBus = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".messageBus"),
-            false
+            string.concat(".", network, ".messageBus")
         );
 
         // get address of cfUSDC token (required for mainnet only, otherwise address(0))
@@ -53,8 +52,7 @@ contract DeployScript is DeployScriptBase {
         ) {
             cfUSDCAddress = _getConfigContractAddress(
                 path,
-                string.concat(".", network, ".cfUSDC"),
-                false
+                string.concat(".", network, ".cfUSDC")
             );
         }
 
@@ -76,8 +74,8 @@ contract DeployScript is DeployScriptBase {
 
         // get address of the correct diamond contract from network log file
         address diamondAddress = deployMutable
-            ? _getConfigContractAddress(path, ".LiFiDiamond", false)
-            : _getConfigContractAddress(path, ".LiFiDiamondImmutable", false);
+            ? _getConfigContractAddress(path, ".LiFiDiamond")
+            : _getConfigContractAddress(path, ".LiFiDiamondImmutable");
 
         // get path of global config file
         string memory globalConfigPath = string.concat(

diff --git a/script/deploy/facets/DeployDeBridgeDlnFacet.s.sol b/script/deploy/facets/DeployDeBridgeDlnFacet.s.sol
@@ -26,8 +26,7 @@ contract DeployScript is DeployScriptBase {
 
         address dlnSource = _getConfigContractAddress(
             path,
-            string.concat(".networks.", network, ".dlnSource"),
-            false
+            string.concat(".networks.", network, ".dlnSource")
         );
 
         return abi.encode(dlnSource);

diff --git a/script/deploy/facets/DeployExecutor.s.sol b/script/deploy/facets/DeployExecutor.s.sol
@@ -29,11 +29,7 @@ contract DeployScript is DeployScriptBase {
             "json"
         );
 
-        address erc20Proxy = _getConfigContractAddress(
-            path,
-            ".ERC20Proxy",
-            false
-        );
+        address erc20Proxy = _getConfigContractAddress(path, ".ERC20Proxy");
 
         // get path of global config file
         string memory globalConfigPath = string.concat(

diff --git a/script/deploy/facets/DeployGasZipFacet.s.sol b/script/deploy/facets/DeployGasZipFacet.s.sol
@@ -24,8 +24,7 @@ contract DeployScript is DeployScriptBase {
 
         address gasZipRouter = _getConfigContractAddress(
             path,
-            string.concat(".gasZipRouters.", network),
-            false
+            string.concat(".gasZipRouters.", network)
         );
 
         return abi.encode(gasZipRouter);

diff --git a/script/deploy/facets/DeployGasZipPeriphery.s.sol b/script/deploy/facets/DeployGasZipPeriphery.s.sol
@@ -25,8 +25,7 @@ contract DeployScript is DeployScriptBase {
 
         address gasZipRouter = _getConfigContractAddress(
             path,
-            string.concat(".gasZipRouters.", network),
-            false
+            string.concat(".gasZipRouters.", network)
         );
 
         // get LiFiDEXAggregator address
@@ -41,17 +40,15 @@ contract DeployScript is DeployScriptBase {
 
         address liFiDEXAggregator = _getConfigContractAddress(
             path,
-            ".LiFiDEXAggregator",
-            false
+            ".LiFiDEXAggregator"
         );
 
         // get network's SAFE address to become contract owner for potential fund withdrawals
         path = string.concat(root, "/config/networks.json");
 
         address safeAddress = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".safeAddress"),
-            false
+            string.concat(".", network, ".safeAddress")
         );
 
         return abi.encode(gasZipRouter, liFiDEXAggregator, safeAddress);

diff --git a/script/deploy/facets/DeployGnosisBridgeFacet.s.sol b/script/deploy/facets/DeployGnosisBridgeFacet.s.sol
@@ -26,8 +26,7 @@ contract DeployScript is DeployScriptBase {
 
         address xDaiBridge = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".xDaiBridge"),
-            false
+            string.concat(".", network, ".xDaiBridge")
         );
 
         return abi.encode(xDaiBridge);

diff --git a/script/deploy/facets/DeployLiFiDiamond.s.sol b/script/deploy/facets/DeployLiFiDiamond.s.sol
@@ -30,8 +30,7 @@ contract DeployScript is DeployScriptBase {
         );
         address diamondCut = _getConfigContractAddress(
             path,
-            ".DiamondCutFacet",
-            false
+            ".DiamondCutFacet"
         );
 
         return abi.encode(deployerAddress, diamondCut);

diff --git a/script/deploy/facets/DeployMayanFacet.s.sol b/script/deploy/facets/DeployMayanFacet.s.sol
@@ -25,8 +25,7 @@ contract DeployScript is DeployScriptBase {
 
         address bridge = _getConfigContractAddress(
             path,
-            string.concat(".bridges.", network, ".bridge"),
-            false
+            string.concat(".bridges.", network, ".bridge")
         );
 
         return abi.encode(bridge);

diff --git a/script/deploy/facets/DeployOmniBridgeFacet.s.sol b/script/deploy/facets/DeployOmniBridgeFacet.s.sol
@@ -24,13 +24,11 @@ contract DeployScript is DeployScriptBase {
 
         address foreignOmniBridge = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".foreignOmniBridge"),
-            false
+            string.concat(".", network, ".foreignOmniBridge")
         );
         address wethOmniBridge = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".wethOmniBridge"),
-            false
+            string.concat(".", network, ".wethOmniBridge")
         );
 
         return abi.encode(foreignOmniBridge, wethOmniBridge);

diff --git a/script/deploy/facets/DeployPermit2Proxy.s.sol b/script/deploy/facets/DeployPermit2Proxy.s.sol
@@ -30,28 +30,22 @@ contract DeployScript is DeployScriptBase {
             "json"
         );
 
-        address diamond = _getConfigContractAddress(
-            path,
-            ".LiFiDiamond",
-            false
-        );
+        address diamond = _getConfigContractAddress(path, ".LiFiDiamond");
 
         // get the Permit2 contract address for the given network
         path = string.concat(root, "/config/permit2Proxy.json");
 
         address permit2Address = _getConfigContractAddress(
             path,
-            string.concat(".", network),
-            false
+            string.concat(".", network)
         );
 
         // get the multisig SAFE address for the given network
         path = string.concat(root, "/config/networks.json");
 
         address safeAddress = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".safeAddress"),
-            false
+            string.concat(".", network, ".safeAddress")
         );
 
         return abi.encode(diamond, permit2Address, safeAddress);

diff --git a/script/deploy/facets/DeployPolygonBridgeFacet.s.sol b/script/deploy/facets/DeployPolygonBridgeFacet.s.sol
@@ -26,13 +26,11 @@ contract DeployScript is DeployScriptBase {
 
         address rootChainManager = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".rootChainManager"),
-            false
+            string.concat(".", network, ".rootChainManager")
         );
         address erc20Predicate = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".erc20Predicate"),
-            false
+            string.concat(".", network, ".erc20Predicate")
         );
 
         return abi.encode(rootChainManager, erc20Predicate);

diff --git a/script/deploy/facets/DeployReceiver.s.sol b/script/deploy/facets/DeployReceiver.s.sol
@@ -58,7 +58,7 @@ contract DeployScript is DeployScriptBase {
             fileSuffix,
             "json"
         );
-        address executor = _getConfigContractAddress(path, ".Executor", false);
+        address executor = _getConfigContractAddress(path, ".Executor");
 
         return
             abi.encode(

diff --git a/script/deploy/facets/DeployReceiverAcrossV3.s.sol b/script/deploy/facets/DeployReceiverAcrossV3.s.sol
@@ -41,8 +41,7 @@ contract DeployScript is DeployScriptBase {
 
         address acrossSpokePool = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".acrossSpokePool"),
-            false
+            string.concat(".", network, ".acrossSpokePool")
         );
 
         // get Executor address from deploy log
@@ -54,7 +53,7 @@ contract DeployScript is DeployScriptBase {
             fileSuffix,
             "json"
         );
-        address executor = _getConfigContractAddress(path, ".Executor", false);
+        address executor = _getConfigContractAddress(path, ".Executor");
 
         uint256 recoverGas = 100000;
 

diff --git a/script/deploy/facets/DeployReceiverStargateV2.s.sol b/script/deploy/facets/DeployReceiverStargateV2.s.sol
@@ -41,13 +41,11 @@ contract DeployScript is DeployScriptBase {
 
         address endpointV2 = _getConfigContractAddress(
             path,
-            string.concat(".endpointV2.", network),
-            false
+            string.concat(".endpointV2.", network)
         );
         address tokenMessaging = _getConfigContractAddress(
             path,
-            string.concat(".tokenMessaging.", network),
-            false
+            string.concat(".tokenMessaging.", network)
         );
 
         // get Executor address from deploy log
@@ -59,7 +57,7 @@ contract DeployScript is DeployScriptBase {
             fileSuffix,
             "json"
         );
-        address executor = _getConfigContractAddress(path, ".Executor", false);
+        address executor = _getConfigContractAddress(path, ".Executor");
 
         return
             abi.encode(

diff --git a/script/deploy/facets/DeployRelayFacet.s.sol b/script/deploy/facets/DeployRelayFacet.s.sol
@@ -25,8 +25,7 @@ contract DeployScript is DeployScriptBase {
 
         address relayReceiver = _getConfigContractAddress(
             path,
-            string.concat(".", network, ".relayReceiver"),
-            false
+            string.concat(".", network, ".relayReceiver")
         );
 
         // the relaySolver address is the same address on all mainnets (and it's not a contract)