build: install deps via NPM expect for v2-core

feat: add BaseScript chore: update remappings chore: update imports
sablier-labs · Dec 7, 2023 · 93edc66 · 93edc66
1 parent 1a4f833
commit 93edc66
Show file tree

Hide file tree

Showing 26 changed files with 337 additions and 54 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,20 +1,3 @@
-[submodule "lib/forge-std"]
-  branch = "v1"
-  path = "lib/forge-std"
-  url = "https://github.com/foundry-rs/forge-std"
-[submodule "lib/openzeppelin-contracts"]
-  branch = "release-v4.9"
-  path = "lib/openzeppelin-contracts"
-  url = "https://github.com/OpenZeppelin/openzeppelin-contracts"
-[submodule "lib/prb-test"]
-  branch = "release-v0"
-  path = "lib/prb-test"
-  url = "https://github.com/PaulRBerg/prb-test"
-[submodule "lib/solady"]
-  branch = "main"
-  path = "lib/solady"
-  url = "https://github.com/Vectorized/solady"
 [submodule "lib/v2-core"]
-  branch = "main"
   path = "lib/v2-core"
   url = "https://github.com/sablier-labs/v2-core"
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/prb-test b/lib/prb-test
diff --git a/lib/solady b/lib/solady
diff --git a/lib/v2-core b/lib/v2-core
diff --git a/package.json b/package.json
@@ -11,11 +11,15 @@
   },
   "dependencies": {
     "@openzeppelin/contracts": "4.9.2",
+    "@prb/math": "4.0.2",
     "@sablier/v2-core": "1.0.2"
   },
   "devDependencies": {
+    "@prb/test": "0.6.4",
+    "forge-std": "github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e",
     "prettier": "^2.8.8",
-    "solhint": "^3.6.2"
+    "solady": "0.0.129",
+    "solhint": "^4.0.0"
   },
   "files": [
     "artifacts",
+289 −289		.gas-snapshot
+74 −13		.github/workflows/ci-deep.yml
+132 −17		.github/workflows/ci.yml
+1 −1		.github/workflows/deploy-comptroller.yml
+1 −1		.github/workflows/deploy-core.yml
+1 −1		.github/workflows/deploy-lockup-dynamic.yml
+1 −1		.github/workflows/deploy-lockup-linear.yml
+1 −1		.github/workflows/deploy-nft-descriptor.yml
+0 −24		.gitmodules
+5 −4		CHANGELOG.md
+28 −15		README.md
+2 −1		SECURITY.md
+0 −2		foundry.toml
+0 −1		lib/forge-std
+0 −1		lib/openzeppelin-contracts
+0 −1		lib/prb-math
+0 −1		lib/prb-test
+0 −1		lib/solady
+0 −1		lib/solarray
+16 −6		package.json
+345 −80		pnpm-lock.yaml
+6 −6		remappings.txt
+1 −1		script/Base.s.sol
+5 −9		script/DeployDeterministicCore.s.sol
+4 −8		script/DeployDeterministicCore2.s.sol
+1 −4		script/DeployDeterministicLockupDynamic.s.sol
+1 −3		script/DeployDeterministicLockupLinear.s.sol
+2 −6		script/DeployLockupDynamic.s.sol
+3 −2		script/Init.s.sol
+7 −7		slither.config.json
+6 −3		src/SablierV2LockupDynamic.sol
+6 −3		src/SablierV2LockupLinear.sol
+5 −5		src/abstracts/SablierV2Lockup.sol
+6 −7		src/interfaces/ISablierV2Lockup.sol
+1 −1		src/libraries/Errors.sol
+0 −12		src/types/Math.sol
+0 −11		src/types/Tokens.sol
+5 −54		test/Base.t.sol
+1 −1		test/fork/LockupDynamic.t.sol
+1 −1		test/fork/LockupLinear.t.sol
+1 −1		test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol
+4 −4		test/integration/concrete/lockup-dynamic/token-uri/tokenURI.t.sol
+4 −4		test/integration/concrete/lockup-linear/token-uri/tokenURI.t.sol
+1 −1		test/integration/concrete/lockup/cancel-multiple/cancelMultiple.t.sol
+1 −1		test/integration/concrete/lockup/is-transferable/isTransferable.t.sol
+1 −1		test/integration/concrete/lockup/transfer-from/transferFrom.t.sol
+1 −1		test/integration/concrete/lockup/withdraw-max-and-transfer/withdrawMaxAndTransfer.t.sol
+1 −1		test/integration/concrete/lockup/withdraw-multiple/withdrawMultiple.t.sol
+4 −2		test/integration/concrete/nft-descriptor/safe-asset-symbol/safeAssetSymbol.t.sol
+1 −1		test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol
+1 −1		test/integration/fuzz/lockup/cancelMultiple.t.sol
+1 −1		test/integration/fuzz/lockup/withdrawMultiple.t.sol
+1 −1		test/invariant/Invariant.t.sol
+2 −2		test/invariant/handlers/BaseHandler.sol
+1 −1		test/unit/concrete/comptroller/Comptroller.t.sol
+1 −1		test/unit/concrete/nft-descriptor/hourglass.t.sol
+2 −2		test/utils/Assertions.sol
+77 −0		test/utils/DeployOptimized.sol
+2 −2		test/utils/Precompiles.sol
+22 −17		test/utils/Precompiles.t.sol
+3 −3		test/utils/Utils.sol