chore: update pkg

WTFAcademy · Jun 25, 2024 · 1d063b0 · 1d063b0
1 parent b53a14e
commit 1d063b0
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 36 deletions.
diff --git a/docs/solidity-102/18_Import/import.sol b/docs/solidity-102/18_Import/import.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.4;
+pragma solidity ^0.8.21;
 
 // 通过文件相对位置import
 import './Yeye.sol';
 // 通过`全局符号`导入特定的合约
 import {Yeye} from './Yeye.sol';
 // 通过网址引用
-import '@openzeppelin/contracts/utils/Address.sol';
-// 引用oppenzepplin合约
+import 'https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/Address.sol';
+// 引用OpenZeppelin合约
 import '@openzeppelin/contracts/access/Ownable.sol';
 
 contract Import {

diff --git a/docs/solidity-102/25_Create2/create2.sol b/docs/solidity-102/25_Create2/create2.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.4;
+pragma solidity ^0.8.21;
 
 contract Pair{
     address public factory; // 工厂合约地址
@@ -19,37 +19,37 @@ contract Pair{
 }
 
 contract PairFactory2{
-        mapping(address => mapping(address => address)) public getPair; // 通过两个代币地址查Pair地址
-        address[] public allPairs; // 保存所有Pair地址
+    mapping(address => mapping(address => address)) public getPair; // 通过两个代币地址查Pair地址
+    address[] public allPairs; // 保存所有Pair地址
 
-        function createPair2(address tokenA, address tokenB) external returns (address pairAddr) {
-            require(tokenA != tokenB, 'IDENTICAL_ADDRESSES'); //避免tokenA和tokenB相同产生的冲突
-            // 计算用tokenA和tokenB地址计算salt
-            (address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA); //将tokenA和tokenB按大小排序
-            bytes32 salt = keccak256(abi.encodePacked(token0, token1));
-            // 用create2部署新合约
-            Pair pair = new Pair{salt: salt}(); 
-            // 调用新合约的initialize方法
-            pair.initialize(tokenA, tokenB);
-            // 更新地址map
-            pairAddr = address(pair);
-            allPairs.push(pairAddr);
-            getPair[tokenA][tokenB] = pairAddr;
-            getPair[tokenB][tokenA] = pairAddr;
-        }
+    function createPair2(address tokenA, address tokenB) external returns (address pairAddr) {
+        require(tokenA != tokenB, 'IDENTICAL_ADDRESSES'); //避免tokenA和tokenB相同产生的冲突
+        // 计算用tokenA和tokenB地址计算salt
+        (address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA); //将tokenA和tokenB按大小排序
+        bytes32 salt = keccak256(abi.encodePacked(token0, token1));
+        // 用create2部署新合约
+        Pair pair = new Pair{salt: salt}(); 
+        // 调用新合约的initialize方法
+        pair.initialize(tokenA, tokenB);
+        // 更新地址map
+        pairAddr = address(pair);
+        allPairs.push(pairAddr);
+        getPair[tokenA][tokenB] = pairAddr;
+        getPair[tokenB][tokenA] = pairAddr;
+    }
 
-        // 提前计算pair合约地址
-        function calculateAddr(address tokenA, address tokenB) public view returns(address predictedAddress){
-            require(tokenA != tokenB, 'IDENTICAL_ADDRESSES'); //避免tokenA和tokenB相同产生的冲突
-            // 计算用tokenA和tokenB地址计算salt
-            (address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA); //将tokenA和tokenB按大小排序
-            bytes32 salt = keccak256(abi.encodePacked(token0, token1));
-            // 计算合约地址方法 hash()
-            predictedAddress = address(uint160(uint(keccak256(abi.encodePacked(
-                bytes1(0xff),
-                address(this),
-                salt,
-                keccak256(type(Pair).creationCode)
-            )))));
-        }
+    // 提前计算pair合约地址
+    function calculateAddr(address tokenA, address tokenB) public view returns(address predictedAddress){
+        require(tokenA != tokenB, 'IDENTICAL_ADDRESSES'); //避免tokenA和tokenB相同产生的冲突
+        // 计算用tokenA和tokenB地址计算salt
+        (address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA); //将tokenA和tokenB按大小排序
+        bytes32 salt = keccak256(abi.encodePacked(token0, token1));
+        // 计算合约地址方法 hash()
+        predictedAddress = address(uint160(uint(keccak256(abi.encodePacked(
+            bytes1(0xff),
+            address(this),
+            salt,
+            keccak256(type(Pair).creationCode)
+        )))));
+    }
 }
diff --git a/package.json b/package.json
@@ -65,6 +65,7 @@
     "monaco-markdown": "^0.0.12",
     "monaco-themes": "^0.4.4",
     "prism-react-renderer": "^1.3.5",
+    "querystring": "^0.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-hook-form": "^7.45.1",
@@ -74,7 +75,6 @@
     "react-photo-view": "^1.2.3",
     "react-query": "^3.39.3",
     "react-syntax-highlighter": "^15.5.0",
-    "react-wrap-balancer": "^1.1.0",
     "react-wrap-balancer": "^1.0.0",
     "rehype-katex": "^5.0.0",
     "rehype-raw": "^7.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml