symbioticfi · alrxy · Dec 11, 2024 · Oct 1, 2024 · Oct 2, 2024 · Oct 2, 2024
diff --git a/lib/core b/lib/core
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/src/BLSKeyManager.sol b/src/BLSKeyManager.sol
@@ -4,21 +4,27 @@ pragma solidity 0.8.25;
 import {Time} from "@openzeppelin/contracts/utils/types/Time.sol";
 
 import {MiddlewareStorage} from "./MiddlewareStorage.sol";
-import {ArrayWithTimes} from "./libraries/ArrayWithTimes.sol";
+import {EnumerableSetWithTimeData} from "./libraries/EnumerableSetWithTimeData.sol";
 
 abstract contract BLSKeyManager is MiddlewareStorage {
-    using ArrayWithTimes for ArrayWithTimes.Address;
+    using EnumerableSetWithTimeData for EnumerableSetWithTimeData.Inner;
 
     error DuplicateBLSKey();
+    error FreshBLSKey();
 
     mapping(address => bytes) public blsKeys;
-    mapping(bytes => ArrayWithTimes.Address) internal blsKeyData;
+    mapping(address => bytes) public prevBLSKeys;
+    mapping(bytes => EnumerableSetWithTimeData.Inner) internal blsKeyData;
 
     function operatorByBLSKey(bytes memory key) public view returns (address) {
         return blsKeyData[key].getAddress();
     }
 
     function operatorBLSKey(address operator) public view returns (bytes memory) {
+        if (blsKeyData[blsKeys[operator]].enabled == Time.timestamp()) {
+            return prevBLSKeys[operator];
+        }
+
         return blsKeys[operator];
     }
 
@@ -31,6 +37,14 @@ abstract contract BLSKeyManager is MiddlewareStorage {
             revert DuplicateBLSKey();
         }
 
+        if (keccak256(blsKeys[operator]) != keccak256("")) {
+            if (blsKeyData[blsKeys[operator]].enabled == Time.timestamp()) {
+                revert FreshBLSKey();
+            }
+
+            prevBLSKeys[operator] = blsKeys[operator];
+        }
+
         blsKeys[operator] = key;
         blsKeyData[key].set(operator);
     }

diff --git a/src/KeyManager.sol b/src/KeyManager.sol
@@ -4,21 +4,27 @@ pragma solidity 0.8.25;
 import {Time} from "@openzeppelin/contracts/utils/types/Time.sol";
 
 import {MiddlewareStorage} from "./MiddlewareStorage.sol";
-import {ArrayWithTimes} from "./libraries/ArrayWithTimes.sol";
+import {EnumerableSetWithTimeData} from "./libraries/EnumerableSetWithTimeData.sol";
 
 abstract contract KeyManager is MiddlewareStorage {
-    using ArrayWithTimes for ArrayWithTimes.Address;
+    using EnumerableSetWithTimeData for EnumerableSetWithTimeData.Inner;
 
     error DuplicateKey();
+    error FreshKey();
 
     mapping(address => bytes32) public keys;
-    mapping(bytes32 => ArrayWithTimes.Address) internal keyData;
+    mapping(address => bytes32) public prevKeys;
+    mapping(bytes32 => EnumerableSetWithTimeData.Inner) internal keyData;
 
     function operatorByKey(bytes32 key) public view returns (address) {
         return keyData[key].getAddress();
     }
 
     function operatorKey(address operator) public view returns (bytes32) {
+        if (keyData[keys[operator]].enabled == Time.timestamp()) {
+            return prevKeys[operator];
+        }
+
         return keys[operator];
     }
 
@@ -31,6 +37,14 @@ abstract contract KeyManager is MiddlewareStorage {
             revert DuplicateKey();
         }
 
+        if (keys[operator] != bytes32(0)) {
+            if (keyData[keys[operator]].enabled == Time.timestamp()) {
+                revert FreshKey();
+            }
+
+            prevKeys[operator] = keys[operator];
+        }
+
         keys[operator] = key;
         keyData[key].set(operator);
     }

diff --git a/src/MiddlewareStorage.sol b/src/MiddlewareStorage.sol
@@ -4,8 +4,6 @@ pragma solidity 0.8.25;
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
 abstract contract MiddlewareStorage is Ownable {
-    uint256 public subnetworks;
-
     address public immutable NETWORK;
     uint48 public immutable SLASHING_WINDOW;
     address public immutable VAULT_REGISTRY;
@@ -14,6 +12,7 @@ abstract contract MiddlewareStorage is Ownable {
 
     uint64 public constant INSTANT_SLASHER_TYPE = 0;
     uint64 public constant VETO_SLASHER_TYPE = 1;
+    uint160 public constant DEFAULT_SUBNETWORK = 0;
 
     constructor(
         address owner,
@@ -23,8 +22,6 @@ abstract contract MiddlewareStorage is Ownable {
         address operatorRegistry,
         address operatorNetOptIn
     ) Ownable(owner) {
-        subnetworks = 1;
-
         NETWORK = network;
         SLASHING_WINDOW = slashingWindow;
         VAULT_REGISTRY = vaultRegistry;

diff --git a/src/OperatorManager.sol b/src/OperatorManager.sol
@@ -9,17 +9,17 @@ import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
 import {MiddlewareStorage} from "./MiddlewareStorage.sol";
-import {ArrayWithTimes} from "./libraries/ArrayWithTimes.sol";
+import {EnumerableSetWithTimeData} from "./libraries/EnumerableSetWithTimeData.sol";
 
 abstract contract OperatorManager is MiddlewareStorage {
-    using ArrayWithTimes for ArrayWithTimes.AddressArray;
+    using EnumerableSetWithTimeData for EnumerableSetWithTimeData.AddressSet;
 
     error NotOperator();
     error OperatorNotOptedIn();
     error OperatorNotRegistered();
     error OperatorAlreadyRegistred();
 
-    ArrayWithTimes.AddressArray internal operators;
+    EnumerableSetWithTimeData.AddressSet internal operators;
 
     function operatorsLength() external view returns (uint256) {
         return operators.length();

diff --git a/src/VaultManager.sol b/src/VaultManager.sol
@@ -14,13 +14,16 @@ import {Time} from "@openzeppelin/contracts/utils/types/Time.sol";
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
 import {MiddlewareStorage} from "./MiddlewareStorage.sol";
-import {ArrayWithTimes} from "./libraries/ArrayWithTimes.sol";
+import {EnumerableSetWithTimeData} from "./libraries/EnumerableSetWithTimeData.sol";
 
 abstract contract VaultManager is MiddlewareStorage {
-    using ArrayWithTimes for ArrayWithTimes.AddressArray;
+    using EnumerableSetWithTimeData for EnumerableSetWithTimeData.AddressSet;
+    using EnumerableSetWithTimeData for EnumerableSetWithTimeData.Uint160Set;
+
     using Subnetwork for address;
 
     error NotVault();
+    error VaultNotInitialized();
     error VaultNotRegistered();
     error VaultAlreadyRegistred();
     error VaultEpochTooShort();
@@ -33,8 +36,10 @@ abstract contract VaultManager is MiddlewareStorage {
     error UnknownSlasherType();
     error NonVetoSlasher();
 
-    ArrayWithTimes.AddressArray internal sharedVaults;
-    mapping(address => ArrayWithTimes.AddressArray) internal operatorVaults;
+    EnumerableSetWithTimeData.Uint160Set subnetworks;
+
+    EnumerableSetWithTimeData.AddressSet internal sharedVaults;
+    mapping(address => EnumerableSetWithTimeData.AddressSet) internal operatorVaults;
 
     struct SlashResponse {
         address vault;
@@ -43,6 +48,18 @@ abstract contract VaultManager is MiddlewareStorage {
         uint256 response; // if instant slashed amount else slash index
     }
 
+    constructor() {
+        subnetworks.register(DEFAULT_SUBNETWORK);
+    }
+
+    function subnetworksLength() external view returns (uint256) {
+        return subnetworks.length();
+    }
+
+    function subnetworkWithTimesAt(uint256 pos) external view returns (uint160, uint48, uint48) {
+        return subnetworks.at(pos);
+    }
+
     function sharedVaultsLength() external view returns (uint256) {
         return sharedVaults.length();
     }
@@ -64,6 +81,10 @@ abstract contract VaultManager is MiddlewareStorage {
         return stake;
     }
 
+    function activeSubnetworks(uint48 timestamp) public view returns (uint160[] memory) {
+        return subnetworks.getActive(timestamp);
+    }
+
     function activeVaults(address operator, uint48 timestamp) public view returns (address[] memory) {
         address[] memory activeSharedVaults = sharedVaults.getActive(timestamp);
         address[] memory activeOperatorVaults = operatorVaults[operator].getActive(timestamp);
@@ -116,11 +137,12 @@ abstract contract VaultManager is MiddlewareStorage {
 
     function getOperatorStake(address operator, uint48 timestamp) public view returns (uint256 stake) {
         address[] memory vaults = activeVaults(operator, timestamp);
+        uint160[] memory _subnetworks = activeSubnetworks(timestamp);
 
         for (uint256 i; i < vaults.length; ++i) {
             address vault = vaults[i];
-            for (uint96 subnet = 0; subnet < subnetworks; ++subnet) {
-                bytes32 subnetwork = NETWORK.subnetwork(subnet);
+            for (uint256 j; j < _subnetworks.length; ++j) {
+                bytes32 subnetwork = NETWORK.subnetwork(uint96(_subnetworks[j]));
                 stake += IBaseDelegator(IVault(vault).delegator()).stakeAt(subnetwork, operator, timestamp, "");
             }
         }
@@ -130,11 +152,12 @@ abstract contract VaultManager is MiddlewareStorage {
 
     function getOperatorPower(address operator, uint48 timestamp) public view returns (uint256 power) {
         address[] memory vaults = activeVaults(operator, timestamp);
+        uint160[] memory _subnetworks = activeSubnetworks(timestamp);
 
         for (uint256 i; i < vaults.length; ++i) {
             address vault = vaults[i];
-            for (uint96 subnet = 0; subnet < subnetworks; ++subnet) {
-                bytes32 subnetwork = NETWORK.subnetwork(subnet);
+            for (uint256 j; j < _subnetworks.length; ++j) {
+                bytes32 subnetwork = NETWORK.subnetwork(uint96(_subnetworks[j]));
                 uint256 stake = IBaseDelegator(IVault(vault).delegator()).stakeAt(subnetwork, operator, timestamp, "");
                 power += stakeToPower(vault, stake);
             }
@@ -168,6 +191,10 @@ abstract contract VaultManager is MiddlewareStorage {
         uint256 amount,
         bytes calldata hints
     ) internal returns (SlashResponse memory resp) {
+        if (!sharedVaults.contains(vault)) {
+            revert NotVault();
+        }
+
         address slasher = IVault(vault).slasher();
         uint64 slasherType = IEntity(slasher).TYPE();
         resp.vault = vault;
@@ -205,6 +232,10 @@ abstract contract VaultManager is MiddlewareStorage {
             revert NotVault();
         }
 
+        if (!IVault(vault).isInitialized()) {
+            revert VaultNotInitialized();
+        }
+
         uint48 vaultEpoch = IVault(vault).epochDuration();
 
         address slasher = IVault(vault).slasher();
+2 −2		README.md
+1 −1		package.json
+18 −2		script/deploy/Core.s.sol
+2 −2		script/deploy/OptInService.s.sol
+63 −41		script/deploy/Vault.s.sol
+8 −20		src/contracts/VaultConfigurator.sol
+1 −1		src/contracts/common/Entity.sol
+31 −4		src/contracts/common/Factory.sol
+15 −15		src/contracts/common/MigratableEntity.sol
+32 −13		src/contracts/common/MigratablesFactory.sol
+30 −10		src/contracts/delegator/BaseDelegator.sol
+2 −2		src/contracts/delegator/FullRestakeDelegator.sol
+2 −2		src/contracts/delegator/NetworkRestakeDelegator.sol
+153 −0		src/contracts/delegator/OperatorSpecificDelegator.sol
+67 −0		src/contracts/hints/DelegatorHints.sol
+1 −1		src/contracts/hints/OptInServiceHints.sol
+38 −5		src/contracts/hints/SlasherHints.sol
+2 −2		src/contracts/libraries/Checkpoints.sol
+2 −2		src/contracts/libraries/ERC4626Math.sol
+21 −0		src/contracts/libraries/LICENSE
+2 −2		src/contracts/libraries/Subnetwork.sol
+106 −15		src/contracts/service/OptInService.sol
+58 −12		src/contracts/slasher/BaseSlasher.sol
+2 −6		src/contracts/slasher/Slasher.sol
+9 −13		src/contracts/slasher/VetoSlasher.sol
+121 −44		src/contracts/vault/Vault.sol
+13 −3		src/contracts/vault/VaultStorage.sol
+112 −0		src/contracts/vault/VaultTokenized.sol
+2 −2		src/interfaces/IDelegatorFactory.sol
+2 −2		src/interfaces/INetworkRegistry.sol
+2 −2		src/interfaces/IOperatorRegistry.sol
+2 −2		src/interfaces/ISlasherFactory.sol
+3 −5		src/interfaces/IVaultConfigurator.sol
+2 −2		src/interfaces/IVaultFactory.sol
+21 −0		src/interfaces/LICENSE
+0 −99		src/interfaces/collateral/ICollateral.sol
+4 −2		src/interfaces/common/IEntity.sol
+32 −4		src/interfaces/common/IFactory.sol
+3 −3		src/interfaces/common/IMigratableEntity.sol
+3 −5		src/interfaces/common/IMigratableEntityProxy.sol
+31 −9		src/interfaces/common/IMigratablesFactory.sol
+2 −2		src/interfaces/common/IRegistry.sol
+18 −2		src/interfaces/delegator/IBaseDelegator.sol
+2 −1		src/interfaces/delegator/IDelegatorHook.sol
+2 −1		src/interfaces/delegator/IFullRestakeDelegator.sol
+2 −1		src/interfaces/delegator/INetworkRestakeDelegator.sol
+88 −0		src/interfaces/delegator/IOperatorSpecificDelegator.sol
+2 −2		src/interfaces/service/IMetadataService.sol
+2 −2		src/interfaces/service/INetworkMiddlewareService.sol
+50 −6		src/interfaces/service/IOptInService.sol
+25 −6		src/interfaces/slasher/IBaseSlasher.sol
+2 −2		src/interfaces/slasher/ISlasher.sol
+4 −4		src/interfaces/slasher/IVetoSlasher.sol
+70 −8		src/interfaces/vault/IVault.sol
+14 −2		src/interfaces/vault/IVaultStorage.sol
+18 −0		src/interfaces/vault/IVaultTokenized.sol
+36 −25		test/DelegatorFactory.t.sol
+27 −0		test/POC.t.sol
+652 −0		test/POCBase.t.sol
+38 −27		test/SlasherFactory.t.sol
+37 −81		test/VaultConfigurator.t.sol
+36 −23		test/VaultFactory.t.sol
+3 −3		test/common/Entity.t.sol
+25 −5		test/common/Factory.t.sol
+7 −32		test/common/MigratableEntity.t.sol
+3 −3		test/common/MigratableEntityProxy.t.sol
+31 −10		test/common/MigratablesFactory.t.sol
+1 −1		test/common/Registry.t.sol
+189 −64		test/delegator/FullRestakeDelegator.t.sol
+187 −62		test/delegator/NetworkRestakeDelegator.t.sol
+1,636 −0		test/delegator/OperatorSpecificDelegator.t.sol
+0 −99		test/mocks/SimpleCollateral.sol
+7 −3		test/mocks/SimpleFullRestakeDelegatorHook.sol
+1 −1		test/mocks/SimpleMigratableEntity.sol
+7 −3		test/mocks/SimpleNetworkRestakeDelegatorHook.sol
+20 −0		test/mocks/SimpleOperatorSpecificDelegatorHook.sol
+309 −6		test/service/OptInService.t.sol
+344 −90		test/slasher/Slasher.t.sol
+284 −128		test/slasher/VetoSlasher.t.sol
+752 −389		test/vault/Vault.t.sol
+3,102 −0		test/vault/VaultTokenized.t.sol
+5 −0		.changeset/four-chairs-help.md
+8 −0		.solcover.js
+1 −1		CHANGELOG.md
+7 −0		GUIDELINES.md
+ −		audits/2024-10-v5.1.pdf
+1 −0		audits/README.md
+2 −0		contracts/access/Ownable2Step.sol
+2 −2		contracts/finance/VestingWallet.sol
+4 −2		contracts/finance/VestingWalletCliff.sol
+2 −2		contracts/governance/Governor.sol
+3 −0		contracts/governance/IGovernor.sol
+4 −2		contracts/governance/extensions/GovernorCountingFractional.sol
+16 −6		contracts/governance/extensions/GovernorStorage.sol
+1 −1		contracts/governance/utils/Votes.sol
+1 −1		contracts/interfaces/IERC1363Receiver.sol
+1 −1		contracts/interfaces/IERC1363Spender.sol
+2 −2		contracts/metatx/ERC2771Forwarder.sol
+1 −51		contracts/mocks/StorageSlotMock.sol
+61 −0		contracts/mocks/TransientSlotMock.sol
+141 −0		contracts/proxy/Clones.sol
+1 −6		contracts/proxy/transparent/TransparentUpgradeableProxy.sol
+4 −2		contracts/token/ERC1155/utils/ERC1155Utils.sol
+2 −0		contracts/token/ERC20/extensions/ERC1363.sol
+1 −1		contracts/token/ERC20/extensions/ERC4626.sol
+7 −8		contracts/token/ERC20/extensions/draft-ERC20TemporaryApproval.sol
+2 −0		contracts/token/ERC721/utils/ERC721Utils.sol
+4 −1		contracts/token/common/ERC2981.sol
+1 −0		contracts/utils/Base64.sol
+5 −0		contracts/utils/Comparators.sol
+2 −0		contracts/utils/Errors.sol
+2 −0		contracts/utils/Packing.sol
+2 −0		contracts/utils/Panic.sol
+8 −1		contracts/utils/README.adoc
+4 −2		contracts/utils/ReentrancyGuardTransient.sol
+4 −2		contracts/utils/SlotDerivation.sol
+1 −169		contracts/utils/StorageSlot.sol
+182 −0		contracts/utils/TransientSlot.sol
+10 −3		contracts/utils/cryptography/ECDSA.sol
+3 −1		contracts/utils/cryptography/Hashes.sol
+4 −4		contracts/utils/cryptography/MerkleProof.sol
+88 −36		contracts/utils/cryptography/P256.sol
+26 −18		contracts/utils/cryptography/RSA.sol
+1 −1		contracts/utils/introspection/ERC165Checker.sol
+30 −6		contracts/utils/structs/Checkpoints.sol
+12 −3		contracts/utils/structs/CircularBuffer.sol
+55 −55		contracts/utils/structs/EnumerableMap.sol
+83 −404		contracts/utils/structs/Heap.sol
+15 −12		contracts/utils/structs/MerkleTree.sol
+6 −3		contracts/utils/types/Time.sol
+1 −1		docs/modules/ROOT/pages/erc4626.adoc
+8 −8		docs/modules/ROOT/pages/utilities.adoc
+1 −1		fv-requirements.txt
+1 −1		lib/forge-std
+5 −0		scripts/generate/helpers/sanitize.js
+2 −2		scripts/generate/run.js
+10 −2		scripts/generate/templates/Checkpoints.js
+13 −13		scripts/generate/templates/EnumerableMap.js
+0 −327		scripts/generate/templates/Heap.js
+0 −13		scripts/generate/templates/Heap.opts.js
+0 −89		scripts/generate/templates/Heap.t.js
+1 −1		scripts/generate/templates/MerkleProof.js
+7 −4		scripts/generate/templates/Packing.js
+2 −0		scripts/generate/templates/Slot.opts.js
+4 −1		scripts/generate/templates/SlotDerivation.js
+14 −0		scripts/generate/templates/SlotDerivation.t.js
+1 −55		scripts/generate/templates/StorageSlot.js
+1 −14		scripts/generate/templates/StorageSlotMock.js
+80 −0		scripts/generate/templates/TransientSlot.js
+35 −0		scripts/generate/templates/TransientSlotMock.js
+17 −0		test/access/Ownable2Step.test.js
+11 −8		test/governance/utils/ERC6372.behavior.js
+2 −2		test/helpers/iterate.js
+34 −2		test/proxy/Clones.t.sol
+151 −71		test/proxy/Clones.test.js
+20 −0		test/utils/SlotDerivation.t.sol
+0 −33		test/utils/StorageSlot.test.js
+59 −0		test/utils/TransientSlot.test.js
+13 −104		test/utils/cryptography/P256.t.sol
+53 −48		test/utils/cryptography/RSA.test.js
+4 −0		test/utils/structs/CircularBuffer.test.js
+2 −81		test/utils/structs/Heap.t.sol
+86 −104		test/utils/structs/Heap.test.js
+11 −11		test/utils/structs/MerkleTree.test.js