contracts-bedrock: vendor `LibSort`

package.json

@@ -31,8 +31,7 @@
       "@eth-optimism/contracts-periphery/forge-std",
       "@eth-optimism/contracts-periphery/@rari-capital/solmate",
       "forta-agent",
-      "@eth-optimism/contracts-bedrock/@safe-global/safe-contracts",
-      "@eth-optimism/contracts-bedrock/solady"
+      "@eth-optimism/contracts-bedrock/@safe-global/safe-contracts"
     ]
   },
   "private": true,

packages/contracts-bedrock/package.json

@@ -81,7 +81,6 @@
     "glob": "^7.1.6",
     "hardhat-deploy": "^0.11.4",
     "@safe-global/safe-contracts": "https://github.com/safe-global/safe-contracts.git#767ef36bba88bdbc0c9fe3708a4290cabef4c376",
-    "solady": "https://github.com/Vectorized/solady.git#507e0d84872f435d497e6d2ce10e7f484392db4f",
     "solhint": "^3.3.7",
     "solhint-plugin-prettier": "^0.0.5",
     "ts-node": "^10.9.1",

packages/contracts-bedrock/scripts/upgrades/PostSherlock.s.sol

@@ -5,7 +5,7 @@ import { console } from "forge-std/console.sol";
 import { Script } from "forge-std/Script.sol";
 import { IMulticall3 } from "forge-std/interfaces/IMulticall3.sol";
 import { GnosisSafe } from "@safe-global/safe-contracts/contracts/GnosisSafe.sol";
-import { LibSort } from "solady/utils/LibSort.sol";
+import { LibSort } from "./LibSort.sol";
 import { Enum } from "@safe-global/safe-contracts/contracts/common/Enum.sol";
 import { ProxyAdmin } from "../../contracts/universal/ProxyAdmin.sol";
 import { Constants } from "../../contracts/libraries/Constants.sol";

yarn.lock

@@ -19358,10 +19358,6 @@ socks@^2.3.3, socks@^2.6.1:
     ip "^1.1.5"
     smart-buffer "^4.1.0"
 
-"solady@https://github.com/Vectorized/solady.git#507e0d84872f435d497e6d2ce10e7f484392db4f":
-  version "0.0.85"
-  resolved "https://github.com/Vectorized/solady.git#507e0d84872f435d497e6d2ce10e7f484392db4f"
-
 solc@0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/solc/-/solc-0.7.3.tgz#04646961bd867a744f63d2b4e3c0701ffdc7d78a"