update lib

6boris · Oct 16, 2023 · 8977264 · 8977264
1 parent 2d20a9d
commit 8977264
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 79 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -100,3 +100,9 @@
 [submodule "foundry/lib/@openzeppelin/contracts-v4.7.3"]
 	path = foundry/lib/@openzeppelin/contracts-v4.7.3
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "foundry/lib/@solady"]
+	path = foundry/lib/@solady
+	url = https://github.com/Vectorized/solady
+[submodule "foundry/lib/@solmate"]
+	path = foundry/lib/@solmate
+	url = https://github.com/transmissions11/solmate
diff --git a/README.md b/README.md
@@ -17,84 +17,9 @@ yarn
 安装指定版本
 
 ```bash
-
 git submodule update --init --recursive
 
-# OR
-forge install foundry-rs/forge-std@v1.7.1 --no-commit
-forge install transmissions11/solmate@0384dbaaa4fcb5715738a9254a7c0a4cb62cf458 --no-commit
-forge install vectorized/solady@v0.0.124 --no-commit
-
-forge install Uniswap/v2-periphery --no-commit
-forge install Uniswap/v2-core --no-commit
-
-forge install Uniswap/v3-periphery --no-commit
-forge install Uniswap/v3-core --no-commit
-
-forge install Uniswap/v4-periphery --no-commit
-forge install Uniswap/v4-core --no-commit
-
-forge install OpenZeppelin/openzeppelin-contracts@v5.0.0 --no-commit
-forge install OpenZeppelin/openzeppelin-contracts-upgradeable@v5.0.0 --no-commit
-
-# OpenZeppelin v4
-v4.7.1
-
-git clone https://github.com/OpenZeppelin/openzeppelin-contracts foundry/lib/openzeppelin-contracts-v4.7.1 && cd foundry/lib/openzeppelin-contracts-v4.7.1 && git checkout tags/v4.7.1
-
-git clone https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable foundry/lib/openzeppelin-contracts-upgradeable-v4.7.1  && cd foundry/lib/openzeppelin-contracts-upgradeable-v4.7.1 && git checkout tags/v4.7.1
-
-git rm --cached foundry/lib/openzeppelin-contracts-v4.7.1
-
-git submodule add https://github.com/OpenZeppelin/openzeppelin-contracts foundry/lib/openzeppelin-contracts-v4.7.1
-
-git submodule add https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable foundry/lib/openzeppelin-contracts-upgradeable-v4.7.1
-
-git submodule add https://github.com/safe-global/safe-contracts foundry/lib/safe-contracts-v1.3.0
-
-
-
-git submodule add https://github.com/foundry-rs/forge-std foundry/lib/@dev/forge-std
-git submodule add https://github.com/PaulRBerg/prb-test foundry/lib/@dev/prb-test
-git submodule add https://github.com/dapphub/ds-test foundry/lib/@dev/ds-test
-
-
-git submodule add https://github.com/Uniswap/v2-core foundry/lib/@uniswap/v2-core
-git submodule add https://github.com/Uniswap/v2-periphery foundry/lib/@uniswap/v2-periphery
-
-git submodule add https://github.com/Uniswap/v3-core foundry/lib/@uniswap/v3-core
-git submodule add https://github.com/Uniswap/v3-periphery foundry/lib/@uniswap/v3-periphery
-
-git submodule add https://github.com/Uniswap/v4-core foundry/lib/@uniswap/v4-core
-git submodule add https://github.com/Uniswap/v4-periphery foundry/lib/@uniswap/v4-periphery
-
-git submodule add https://github.com/safe-global/safe-contracts foundry/lib/@gnosis.pm/safe-contracts
-git submodule add https://github.com/safe-global/safe-contracts foundry/lib/@gnosis.pm/safe-contracts-v1.3.0
-# cd foundry/lib/@gnosis.pm/safe-contracts-v1.3.0 && git checkout tags/v1.3.0
-
-git submodule add https://github.com/OpenZeppelin/openzeppelin-contracts foundry/lib/@openzeppelin/contracts
-git submodule add https://github.com/OpenZeppelin/openzeppelin-contracts foundry/lib/@openzeppelin/contracts-v4.7.1
-# cd foundry/lib/@openzeppelin/contracts-v4.7.1 && git checkout tags/v4.7.1
-git submodule add https://github.com/OpenZeppelin/openzeppelin-contracts foundry/lib/@openzeppelin/contracts-v4.7.3
-# cd foundry/lib/@openzeppelin/contracts-v4.7.3 && git checkout tags/v4.7.3
-
-
-git submodule add https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable foundry/lib/@openzeppelin/contracts-upgradeable
-git submodule add https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable foundry/lib/@openzeppelin/contracts-upgradeable-v4.7.1
-# cd foundry/lib/@openzeppelin/contracts-upgradeable-v4.7.1 && git checkout tags/v4.7.1
-
-git submodule add https://github.com/transmissions11/solmate
-
-
-
-rm -rf .git/modules/foundry/lib/@dev/ds-test
-git submodule deinit -f foundry/lib/@dev/ds-test
-git rm --cached -r foundry/lib/@dev/ds-test
-rm -rf foundry/lib/@dev/ds-test
-
-
-forge install safe-global/safe-contracts --no-commit
-
+forge install
 ```
 
 ```bash

diff --git a/contracts/CTF/ONLYPWNER/11.DIVERSION/token/MintableERC20.sol b/contracts/CTF/ONLYPWNER/11.DIVERSION/token/MintableERC20.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { ERC20 } from "openzeppelin-contracts/contracts/token/ERC20/ERC20.sol";
+import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract MintableERC20 is ERC20 {
     address public owner;

diff --git a/foundry/lib/@dev/forge-std b/foundry/lib/@dev/forge-std
diff --git a/foundry/lib/@dev/prb-test b/foundry/lib/@dev/prb-test
diff --git a/foundry/lib/@gnosis.pm/safe-contracts b/foundry/lib/@gnosis.pm/safe-contracts
diff --git a/foundry/lib/@gnosis.pm/safe-contracts-v1.3.0 b/foundry/lib/@gnosis.pm/safe-contracts-v1.3.0
diff --git a/foundry/lib/@openzeppelin/contracts b/foundry/lib/@openzeppelin/contracts
diff --git a/foundry/lib/@openzeppelin/contracts-upgradeable b/foundry/lib/@openzeppelin/contracts-upgradeable
diff --git a/foundry/lib/@openzeppelin/contracts-upgradeable-v4.7.1 b/foundry/lib/@openzeppelin/contracts-upgradeable-v4.7.1
diff --git a/foundry/lib/@openzeppelin/contracts-v4.7.1 b/foundry/lib/@openzeppelin/contracts-v4.7.1
diff --git a/foundry/lib/@openzeppelin/contracts-v4.7.3 b/foundry/lib/@openzeppelin/contracts-v4.7.3
diff --git a/foundry/lib/@uniswap/v2-core b/foundry/lib/@uniswap/v2-core
diff --git a/foundry/lib/@uniswap/v2-periphery b/foundry/lib/@uniswap/v2-periphery
diff --git a/foundry/lib/@uniswap/v3-core b/foundry/lib/@uniswap/v3-core
diff --git a/foundry/lib/@uniswap/v3-periphery b/foundry/lib/@uniswap/v3-periphery
diff --git a/foundry/lib/@uniswap/v4-core b/foundry/lib/@uniswap/v4-core
diff --git a/foundry/lib/@uniswap/v4-periphery b/foundry/lib/@uniswap/v4-periphery
diff --git a/foundry/lib/solady b/foundry/lib/solady
diff --git a/foundry/lib/solmate b/foundry/lib/solmate
diff --git a/foundry/test/CTF/Damn-Vulnerable-DeFi/10.Free-Rider.t.sol b/foundry/test/CTF/Damn-Vulnerable-DeFi/10.Free-Rider.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import { PRBTest } from "@dev/prb-test/src/PRBTest.sol";
+import { PRBTest } from "@prb/test/PRBTest.sol";
 import { DamnValuableNFT } from "@contracts/CTF/Damn-Vulnerable-DeFi/00.Base/DamnValuableNFT.sol";
 import { DamnValuableToken } from "@contracts/CTF/Damn-Vulnerable-DeFi/00.Base/DamnValuableToken.sol";
 import {

diff --git a/remappings.txt b/remappings.txt
@@ -2,7 +2,7 @@
 
 @solmate=foundry/lib/solmate/src
 @solady=foundry/lib/solady/src
-@prb/test=foundry/lib/prb-test/src
+@prb/test=foundry/lib/@dev/prb-test/src
 
 @gnosis.pm/safe-contracts=foundry/lib/@gnosis.pm/safe-contracts/contracts
 @gnosis.pm/safe-contracts-v1.3.0=foundry/lib/@gnosis.pm/safe-contracts-v1.3.0/contracts