merge upstream master

irvinli · irvinli · commit 50c00bfbd034 · 2021-04-15T21:13:12.000+08:00
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 | 依赖软件 | 说明 |备注|
 | --- | --- | --- |
-| Solidity | >= 0.6.10 | 需使用0.6.10版本编译|
+| Solidity | 0.4.25 | |
 | Git | 下载需要使用Git | |
 
 ## 文档
diff --git a/contracts/base_type/ArrayDemo.sol b/contracts/base_type/ArrayDemo.sol
@@ -0,0 +1,31 @@
+pragma solidity ^0.4.25;
+import "./LibArrayForUint256Utils.sol";
+contract ArrayDemo {
+
+    uint[] private array;
+    uint[] private array1;
+    uint[] private array2;
+
+    function f1() public view {
+        array=new uint[](0);
+        // array add element 2
+        LibArrayForUint256Utils.addValue(array,2);
+        // array: {2}
+    }
+
+
+    function f2() public view {
+        array1=new uint[](2);
+        array2=new uint[](2);
+        LibArrayForUint256Utils.extend(array1,array2);
+        // array1 length 4
+    }
+
+    function f3() public view {
+        array=new uint[](2);
+        array[0]=2;
+        array[1]=2;
+        LibArrayForUint256Utils.distinct(array);
+        // array: {2}
+    }
+}
diff --git a/contracts/base_type/BasicDemo.sol b/contracts/base_type/BasicDemo.sol
@@ -0,0 +1,49 @@
+pragma solidity ^0.4.25;
+import "./LibAddress.sol";
+import "./LibConverter.sol" ;
+import "./LibSafeMathForUint256Utils.sol";
+contract BasicDemo {
+
+    function safeMathDemo() public view {
+        uint256 a =25;
+        uint256 b =20;
+        // a + b
+        uint256 c = LibSafeMathForUint256Utils.add(a,b);
+        // a - b
+        uint256 d = LibSafeMathForUint256Utils.sub(a,b);
+        // a * b
+        uint256 e = LibSafeMathForUint256Utils.mul(a,b);
+        // a/b
+        uint256 f = LibSafeMathForUint256Utils.div(a,b);
+    }
+
+    function modPower() public view {
+        uint256 a=25;
+        uint256 b=20;
+        // a % b
+        uint256 c = LibSafeMathForUint256Utils.mod(a,b);
+        // a ^ b
+        uint256 d = LibSafeMathForUint256Utils.power(a,b);
+    }
+
+    function convertDemo() public view{
+        uint256 a = 25;
+        bytes memory b = LibConverter.uintToBytes(a);
+    }
+
+    function convertDemo2() public view{
+        bytes memory a = "25";
+        int b = LibConverter.bytesToInt(a);
+    }
+
+    function addressDemo() public view{
+        address addr = 0xE0f5206BBD039e7b0592d8918820024e2a7437b9;
+        bytes memory bs=LibAddress.addressToBytes(addr);
+        bs = new bytes(20);
+        addr = LibAddress.bytesToAddress(bs);
+        addr = 0xE0f5206BBD039e7b0592d8918820024e2a7437b9;
+        string memory addrStr = LibAddress.addressToString(addr);
+        string memory str="0xE0f5206BBD039e7b0592d8918820024e2a7437b9";
+        addr = LibAddress.stringToAddress(str);
+    }
+}
diff --git a/contracts/base_type/LibAddress.sol b/contracts/base_type/LibAddress.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
  
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 library LibAddress{
     
diff --git a/contracts/base_type/LibArrayForUint256Utils.sol b/contracts/base_type/LibArrayForUint256Utils.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
  
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 import "./LibSafeMathForUint256Utils.sol";
 
@@ -94,7 +94,7 @@ library LibArrayForUint256Utils {
             array[index] = array[index + 1];
             index++;
         }
-        array.pop();
+        array.length--;
     }
     
     function removeByValue(uint256[] storage array, uint256 value) internal{
@@ -127,20 +127,21 @@ library LibArrayForUint256Utils {
         bool contains;
         uint index;
         for (uint i = 0; i < array.length; i++) {
-            bool contains = false;
-            uint256 index = 0;
-            for(uint j = i+1;j < array.length; j++){
+            contains = false;
+            index = 0;
+            uint j = i+1;
+            for(;j < array.length; j++){
                 if(array[j] == array[i]){
                     contains =true;
                     index = i;
                     break;
                 }
             }
             if (contains) {
-                for (uint j = index; j < array.length - 1; j++){
+                for (j = index; j < array.length - 1; j++){
                     array[j] = array[j + 1];
                 }
-                array.pop();
+                array.length--;
                 i--;
             }
         }
diff --git a/contracts/base_type/LibConverter.sol b/contracts/base_type/LibConverter.sol
@@ -1,4 +1,4 @@
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 library LibConverter {
     function toUint128(uint256 value) internal pure returns (uint128) {
diff --git a/contracts/base_type/LibSafeMathForUint256Utils.sol b/contracts/base_type/LibSafeMathForUint256Utils.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
  
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 library LibSafeMathForUint256Utils {
 
diff --git a/contracts/base_type/LibString.sol b/contracts/base_type/LibString.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
  
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 library LibString{
     
@@ -285,8 +285,9 @@ library LibString{
 
         uint offset = 0;
         uint splitsCount = 1;
+        int limit = -1;
         while (offset < srcBytes.length - 1) {
-            int limit = indexOf(src, separator, offset);
+            limit = indexOf(src, separator, offset);
             if (limit == -1)
                 break;
             else {
@@ -301,7 +302,7 @@ library LibString{
         splitsCount = 0;
         while (offset < srcBytes.length - 1) {
 
-            int limit = indexOf(src, separator, offset);
+            limit = indexOf(src, separator, offset);
             if (limit == - 1) {
                 limit = int(srcBytes.length);
             }
diff --git a/contracts/base_type/StringDemo.sol b/contracts/base_type/StringDemo.sol
@@ -0,0 +1,23 @@
+pragma solidity ^0.4.25;
+import "./LibString.sol";
+
+contract StringDemo {
+
+    function demo1() public{
+        string memory str = "你好";
+        uint256 lenOfChars = LibString.lenOfChars(str);
+        uint256 lenOfBytes = LibString.lenOfBytes(str);
+        require(lenOfChars == 2);
+        require(lenOfBytes == 6);
+    }
+
+    function demo2() public view returns(string memory)  {
+        string memory c = LibString.toUppercase("abcd");// Expected to be ABCD
+        return c;
+    }
+
+    function demo3() public view {
+        bool r = LibString.equal("abcd","abcd");//Expected to be true
+        require(r);
+    }
+}
diff --git a/contracts/business_template/Evidence/Authentication.sol b/contracts/business_template/Evidence/Authentication.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 contract Authentication{
     address public _owner;
diff --git a/contracts/business_template/Evidence/EvidenceController.sol b/contracts/business_template/Evidence/EvidenceController.sol
@@ -15,7 +15,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11; 
+pragma solidity ^0.4.25; 
 
 import "./RequestRepository.sol";
 import "./EvidenceRepository.sol";
diff --git a/contracts/business_template/Evidence/EvidenceRepository.sol b/contracts/business_template/Evidence/EvidenceRepository.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 import "./Authentication.sol";
 
 contract EvidenceRepository is Authentication {    
diff --git a/contracts/business_template/Evidence/RequestRepository.sol b/contracts/business_template/Evidence/RequestRepository.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 import "./Authentication.sol";
 
diff --git a/contracts/business_template/RewardPoint/Admin.sol b/contracts/business_template/RewardPoint/Admin.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 import "./BasicAuth.sol";
 import "./RewardPointController.sol";
diff --git a/contracts/business_template/RewardPoint/BasicAuth.sol b/contracts/business_template/RewardPoint/BasicAuth.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 contract BasicAuth {
     address public _owner;
diff --git a/contracts/business_template/RewardPoint/IssuerRole.sol b/contracts/business_template/RewardPoint/IssuerRole.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 import "./LibRoles.sol";
 
diff --git a/contracts/business_template/RewardPoint/LibRoles.sol b/contracts/business_template/RewardPoint/LibRoles.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 library LibRoles {
     struct Role {
diff --git a/contracts/business_template/RewardPoint/LibSafeMath.sol b/contracts/business_template/RewardPoint/LibSafeMath.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 
 library LibSafeMath {   
diff --git a/contracts/business_template/RewardPoint/RewardPointController.sol b/contracts/business_template/RewardPoint/RewardPointController.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 import "./RewardPointData.sol";
 import "./BasicAuth.sol";
diff --git a/contracts/business_template/RewardPoint/RewardPointData.sol b/contracts/business_template/RewardPoint/RewardPointData.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 import "./BasicAuth.sol";
 import "./IssuerRole.sol";
diff --git a/contracts/data_structure/AddressSetDemo.sol b/contracts/data_structure/AddressSetDemo.sol
@@ -0,0 +1,30 @@
+pragma solidity ^0.4.25;
+
+import "./LibAddressSet.sol";
+
+contract AddressSetDemo {
+    using LibAddressSet for LibAddressSet.AddressSet;
+    LibAddressSet.AddressSet private addressSet;
+
+    event Log(uint256 size);
+
+    function testAddress() public {
+        //添加元素；
+        addressSet.add(address(1));
+        // {1}
+        // 查询set容器数量
+        uint256 size = addressSet.getSize();
+        require(size == 1);
+        // 获取指定index的元素
+        address addr = addressSet.get(0);
+        require(addr == (address(1));
+        // 返回set中所有的元素
+        addressSet.getAll();
+        // {0x1}
+        // 判断元素是否存在
+        bool contains = addressSet.contains(address(1));
+        require(contains== true);
+        // 删除元素
+        addressSet.remove(address(1));
+    }
+}
diff --git a/contracts/data_structure/LibAddressSet.sol b/contracts/data_structure/LibAddressSet.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
  
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 
 library LibAddressSet {
@@ -41,8 +41,8 @@ library LibAddressSet {
         uint256 lastindexMapping = self.values.length - 1;
         address lastValue = self.values[lastindexMapping];
         self.values[toDeleteindexMapping] = lastValue;
-        self.indexMapping[lastValue] = toDeleteindexMapping + 1; 
-        self.values.pop();
+        self.indexMapping[lastValue] = toDeleteindexMapping + 1;
+        self.values.length--;
     }
 
     function getSize(AddressSet storage self) internal view returns (uint256) {
diff --git a/contracts/data_structure/LibBytesMap.sol b/contracts/data_structure/LibBytesMap.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 library LibBytesMap{
 
diff --git a/contracts/data_structure/LibDeque.sol b/contracts/data_structure/LibDeque.sol
@@ -15,7 +15,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 /**
  * Doubly ended queue
diff --git a/contracts/data_structure/LibLinkedList.sol b/contracts/data_structure/LibLinkedList.sol
@@ -14,7 +14,7 @@
  * limitations under the License.
  * */
 
-pragma solidity >=0.4.24 <0.6.11;
+pragma solidity ^0.4.25;
 
 
 library LibLinkedList {
diff --git a/contracts/data_structure/LibMaxHeapUint256.sol b/contracts/data_structure/LibMaxHeapUint256.sol
diff --git a/contracts/data_structure/LibMinHeapUint256.sol b/contracts/data_structure/LibMinHeapUint256.sol
diff --git a/contracts/data_structure/LibQueue.sol b/contracts/data_structure/LibQueue.sol
diff --git a/contracts/data_structure/LibStack.sol b/contracts/data_structure/LibStack.sol
diff --git a/contracts/data_structure/MapDemo.sol b/contracts/data_structure/MapDemo.sol
diff --git a/contracts/default/HelloWorld.sol b/contracts/default/HelloWorld.sol
diff --git a/contracts/default/KVTableTest.sol b/contracts/default/KVTableTest.sol
diff --git a/contracts/default/ShaTest.sol b/contracts/default/ShaTest.sol
diff --git a/contracts/default/TableTest.sol b/contracts/default/TableTest.sol

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`* */`
`16`	`16`
`17`		`-pragma solidity >=0.4.24 <0.6.11;`
	`17`	`+pragma solidity ^0.4.25;`
`18`	`18`
`19`	`19`	`import "./LibSafeMathForUint256Utils.sol";`
`20`	`20`
`@@ -94,7 +94,7 @@ library LibArrayForUint256Utils {`
`94`	`94`	`array[index] = array[index + 1];`
`95`	`95`	`index++;`
`96`	`96`	`}`
`97`		`- array.pop();`
	`97`	`+ array.length--;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`function removeByValue(uint256[] storage array, uint256 value) internal{`
`@@ -127,20 +127,21 @@ library LibArrayForUint256Utils {`
`127`	`127`	`bool contains;`
`128`	`128`	`uint index;`
`129`	`129`	`for (uint i = 0; i < array.length; i++) {`
`130`		`- bool contains = false;`
`131`		`- uint256 index = 0;`
`132`		`- for(uint j = i+1;j < array.length; j++){`
	`130`	`+ contains = false;`
	`131`	`+ index = 0;`
	`132`	`+ uint j = i+1;`
	`133`	`+ for(;j < array.length; j++){`
`133`	`134`	`if(array[j] == array[i]){`
`134`	`135`	`contains =true;`
`135`	`136`	`index = i;`
`136`	`137`	`break;`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`	`if (contains) {`
`140`		`- for (uint j = index; j < array.length - 1; j++){`
	`141`	`+ for (j = index; j < array.length - 1; j++){`
`141`	`142`	`array[j] = array[j + 1];`
`142`	`143`	`}`
`143`		`- array.pop();`
	`144`	`+ array.length--;`
`144`	`145`	`i--;`
`145`	`146`	`}`
`146`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pragma solidity >=0.4.24 <0.6.11;`
	`1`	`+pragma solidity ^0.4.25;`
`2`	`2`
`3`	`3`	`library LibConverter {`
`4`	`4`	`function toUint128(uint256 value) internal pure returns (uint128) {`