allow for first cut

connext · Jun 26, 2022 · 8f0061e · 8f0061e
1 parent 14df4c6
commit 8f0061e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/deployments/contracts/contracts/core/connext/libraries/LibDiamond.sol b/packages/deployments/contracts/contracts/core/connext/libraries/LibDiamond.sol
@@ -97,8 +97,11 @@ library LibDiamond {
     address _init,
     bytes memory _calldata
   ) internal {
-    uint256 time = diamondStorage().acceptanceTimes[keccak256(abi.encode(_diamondCut))];
-    require(time > 0 && time < block.timestamp, "LibDiamond: delay not elapsed");
+    DiamondStorage storage ds = diamondStorage();
+    if (ds.facetAddresses.length != 0) {
+      uint256 time = ds.acceptanceTimes[keccak256(abi.encode(_diamondCut))];
+      require(time > 0 && time < block.timestamp, "LibDiamond: delay not elapsed");
+    } // Otherwise, this is the first instance of deployment and it can be set automatically
     for (uint256 facetIndex; facetIndex < _diamondCut.length; facetIndex++) {
       IDiamondCut.FacetCutAction action = _diamondCut[facetIndex].action;
       if (action == IDiamondCut.FacetCutAction.Add) {