New arch

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/permit2"]
-	path = lib/permit2
-	url = https://github.com/Uniswap/permit2
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts

remappings.txt

@@ -1,4 +1,3 @@
 forge-std/=lib/forge-std/src/
-permit2/=lib/permit2/
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/

script/deploy/Core.s.sol

@@ -3,14 +3,13 @@
 
 // import "forge-std/Script.sol";
 
-// import {MetadataService} from "src/contracts/MetadataService.sol";
-// import {NetworkMiddlewareService} from "src/contracts/NetworkMiddlewareService.sol";
-// import {NetworkOptInService} from "src/contracts/NetworkOptInService.sol";
+// import {MetadataService} from "src/contracts/service/MetadataService.sol";
+// import {NetworkMiddlewareService} from "src/contracts/service/NetworkMiddlewareService.sol";
 // import {NetworkRegistry} from "src/contracts/NetworkRegistry.sol";
-// import {OperatorOptInService} from "src/contracts/OperatorOptInService.sol";
+// import {OptInService} from "src/contracts/service/OptInService.sol";
 // import {OperatorRegistry} from "src/contracts/OperatorRegistry.sol";
 // import {VaultFactory} from "src/contracts/VaultFactory.sol";
-// import {Vault} from "src/contracts/vault/v1/Vault.sol";
+// import {Vault} from "src/contracts/vault/Vault.sol";
 
 // contract CoreScript is Script {
 //     function run(address owner) public {
@@ -23,12 +22,12 @@
 //         MetadataService operatorMetadataService = new MetadataService(address(operatorRegistry));
 //         MetadataService networkMetadataService = new MetadataService(address(networkRegistry));
 //         NetworkMiddlewareService networkMiddlewareService = new NetworkMiddlewareService(address(networkRegistry));
-//         NetworkOptInService networkVaultOptInService =
-//             new NetworkOptInService(address(networkRegistry), address(vaultFactory));
-//         OperatorOptInService operatorVaultOptInService =
-//             new OperatorOptInService(address(operatorRegistry), address(vaultFactory));
-//         OperatorOptInService operatorNetworkOptInService =
-//             new OperatorOptInService(address(operatorRegistry), address(networkRegistry));
+//         OptInService networkVaultOptInService =
+//             new OptInService(address(networkRegistry), address(vaultFactory));
+//         OptInService operatorVaultOptInService =
+//             new OptInService(address(operatorRegistry), address(vaultFactory));
+//         OptInService operatorNetworkOptInService =
+//             new OptInService(address(operatorRegistry), address(networkRegistry));
 
 //         vaultFactory.whitelist(
 //             address(

script/deploy/MetadataService.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {MetadataService} from "src/contracts/MetadataService.sol";
+import {MetadataService} from "src/contracts/service/MetadataService.sol";
 
 contract MetadataServiceScript is Script {
     function run(address registry) public {

script/deploy/NetworkMiddlewareService.s.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {NetworkMiddlewareService} from "src/contracts/NetworkMiddlewareService.sol";
+import {NetworkMiddlewareService} from "src/contracts/service/NetworkMiddlewareService.sol";
 
 contract NetworkMiddlewareServiceScript is Script {
     function run(address networkRegistry) public {

script/deploy/OperatorOptInService.s.sol → script/deploy/OptInService.s.sol

@@ -3,13 +3,13 @@ pragma solidity 0.8.25;
 
 import "forge-std/Script.sol";
 
-import {OperatorOptInService} from "src/contracts/OperatorOptInService.sol";
+import {OptInService} from "src/contracts/service/OptInService.sol";
 
 contract OperatorOptInServiceScript is Script {
     function run(address operatorRegistry, address whereRegistry) public {
         vm.startBroadcast();
 
-        new OperatorOptInService(operatorRegistry, whereRegistry);
+        new OptInService(operatorRegistry, whereRegistry);
 
         vm.stopBroadcast();
     }

script/deploy/Vault.s.sol

@@ -4,7 +4,7 @@
 // import "forge-std/Script.sol";
 
 // import {IMigratablesFactory} from "src/interfaces/base/IMigratablesFactory.sol";
-// import {IVault} from "src/interfaces/vault/v1/IVault.sol";
+// import {IVault} from "src/interfaces/vault/IVault.sol";
 
 // contract VaultScript is Script {
 //     function run(
@@ -14,7 +14,7 @@
 //         uint48 epochDuration,
 //         uint48 vetoDuration,
 //         uint48 executeDuration,
-//         address rewardsDistributor,
+//         address stakerRewardsDistributor,
 //         uint256 adminFee,
 //         bool depositWhitelist
 //     ) public {
@@ -29,7 +29,7 @@
 //                     epochDuration: epochDuration,
 //                     vetoDuration: vetoDuration,
 //                     executeDuration: executeDuration,
-//                     rewardsDistributor: rewardsDistributor,
+//                     stakerRewardsDistributor: stakerRewardsDistributor,
 //                     adminFee: adminFee,
 //                     depositWhitelist: depositWhitelist
 //                 })

specs/Network.md

@@ -95,8 +95,8 @@ forge script script/deploy/NetworkMiddlewareService.s.sol:NetworkMiddlewareServi
 
 #### Deploy opt-in service
 
-Deployment script: [click](../script/deploy/NetworkOptInService.s.sol)
+Deployment script: [click](../script/deploy/OptInService.s.sol)
 
 ```shell
-forge script script/deploy/NetworkOptInService.s.sol:NetworkOptInServiceScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 --sig "run(address,address)" --broadcast --rpc-url=$ETH_RPC_URL
+forge script script/deploy/OptInService.s.sol:OptInServiceScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 --sig "run(address,address)" --broadcast --rpc-url=$ETH_RPC_URL
 ```

specs/Operator.md

@@ -46,8 +46,8 @@ forge script script/deploy/MetadataService.s.sol:MetadataServiceScript 0x0000000
 
 #### Deploy opt-in service
 
-Deployment script: [click](../script/deploy/OperatorOptInService.s.sol)
+Deployment script: [click](../script/deploy/OptInService.s.sol)
 
 ```shell
-forge script script/deploy/OperatorOptInService.s.sol:OperatorOptInServiceScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 --sig "run(address,address)" --broadcast --rpc-url=$ETH_RPC_URL
+forge script script/deploy/OptInService.s.sol:OperatorOptInServiceScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 --sig "run(address,address)" --broadcast --rpc-url=$ETH_RPC_URL
 ```

specs/Rewards.md

@@ -8,12 +8,12 @@ For staker rewards calculation, the vault provides the following data:
 
 Reward processing is not integrated into the vault's functionality. Instead, external reward contracts should manage this using the provided data.
 
-However, we created the first version of the `IRewardsDistributor` interface to facilitate more generic reward distribution across networks.
+However, we created the first version of the `IStakerRewardsDistributor` interface to facilitate more generic reward distribution across networks.
 
-- `IRewardsDistributor.version()` - provides a version of the interface that a particular rewards distributor uses
-- `IRewardsDistributor.distributeReward(network, token, amount, timestamp)` - call to distribute `amount` of `token` on behalf of `network` using `timestamp` as a time point for calculations
+- `IStakerRewardsDistributor.version()` - provides a version of the interface that a particular rewards distributor uses
+- `IStakerRewardsDistributor.distributeReward(network, token, amount, timestamp)` - call to distribute `amount` of `token` on behalf of `network` using `timestamp` as a time point for calculations
 
-The vault's rewards distributor's address can be obtained via the `rewardsDistributor()` method, which can be set by the `REWARDS_DISTRIBUTOR_SET_ROLE` holder.
+The vault's rewards distributor's address can be obtained via the `stakerRewardsDistributor()` method, which can be set by the `STAKER_REWARDS_DISTRIBUTOR_SET_ROLE` holder.
 
 ### Deploy
 
@@ -23,16 +23,16 @@ source .env
 
 #### Deploy factory
 
-Deployment script: [click](../script/deploy/defaultRewardsDistributor/DefaultRewardsDistributorFactory.s.sol)
+Deployment script: [click](../script/deploy/defaultStakerRewardsDistributor/DefaultStakerRewardsDistributorFactory.s.sol)
 
 ```shell
-forge script script/deploy/defaultRewardsDistributor/DefaultRewardsDistributorFactory.s.sol:DefaultRewardsDistributorFactoryScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 --sig "run(address,address,address)" --broadcast --rpc-url=$ETH_RPC_URL
+forge script script/deploy/defaultStakerRewardsDistributor/DefaultStakerRewardsDistributorFactory.s.sol:DefaultStakerRewardsDistributorFactoryScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 --sig "run(address,address,address)" --broadcast --rpc-url=$ETH_RPC_URL
 ```
 
 #### Deploy entity
 
-Deployment script: [click](../script/deploy/defaultRewardsDistributor/DefaultRewardsDistributor.s.sol)
+Deployment script: [click](../script/deploy/defaultStakerRewardsDistributor/DefaultStakerRewardsDistributor.s.sol)
 
 ```shell
-forge script script/deploy/defaultRewardsDistributor/DefaultRewardsDistributor.s.sol:DefaultRewardsDistributorScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 --sig "run(address,address)" --broadcast --rpc-url=$ETH_RPC_URL
+forge script script/deploy/defaultStakerRewardsDistributor/DefaultStakerRewardsDistributor.s.sol:DefaultStakerRewardsDistributorScript 0x0000000000000000000000000000000000000000 0x0000000000000000000000000000000000000000 --sig "run(address,address)" --broadcast --rpc-url=$ETH_RPC_URL
 ```

src/contracts/DelegatorFactory.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.25;
+
+import {NonMigratablesFactory} from "src/contracts/common/NonMigratablesFactory.sol";
+
+import {IDelegatorFactory} from "src/interfaces/IDelegatorFactory.sol";
+
+contract DelegatorFactory is NonMigratablesFactory, IDelegatorFactory {
+    constructor(address owner_) NonMigratablesFactory(owner_) {}
+}

src/contracts/NetworkRegistry.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.25;
 
-import {Registry} from "./base/Registry.sol";
+import {Registry} from "./common/Registry.sol";
 
 import {INetworkRegistry} from "src/interfaces/INetworkRegistry.sol";