Merge pull request #31 from symbioticfi/relative-paths

Use relative paths
symbioticfi · Aug 30, 2024 · 76bf709 · 76bf709
2 parents 7003c8f + 7491cb1
commit 76bf709
Show file tree

Hide file tree

Showing 89 changed files with 901 additions and 557 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@symbioticfi/core",
-  "version": "1.0.0-devnet.2",
+  "version": "1.0.0-devnet.3",
   "description": "Symbiotic is a shared security protocol enabling decentralized networks to control and customize their own multi-asset restaking implementation.",
   "homepage": "https://symbiotic.fi/",
   "bugs": "https://github.com/symbioticfi/core/issues",

diff --git a/script/deploy/Core.s.sol b/script/deploy/Core.s.sol
@@ -3,25 +3,27 @@ pragma solidity 0.8.25;
 
 import {Script, console2} from "forge-std/Script.sol";
 
-import {VaultFactory} from "src/contracts/VaultFactory.sol";
-import {DelegatorFactory} from "src/contracts/DelegatorFactory.sol";
-import {SlasherFactory} from "src/contracts/SlasherFactory.sol";
-import {NetworkRegistry} from "src/contracts/NetworkRegistry.sol";
-import {OperatorRegistry} from "src/contracts/OperatorRegistry.sol";
-import {MetadataService} from "src/contracts/service/MetadataService.sol";
-import {NetworkMiddlewareService} from "src/contracts/service/NetworkMiddlewareService.sol";
-import {OptInService} from "src/contracts/service/OptInService.sol";
+import {VaultFactory} from "../../src/contracts/VaultFactory.sol";
+import {DelegatorFactory} from "../../src/contracts/DelegatorFactory.sol";
+import {SlasherFactory} from "../../src/contracts/SlasherFactory.sol";
+import {NetworkRegistry} from "../../src/contracts/NetworkRegistry.sol";
+import {OperatorRegistry} from "../../src/contracts/OperatorRegistry.sol";
+import {MetadataService} from "../../src/contracts/service/MetadataService.sol";
+import {NetworkMiddlewareService} from "../../src/contracts/service/NetworkMiddlewareService.sol";
+import {OptInService} from "../../src/contracts/service/OptInService.sol";
 
-import {Vault} from "src/contracts/vault/Vault.sol";
-import {NetworkRestakeDelegator} from "src/contracts/delegator/NetworkRestakeDelegator.sol";
-import {FullRestakeDelegator} from "src/contracts/delegator/FullRestakeDelegator.sol";
-import {Slasher} from "src/contracts/slasher/Slasher.sol";
-import {VetoSlasher} from "src/contracts/slasher/VetoSlasher.sol";
+import {Vault} from "../../src/contracts/vault/Vault.sol";
+import {NetworkRestakeDelegator} from "../../src/contracts/delegator/NetworkRestakeDelegator.sol";
+import {FullRestakeDelegator} from "../../src/contracts/delegator/FullRestakeDelegator.sol";
+import {Slasher} from "../../src/contracts/slasher/Slasher.sol";
+import {VetoSlasher} from "../../src/contracts/slasher/VetoSlasher.sol";
 
-import {VaultConfigurator} from "src/contracts/VaultConfigurator.sol";
+import {VaultConfigurator} from "../../src/contracts/VaultConfigurator.sol";
 
 contract CoreScript is Script {
-    function run(address owner) public {
+    function run(
+        address owner
+    ) public {
         vm.startBroadcast();
         (,, address deployer) = vm.readCallers();
 

diff --git a/script/deploy/MetadataService.s.sol b/script/deploy/MetadataService.s.sol
@@ -3,10 +3,12 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {MetadataService} from "src/contracts/service/MetadataService.sol";
+import {MetadataService} from "../../src/contracts/service/MetadataService.sol";
 
 contract MetadataServiceScript is Script {
-    function run(address registry) public {
+    function run(
+        address registry
+    ) public {
         vm.startBroadcast();
 
         new MetadataService(registry);

diff --git a/script/deploy/NetworkMiddlewareService.s.sol b/script/deploy/NetworkMiddlewareService.s.sol
@@ -3,10 +3,12 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {NetworkMiddlewareService} from "src/contracts/service/NetworkMiddlewareService.sol";
+import {NetworkMiddlewareService} from "../../src/contracts/service/NetworkMiddlewareService.sol";
 
 contract NetworkMiddlewareServiceScript is Script {
-    function run(address networkRegistry) public {
+    function run(
+        address networkRegistry
+    ) public {
         vm.startBroadcast();
 
         new NetworkMiddlewareService(networkRegistry);

diff --git a/script/deploy/NetworkRegistry.s.sol b/script/deploy/NetworkRegistry.s.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {NetworkRegistry} from "src/contracts/NetworkRegistry.sol";
+import {NetworkRegistry} from "../../src/contracts/NetworkRegistry.sol";
 
 contract NetworkRegistryScript is Script {
     function run() public {

diff --git a/script/deploy/OperatorRegistry.s.sol b/script/deploy/OperatorRegistry.s.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {OperatorRegistry} from "src/contracts/OperatorRegistry.sol";
+import {OperatorRegistry} from "../../src/contracts/OperatorRegistry.sol";
 
 contract OperatorRegistryScript is Script {
     function run() public {

diff --git a/script/deploy/OptInService.s.sol b/script/deploy/OptInService.s.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {OptInService} from "src/contracts/service/OptInService.sol";
+import {OptInService} from "../../src/contracts/service/OptInService.sol";
 
 contract OptInServiceScript is Script {
     function run(address whoRegistry, address whereRegistry) public {

diff --git a/script/deploy/Vault.s.sol b/script/deploy/Vault.s.sol
@@ -3,13 +3,13 @@ pragma solidity 0.8.25;
 
 import {Script, console2} from "forge-std/Script.sol";
 
-import {IMigratablesFactory} from "src/interfaces/common/IMigratablesFactory.sol";
-import {IVault} from "src/interfaces/vault/IVault.sol";
-import {IVaultConfigurator} from "src/interfaces/IVaultConfigurator.sol";
-import {IBaseDelegator} from "src/interfaces/delegator/IBaseDelegator.sol";
-import {INetworkRestakeDelegator} from "src/interfaces/delegator/INetworkRestakeDelegator.sol";
-import {IFullRestakeDelegator} from "src/interfaces/delegator/IFullRestakeDelegator.sol";
-import {IVetoSlasher} from "src/interfaces/slasher/IVetoSlasher.sol";
+import {IMigratablesFactory} from "../../src/interfaces/common/IMigratablesFactory.sol";
+import {IVault} from "../../src/interfaces/vault/IVault.sol";
+import {IVaultConfigurator} from "../../src/interfaces/IVaultConfigurator.sol";
+import {IBaseDelegator} from "../../src/interfaces/delegator/IBaseDelegator.sol";
+import {INetworkRestakeDelegator} from "../../src/interfaces/delegator/INetworkRestakeDelegator.sol";
+import {IFullRestakeDelegator} from "../../src/interfaces/delegator/IFullRestakeDelegator.sol";
+import {IVetoSlasher} from "../../src/interfaces/slasher/IVetoSlasher.sol";
 
 contract VaultScript is Script {
     function run(

diff --git a/script/deploy/VaultFactory.s.sol b/script/deploy/VaultFactory.s.sol
@@ -3,10 +3,12 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {VaultFactory} from "src/contracts/VaultFactory.sol";
+import {VaultFactory} from "../../src/contracts/VaultFactory.sol";
 
 contract VaultFactoryScript is Script {
-    function run(address owner) public {
+    function run(
+        address owner
+    ) public {
         vm.startBroadcast();
 
         new VaultFactory(owner);

diff --git a/src/contracts/DelegatorFactory.sol b/src/contracts/DelegatorFactory.sol
@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {Factory} from "src/contracts/common/Factory.sol";
+import {Factory} from "./common/Factory.sol";
 
-import {IDelegatorFactory} from "src/interfaces/IDelegatorFactory.sol";
+import {IDelegatorFactory} from "../interfaces/IDelegatorFactory.sol";
 
 contract DelegatorFactory is Factory, IDelegatorFactory {
-    constructor(address owner_) Factory(owner_) {}
+    constructor(
+        address owner_
+    ) Factory(owner_) {}
 }
diff --git a/src/contracts/NetworkRegistry.sol b/src/contracts/NetworkRegistry.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import {Registry} from "./common/Registry.sol";
 
-import {INetworkRegistry} from "src/interfaces/INetworkRegistry.sol";
+import {INetworkRegistry} from "../interfaces/INetworkRegistry.sol";
 
 contract NetworkRegistry is Registry, INetworkRegistry {
     /**

diff --git a/src/contracts/OperatorRegistry.sol b/src/contracts/OperatorRegistry.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import {Registry} from "./common/Registry.sol";
 
-import {IOperatorRegistry} from "src/interfaces/IOperatorRegistry.sol";
+import {IOperatorRegistry} from "../interfaces/IOperatorRegistry.sol";
 
 contract OperatorRegistry is Registry, IOperatorRegistry {
     /**

diff --git a/src/contracts/SlasherFactory.sol b/src/contracts/SlasherFactory.sol
@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {Factory} from "src/contracts/common/Factory.sol";
+import {Factory} from "./common/Factory.sol";
 
-import {ISlasherFactory} from "src/interfaces/ISlasherFactory.sol";
+import {ISlasherFactory} from "../interfaces/ISlasherFactory.sol";
 
 contract SlasherFactory is Factory, ISlasherFactory {
-    constructor(address owner_) Factory(owner_) {}
+    constructor(
+        address owner_
+    ) Factory(owner_) {}
 }
diff --git a/src/contracts/VaultConfigurator.sol b/src/contracts/VaultConfigurator.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {BaseSlasher} from "src/contracts/slasher/BaseSlasher.sol";
-import {DelegatorFactory} from "src/contracts/DelegatorFactory.sol";
-import {SlasherFactory} from "src/contracts/SlasherFactory.sol";
-import {VaultFactory} from "src/contracts/VaultFactory.sol";
-import {Vault} from "src/contracts/vault/Vault.sol";
+import {BaseSlasher} from "./slasher/BaseSlasher.sol";
+import {DelegatorFactory} from "./DelegatorFactory.sol";
+import {SlasherFactory} from "./SlasherFactory.sol";
+import {VaultFactory} from "./VaultFactory.sol";
+import {Vault} from "./vault/Vault.sol";
 
-import {IVaultConfigurator} from "src/interfaces/IVaultConfigurator.sol";
+import {IVaultConfigurator} from "../interfaces/IVaultConfigurator.sol";
 
 contract VaultConfigurator is IVaultConfigurator {
     /**
@@ -34,7 +34,9 @@ contract VaultConfigurator is IVaultConfigurator {
     /**
      * @inheritdoc IVaultConfigurator
      */
-    function create(InitParams memory params) public returns (address, address, address) {
+    function create(
+        InitParams memory params
+    ) public returns (address, address, address) {
         if (params.vaultParams.delegator != address(0) || params.vaultParams.slasher != address(0)) {
             revert DirtyInitParams();
         }

diff --git a/src/contracts/VaultFactory.sol b/src/contracts/VaultFactory.sol
@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {MigratablesFactory} from "src/contracts/common/MigratablesFactory.sol";
+import {MigratablesFactory} from "./common/MigratablesFactory.sol";
 
-import {IVaultFactory} from "src/interfaces/IVaultFactory.sol";
+import {IVaultFactory} from "../interfaces/IVaultFactory.sol";
 
 contract VaultFactory is MigratablesFactory, IVaultFactory {
-    constructor(address owner_) MigratablesFactory(owner_) {}
+    constructor(
+        address owner_
+    ) MigratablesFactory(owner_) {}
 }
diff --git a/src/contracts/common/Entity.sol b/src/contracts/common/Entity.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {IEntity} from "src/interfaces/common/IEntity.sol";
+import {IEntity} from "../../interfaces/common/IEntity.sol";
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
@@ -26,9 +26,13 @@ abstract contract Entity is Initializable, IEntity {
     /**
      * @inheritdoc IEntity
      */
-    function initialize(bytes calldata data) external initializer {
+    function initialize(
+        bytes calldata data
+    ) external initializer {
         _initialize(data);
     }
 
-    function _initialize(bytes calldata) internal virtual {}
+    function _initialize(
+        bytes calldata
+    ) internal virtual {}
 }
diff --git a/src/contracts/common/Factory.sol b/src/contracts/common/Factory.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.25;
 
 import {Registry} from "./Registry.sol";
 
-import {IEntity} from "src/interfaces/common/IEntity.sol";
-import {IFactory} from "src/interfaces/common/IFactory.sol";
+import {IEntity} from "../../interfaces/common/IEntity.sol";
+import {IFactory} from "../../interfaces/common/IFactory.sol";
 
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
@@ -16,7 +16,9 @@ contract Factory is Registry, Ownable, IFactory {
 
     EnumerableSet.AddressSet private _whitelistedImplementations;
 
-    constructor(address owner_) Ownable(owner_) {}
+    constructor(
+        address owner_
+    ) Ownable(owner_) {}
 
     /**
      * @inheritdoc IFactory
@@ -28,14 +30,18 @@ contract Factory is Registry, Ownable, IFactory {
     /**
      * @inheritdoc IFactory
      */
-    function implementation(uint64 type_) public view returns (address) {
+    function implementation(
+        uint64 type_
+    ) public view returns (address) {
         return _whitelistedImplementations.at(type_);
     }
 
     /**
      * @inheritdoc IFactory
      */
-    function whitelist(address implementation_) external onlyOwner {
+    function whitelist(
+        address implementation_
+    ) external onlyOwner {
         if (IEntity(implementation_).FACTORY() != address(this) || IEntity(implementation_).TYPE() != totalTypes()) {
             revert InvalidImplementation();
         }

diff --git a/src/contracts/common/MigratableEntity.sol b/src/contracts/common/MigratableEntity.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {IMigratableEntity} from "src/interfaces/common/IMigratableEntity.sol";
-import {IMigratablesFactory} from "src/interfaces/common/IMigratablesFactory.sol";
+import {IMigratableEntity} from "../../interfaces/common/IMigratableEntity.sol";
+import {IMigratablesFactory} from "../../interfaces/common/IMigratablesFactory.sol";
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
@@ -23,7 +23,9 @@ abstract contract MigratableEntity is Initializable, OwnableUpgradeable, IMigrat
         _;
     }
 
-    constructor(address factory) {
+    constructor(
+        address factory
+    ) {
         _disableInitializers();
 
         FACTORY = factory;

diff --git a/src/contracts/common/MigratableEntityProxy.sol b/src/contracts/common/MigratableEntityProxy.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.25;
 
-import {IMigratableEntityProxy} from "src/interfaces/common/IMigratableEntityProxy.sol";
+import {IMigratableEntityProxy} from "../../interfaces/common/IMigratableEntityProxy.sol";
 
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {ERC1967Utils} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";

diff --git a/src/contracts/common/MigratablesFactory.sol b/src/contracts/common/MigratablesFactory.sol
@@ -4,9 +4,9 @@ pragma solidity 0.8.25;
 import {MigratableEntityProxy} from "./MigratableEntityProxy.sol";
 import {Registry} from "./Registry.sol";
 
-import {IMigratableEntityProxy} from "src/interfaces/common/IMigratableEntityProxy.sol";
-import {IMigratableEntity} from "src/interfaces/common/IMigratableEntity.sol";
-import {IMigratablesFactory} from "src/interfaces/common/IMigratablesFactory.sol";
+import {IMigratableEntityProxy} from "../../interfaces/common/IMigratableEntityProxy.sol";
+import {IMigratableEntity} from "../../interfaces/common/IMigratableEntity.sol";
+import {IMigratablesFactory} from "../../interfaces/common/IMigratablesFactory.sol";
 
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
@@ -18,7 +18,9 @@ contract MigratablesFactory is Registry, Ownable, IMigratablesFactory {
 
     EnumerableSet.AddressSet private _whitelistedImplementations;
 
-    constructor(address owner_) Ownable(owner_) {}
+    constructor(
+        address owner_
+    ) Ownable(owner_) {}
 
     /**
      * @inheritdoc IMigratablesFactory
@@ -30,7 +32,9 @@ contract MigratablesFactory is Registry, Ownable, IMigratablesFactory {
     /**
      * @inheritdoc IMigratablesFactory
      */
-    function implementation(uint64 version) public view returns (address) {
+    function implementation(
+        uint64 version
+    ) public view returns (address) {
         if (version == 0 || version > lastVersion()) {
             revert InvalidVersion();
         }
@@ -40,7 +44,9 @@ contract MigratablesFactory is Registry, Ownable, IMigratablesFactory {
     /**
      * @inheritdoc IMigratablesFactory
      */
-    function whitelist(address implementation_) external onlyOwner {
+    function whitelist(
+        address implementation_
+    ) external onlyOwner {
         if (IMigratableEntity(implementation_).FACTORY() != address(this)) {
             revert InvalidImplementation();
         }