chore(scripts): remove unconditionally removed facets (#448)

matter-labs · May 16, 2024 · 2840540 · 2840540
1 parent 3601648
commit 2840540
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml
@@ -43,4 +43,6 @@ jobs:
           rm -rf ./l1-contracts/contracts/dev-contracts/test/VerifierRecursiveTest.sol
 
       - name: Run Slither
-        run: slither --config ./l1-contracts/slither.config.json ./l1-contracts
+        run: |
+          cd l1-contracts
+          slither --config ./slither.config.json .
diff --git a/l1-contracts/src.ts/diamondCut.ts b/l1-contracts/src.ts/diamondCut.ts
@@ -6,9 +6,6 @@ import { ethers } from "ethers";
 import { IZkSyncHyperchainFactory } from "../typechain/IZkSyncHyperchainFactory";
 import { IZkSyncHyperchainBaseFactory } from "../typechain/IZkSyncHyperchainBaseFactory";
 
-// Some of the facets are to be removed with the upcoming upgrade.
-const UNCONDITIONALLY_REMOVED_FACETS = ["DiamondCutFacet", "GovernanceFacet"];
-
 export enum Action {
   Add = 0,
   Replace = 1,
@@ -131,10 +128,7 @@ export async function getFacetCutsForUpgrade(
   namesOfFacetsToBeRemoved?: string[]
 ) {
   const newFacetCuts = await getCurrentFacetCutsForAdd(adminAddress, gettersAddress, mailboxAddress, executorAddress);
-  namesOfFacetsToBeRemoved = namesOfFacetsToBeRemoved || [
-    ...UNCONDITIONALLY_REMOVED_FACETS,
-    ...Object.keys(newFacetCuts),
-  ];
+  namesOfFacetsToBeRemoved = namesOfFacetsToBeRemoved || [...Object.keys(newFacetCuts)];
   const oldFacetCuts = await getDeployedFacetCutsForRemove(wallet, zkSyncAddress, namesOfFacetsToBeRemoved);
   return [...oldFacetCuts, ...Object.values(newFacetCuts)];
 }