Merge pull request #753 from lungern-tech/main

AmazingAng · web-flow · commit 5d3cccfc5889 · 2024-10-19T18:47:30.000+08:00
S02选择器碰撞示例代码与solidity不一致
diff --git a/S02_SelectorClash/SelectorClash.sol b/S02_SelectorClash/SelectorClash.sol
@@ -10,8 +10,8 @@ contract SelectorClash {
         solved = true;
     }
 
-    function executeCrossChainTx(bytes memory _method, bytes memory _bytes) public returns(bool success){
-        (success, ) = address(this).call(abi.encodePacked(bytes4(keccak256(abi.encodePacked(_method, "(bytes,bytes,uint64)"))), abi.encode(_bytes)));
+    function executeCrossChainTx(bytes memory _method, bytes memory _bytes, bytes memory _bytes1, uint64 _num) public returns(bool success){
+        (success, ) = address(this).call(abi.encodePacked(bytes4(keccak256(abi.encodePacked(_method, "(bytes,bytes,uint64)"))), abi.encode(_bytes, _bytes1, _num)));
     }
 
     function secretSlector() external pure returns(bytes4){

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ contract SelectorClash {`
`10`	`10`	`solved = true;`
`11`	`11`	`}`
`12`	`12`
`13`		`- function executeCrossChainTx(bytes memory _method, bytes memory _bytes) public returns(bool success){`
`14`		`- (success, ) = address(this).call(abi.encodePacked(bytes4(keccak256(abi.encodePacked(_method, "(bytes,bytes,uint64)"))), abi.encode(_bytes)));`
	`13`	`+ function executeCrossChainTx(bytes memory _method, bytes memory _bytes, bytes memory _bytes1, uint64 _num) public returns(bool success){`
	`14`	`+ (success, ) = address(this).call(abi.encodePacked(bytes4(keccak256(abi.encodePacked(_method, "(bytes,bytes,uint64)"))), abi.encode(_bytes, _bytes1, _num)));`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`function secretSlector() external pure returns(bytes4){`