chore: add utils directory

ExocoreNetwork · Sep 9, 2024 · bf6f8c8 · bf6f8c8
1 parent 3fa4c85
commit bf6f8c8
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 17 deletions.
diff --git a/script/12_RedeployClientChainGateway.s.sol b/script/12_RedeployClientChainGateway.s.sol
@@ -3,12 +3,13 @@ pragma solidity ^0.8.19;
 import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
-import "../src/core/BeaconProxyBytecode.sol";
 import {Bootstrap} from "../src/core/Bootstrap.sol";
 import {ClientChainGateway} from "../src/core/ClientChainGateway.sol";
-import {CustomProxyAdmin} from "../src/core/CustomProxyAdmin.sol";
+
 import "../src/core/ExoCapsule.sol";
 import {Vault} from "../src/core/Vault.sol";
+import "../src/utils/BeaconProxyBytecode.sol";
+import {CustomProxyAdmin} from "../src/utils/CustomProxyAdmin.sol";
 
 import {BaseScript} from "./BaseScript.sol";
 

diff --git a/script/14_CorrectBootstrapErrors.s.sol b/script/14_CorrectBootstrapErrors.s.sol
@@ -6,9 +6,9 @@ import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.s
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ITransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
-import "../src/core/BeaconProxyBytecode.sol";
 import {Bootstrap} from "../src/core/Bootstrap.sol";
 import {ClientChainGateway} from "../src/core/ClientChainGateway.sol";
+import "../src/utils/BeaconProxyBytecode.sol";
 
 import "../src/core/ExoCapsule.sol";
 import {Vault} from "../src/core/Vault.sol";

diff --git a/script/15_DeploySafeMulstisigWallet.s.sol b/script/15_DeploySafeMulstisigWallet.s.sol
@@ -1,12 +1,15 @@
 pragma solidity ^0.8.13;
 
 import {BaseScript} from "./BaseScript.sol";
-import "@safe-contracts/proxies/GnosisSafeProxyFactory.sol";
+
 import "@safe-contracts/GnosisSafeL2.sol";
-import "forge-std/StdJson.sol";
+import "@safe-contracts/proxies/GnosisSafeProxyFactory.sol";
+
 import "forge-std/Script.sol";
+import "forge-std/StdJson.sol";
 
 contract CreateMultisigScript is BaseScript {
+
     using stdJson for string;
 
     function setUp() public override {
@@ -65,4 +68,5 @@ contract CreateMultisigScript is BaseScript {
 
         vm.stopBroadcast();
     }
+
 }
diff --git a/script/2_DeployBoth.s.sol b/script/2_DeployBoth.s.sol
@@ -1,10 +1,10 @@
 pragma solidity ^0.8.19;
 
-import "../src/core/BeaconProxyBytecode.sol";
 import "../src/core/ClientChainGateway.sol";
 import "../src/core/ExoCapsule.sol";
 import "../src/core/ExocoreGateway.sol";
 import {Vault} from "../src/core/Vault.sol";
+import "../src/utils/BeaconProxyBytecode.sol";
 import {ExocoreGatewayMock} from "../test/mocks/ExocoreGatewayMock.sol";
 
 import {BaseScript} from "./BaseScript.sol";

diff --git a/script/7_DeployBootstrap.s.sol b/script/7_DeployBootstrap.s.sol
@@ -3,12 +3,13 @@ pragma solidity ^0.8.19;
 import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/UpgradeableBeacon.sol";
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
-import "../src/core/BeaconProxyBytecode.sol";
 import {Bootstrap} from "../src/core/Bootstrap.sol";
 import {ClientChainGateway} from "../src/core/ClientChainGateway.sol";
-import {CustomProxyAdmin} from "../src/core/CustomProxyAdmin.sol";
+
 import "../src/core/ExoCapsule.sol";
 import {Vault} from "../src/core/Vault.sol";
+import "../src/utils/BeaconProxyBytecode.sol";
+import {CustomProxyAdmin} from "../src/utils/CustomProxyAdmin.sol";
 
 import {BaseScript} from "./BaseScript.sol";
 import {ILayerZeroEndpointV2} from "@layerzero-v2/protocol/contracts/interfaces/ILayerZeroEndpointV2.sol";

diff --git a/script/BaseScript.sol b/script/BaseScript.sol
@@ -1,10 +1,10 @@
 pragma solidity ^0.8.19;
 
-import "../src/core/BeaconProxyBytecode.sol";
 import "../src/interfaces/IClientChainGateway.sol";
 import "../src/interfaces/IExoCapsule.sol";
 import "../src/interfaces/IExocoreGateway.sol";
 import "../src/interfaces/IVault.sol";
+import "../src/utils/BeaconProxyBytecode.sol";
 
 import "../src/interfaces/precompiles/IAssets.sol";
 import "../src/interfaces/precompiles/IClaimReward.sol";

diff --git a/script/integration/1_DeployBootstrap.s.sol b/script/integration/1_DeployBootstrap.s.sol
@@ -10,12 +10,13 @@ import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.so
 
 import {EndpointV2Mock} from "../../test/mocks/EndpointV2Mock.sol";
 
-import "../../src/core/BeaconProxyBytecode.sol";
 import {Bootstrap} from "../../src/core/Bootstrap.sol";
-import {CustomProxyAdmin} from "../../src/core/CustomProxyAdmin.sol";
+
 import {Vault} from "../../src/core/Vault.sol";
 import {IValidatorRegistry} from "../../src/interfaces/IValidatorRegistry.sol";
 import {IVault} from "../../src/interfaces/IVault.sol";
+import "../../src/utils/BeaconProxyBytecode.sol";
+import {CustomProxyAdmin} from "../../src/utils/CustomProxyAdmin.sol";
 import {MyToken} from "../../test/foundry/unit/MyToken.sol";
 
 // Technically this is used for testing but it is marked as a script

diff --git a/src/storage/BootstrapStorage.sol b/src/storage/BootstrapStorage.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import {BeaconProxyBytecode} from "../core/BeaconProxyBytecode.sol";
 import {Vault} from "../core/Vault.sol";
 import {IValidatorRegistry} from "../interfaces/IValidatorRegistry.sol";
 import {IVault} from "../interfaces/IVault.sol";
+import {BeaconProxyBytecode} from "../utils/BeaconProxyBytecode.sol";
 
 import {Errors} from "../libraries/Errors.sol";
 import {GatewayStorage} from "./GatewayStorage.sol";

diff --git a/src/core/BeaconProxyBytecode.sol → src/utils/BeaconProxyBytecode.sol b/src/core/BeaconProxyBytecode.sol → src/utils/BeaconProxyBytecode.sol
diff --git a/src/core/CustomProxyAdmin.sol → src/utils/CustomProxyAdmin.sol b/src/core/CustomProxyAdmin.sol → src/utils/CustomProxyAdmin.sol
diff --git a/test/foundry/ExocoreDeployer.t.sol b/test/foundry/ExocoreDeployer.t.sol
@@ -32,8 +32,8 @@ import "../mocks/ClaimRewardMock.sol";
 import "../mocks/DelegationMock.sol";
 import {NonShortCircuitEndpointV2Mock} from "../mocks/NonShortCircuitEndpointV2Mock.sol";
 
-import "src/core/BeaconProxyBytecode.sol";
 import "src/core/ExoCapsule.sol";
+import "src/utils/BeaconProxyBytecode.sol";
 
 import "src/libraries/BeaconChainProofs.sol";
 import "src/libraries/Endian.sol";

diff --git a/test/foundry/unit/Bootstrap.t.sol b/test/foundry/unit/Bootstrap.t.sol
@@ -3,8 +3,9 @@ pragma solidity ^0.8.0;
 
 import {Bootstrap} from "src/core/Bootstrap.sol";
 import {ClientChainGateway} from "src/core/ClientChainGateway.sol";
-import {CustomProxyAdmin} from "src/core/CustomProxyAdmin.sol";
+
 import {Vault} from "src/core/Vault.sol";
+import {CustomProxyAdmin} from "src/utils/CustomProxyAdmin.sol";
 
 import {IValidatorRegistry} from "src/interfaces/IValidatorRegistry.sol";
 
@@ -28,9 +29,9 @@ import "forge-std/Test.sol";
 import "forge-std/console.sol";
 import "src/libraries/Errors.sol";
 
-import "src/core/BeaconProxyBytecode.sol";
 import "src/core/ExoCapsule.sol";
 import "src/storage/GatewayStorage.sol";
+import "src/utils/BeaconProxyBytecode.sol";
 
 contract BootstrapTest is Test {
 

diff --git a/test/foundry/unit/ClientChainGateway.t.sol b/test/foundry/unit/ClientChainGateway.t.sol
@@ -31,7 +31,7 @@ import {NonShortCircuitEndpointV2Mock} from "../../mocks/NonShortCircuitEndpoint
 import "src/interfaces/IExoCapsule.sol";
 import "src/interfaces/IVault.sol";
 
-import "src/core/BeaconProxyBytecode.sol";
+import "src/utils/BeaconProxyBytecode.sol";
 
 contract SetUp is Test {
 

diff --git a/test/foundry/unit/CustomProxyAdmin.t.sol b/test/foundry/unit/CustomProxyAdmin.t.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {CustomProxyAdmin} from "src/core/CustomProxyAdmin.sol";
 import {ICustomProxyAdmin} from "src/interfaces/ICustomProxyAdmin.sol";
+import {CustomProxyAdmin} from "src/utils/CustomProxyAdmin.sol";
 
 import "forge-std/Test.sol";
 import "forge-std/console.sol";

diff --git a/test/foundry/unit/Multisig.t.sol b/test/foundry/unit/Multisig.t.sol
@@ -0,0 +1 @@
+
diff --git a/test/foundry/unit/TimelockController.t.sol b/test/foundry/unit/TimelockController.t.sol
@@ -0,0 +1 @@
+