DevSecretBallot (#86)

* longjj2016 (#78) 1.修改之前问题，改为以下方法 10进制ascii转字符串 16进制ascii转字符串 2.文档描述更新 * 添加剪刀石头布的合约玩法 (#79) * add solidity file * add tutorial * add basic solidity tutorials * add assets * divergence * add divergence game * 增加func_call_contract.sol 及doc (#80) * Base64编解码库 (#81) * Counter: SimpleCounter; MultiSigCounter (#82) * 32 医疗卫生合约通用模版 (#84) * #32 医疗卫生合约模版 * 完善#32 医疗合约模版 * Solidity开发教程进阶版 (#85) * add solidity file * add tutorial * add basic solidity tutorials * add assets * divergence * add divergence game * advance solidity tutorial init * solidity tutorial advance Co-authored-by: longJJ2016 <1017303686@qq.com> Co-authored-by: 高野 <yekai1003@163.com> Co-authored-by: itherunder <61953384+itherunder@users.noreply.github.com> Co-authored-by: Kesling <43846775+Kesling515@users.noreply.github.com> Co-authored-by: kimroniny <1301862177@qq.com> Co-authored-by: Ferwoo <wufeiphil@163.com>

Author: 7 people

contracts/base_type/LibAscii.sol

@@ -6,70 +6,76 @@ pragma solidity ^0.4.25;
 library LibAscii{
 
  /**
- * 字符串转ascii字符串
+ * 单个10进制ascii字符串转字符串
+ * 例："55" 得出 "U"
+ * "109" 得出 "m"
+ **/
+ function decAscii2str(string data) internal pure returns (string){
+ uint _data = decStrToUint(data);
+ require(_data < 128, "data must be 0 ~ 127");
+ bytes memory result = new bytes(1);
+ result[0] = byte(_data);
+ return string(result);
+ }
+
+ /**
+ * 单个16进制ascii字符串转字符串
  *
  * @ param data 原字符串(大小写均可)
- * @ param radix 原字符串进制 仅支持10，16进制
  *
- * 例："55,16" 得出 "U" 16进制
- * "55,10" 得出 "7" 10进制
+ * 例："55" 得出 "U"
+ * "6D" 得出 "Z"
  **/
- function str2ascii(string data, uint radix) internal pure returns (string){
- require(radix == 10 || radix == 16, "radix must only 10 or 16");
-
- bytes memory _data = bytes(data);
-
- require(_data.length % 2 == 0, "data length must be even");
-
- uint[] memory temp = new uint[](_data.length);
-
- for(uint i = 0; i < _data.length; i++) {
- uint _d = uint(_data[i]);
-
- require(check(_d,radix), "data can only contain 0-9,a-f,A-F");//校验字符内容
-
- if (_d > 96) {//a-f 97-102
- temp[i] = _d - 97 + 10;
- } else if (_d > 64) {//A-F 65-70
- temp[i] = _d - 65 + 10;
- } else {//0-9 48-57
- temp[i] = _d - 48;
- }
- }
-
- bytes memory result = new bytes(temp.length / 2);
- for(uint _i = 0; _i < temp.length; _i += 2) {
- result[_i / 2] = byte(temp[_i] * radix + temp[_i + 1]);
- }
-
- return string(result);
+ function hexAscii2str(string data) internal pure returns(string){
+ uint _data = hexStrToUint(data);
+ require(_data < 128, "data must be 0x00 ~ 0x7F");
+ return decAscii2str(uint2str(_data));
  }
 
  /**
- * ascii字符串转10进制字符串
+ * 字符串转ascii字符串
  * 例："aa" 得出9797 10进制
  **/
- function ascii2str(string ascii) internal pure returns(string){
- bytes memory temp = bytes(ascii);
- string memory resultStr = "";
+ function str2ascii(string data) internal pure returns(string){
+ bytes memory temp = bytes(data);
+ bytes memory resultStr = "";
  for(uint i = 0; i<temp.length; i++){
  uint _t = uint(temp[i]);
- resultStr = concat(resultStr,uint2str(_t));
+ resultStr=abi.encodePacked(resultStr,uint2str(_t));
  }
- return resultStr;
+ return string(resultStr);
  }
 
  //-----------HELPER METHOD--------------//
-
- //校验字符内容
- function check(uint _d, uint radix) internal pure returns(bool){
- if( radix == 10){//10进制 只有数字，范围48~57
- return _d > 47 && _d<58;
- }else if( radix == 16){ //16进制 除数字外，字母范围 A~F：64~70、a~f：97~102
- return (_d>47 && _d<58) || (_d>64 && _d<71) || (_d>96 && _d<103);
- }else{
- return false;
+ 
+ //10字符串转int
+ function decStrToUint(string data) internal pure returns (uint){
+ bytes memory temp = bytes(data);
+ uint result=0;
+ for(uint i = temp.length; i>0; i--){
+ uint _t = uint(temp[i-1]);//ascii码的十进制
+ result+=(_t-48)*(10**(temp.length-i));
  }
+ return result;
+ }
+ 
+ //字符串转int
+ function hexStrToUint(string data) internal pure returns (uint){
+ bytes memory temp = bytes(data);
+ uint result=0;
+ for(uint i = temp.length; i>0; i--){
+ uint _t = uint(temp[i-1]);//ascii码的十进制
+ uint _t1=0;
+ if (_t > 96) {//a-f 97-102
+ _t1 = _t - 97 + 10;
+ } else if (_t > 64) {//A-F 65-70
+ _t1 = _t - 65 + 10;
+ } else {//0-9 48-57
+ _t1 = _t - 48;
+ }
+ result+=_t1*(16**(temp.length-i));
+ }
+ return result;
  }
 
  //数字转字符串
@@ -89,15 +95,4 @@ library LibAscii{
  }
  return string(result);
  }
-
- //字符串拼接
- function concat(string _a, string _b) internal pure returns (string){
- bytes memory _ba = bytes(_a);
- bytes memory _bb = bytes(_b);
- bytes memory result = new bytes(_ba.length + _bb.length);
- uint k = 0;
- for (uint i = 0; i < _ba.length; i++) result[k++] = _ba[i];
- for (i = 0; i < _bb.length; i++) result[k++] = _bb[i];
- return string(result);
- }
-}
+} 

contracts/base_type/LibAsciiDemo.sol

@@ -4,17 +4,25 @@ import "./LibAscii.sol";
 
 contract LibAsciiDemo{
 
- function str2ascii() public view returns(string,string){
- string memory result= LibAscii.str2ascii("55",10);
+ function ascii2str() public pure returns(string,string,string,string){
+ //10进制ascii转字符串
+ string memory result= LibAscii.decAscii2str("55");
  //result："7"
- string memory result1= LibAscii.str2ascii("55",16);
- //result1："U"
- return (result,result1);
+ string memory result1= LibAscii.decAscii2str("109");
+ //result："m"
+
+ //16进制ascii转字符串
+ string memory result2= LibAscii.hexAscii2str("37");
+ //result1："7"
+ string memory result3= LibAscii.hexAscii2str("6D");
+ //result1："m"
+
+ return (result,result1,result2,result3);
  }
 
- function ascii2str() public view returns(string){
- string memory result=LibAscii.ascii2str("Aa");
- //result："6597"
+ function str2ascii() public pure returns(string){
+ string memory result=LibAscii.str2ascii("Zz");
+ //result："90122"
  return result;
  }
 }

contracts/business_template/divergence/Divergence.sol

@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity^0.6.10;
+import "./LibGameCompare.sol";
+import "./IDivergence.sol";
+
+// 玩家信息
+struct Player {
+ address addr;
+ string name; 
+ uint8 opt; // 出手选项 0 - 剪刀，1 - 石头，2 - 布
+ bytes32 hash; 
+ uint256 round; // 出手轮次
+ uint8 status; // 状态：0 - 未出手；1 - 已经出手；2 - 已提交证明
+}
+
+
+// 合约实现
+contract Divergence is IDivergence {
+
+ // 控制玩家数量=2 
+ uint8 userCount;
+ // 记录玩家信息
+ Player[2] playerlist;
+ // 游戏是否结束
+ bool isFinished; // 默认值 false
+ // 记录胜利玩家
+ uint8 winnerIndex;
+ // 出手内容定义
+ string[3] gameOpts = ["scissors", "rock", "paper"];
+
+ // 出手event
+ event Punch(address indexed addr, bytes32 hash);
+ // 提出证明
+ event Proof(address indexed addr, uint8 opt, string salt);
+ // 胜出通知
+ event WinnerBorn(address indexed winner, string name, uint8 opt, uint256 round);
+
+ // 注册
+ function register(string memory _name) override external {
+ require(userCount < 2, "two player already go");
+ playerlist[userCount].addr = msg.sender;
+ playerlist[userCount].name = _name;
+ userCount ++;
+ if(userCount == 2) {
+ require(playerlist[0].addr != playerlist[1].addr, "You can not play this game with yourself");
+ }
+ }
+ // 出手 先出手不用关心对方出什么，后出手的需要判断对方是什么，决定游戏是否结束
+ function punch(bytes32 _hash) override external {
+ // 1. 玩家身份
+ require(isPlayer(msg.sender), "only register player can do");
+ // 2. 游戏没有结束 
+ require(!isFinished, "game already finished");
+ // 3. 两个玩家具备了再开始
+ require(userCount == 2, "please wait a rival");
+ 
+ (uint8 host, uint8 rival) = getIndex(msg.sender);
+
+ Player storage player = playerlist[host];
+ // 判断对方是否出手
+ require(player.round <= playerlist[rival].round, "please wait");
+ // 4. 玩家尚未出手 
+ require(player.status == 0, "player already throw a punch");
+ player.hash = _hash;
+ player.round ++;
+ player.status = 1;
+ 
+ emit Punch(msg.sender, _hash);
+ 
+ }
+ // 证明
+ function proofing(string memory _salt, uint8 _opt) override external {
+ // 1. 游戏没有结束 
+ require(!isFinished, "game already finished");
+ bytes32 hash = keccak256(abi.encode(_salt, _opt));
+ // 区分玩家1 和 玩家2 
+ (uint8 host, uint8 rival) = getIndex(msg.sender);
+ Player storage player = playerlist[host];
+ require(player.round == playerlist[rival].round, "It may not safe to commit proof");
+ require(player.status == 1, "user can not commit proof at current status");
+ player.status = 2;
+ if(_opt > 2 || hash != player.hash) {
+ // 直接判负
+ isFinished = true;
+ winnerIndex = rival;
+ // 触发事件
+ emit WinnerBorn(playerlist[winnerIndex].addr, playerlist[winnerIndex].name, playerlist[winnerIndex].opt, playerlist[winnerIndex].round);
+ return;
+ }
+ emit Proof(msg.sender, _opt, _salt);
+ player.opt = _opt;
+ if(player.status == 2 && playerlist[rival].status == 2) {
+ // 处理胜负逻辑
+ uint8 win = LibGameCompare.max(player.opt, playerlist[rival].opt);
+ if(win == 1) {
+ isFinished = true;
+ winnerIndex = host;
+ } else if(win == 2) {
+ isFinished = true;
+ winnerIndex = rival;
+ } else {
+ playerlist[rival].status = 0;
+ player.status = 0;
+ }
+ if(isFinished) {
+ // 触发事件
+ emit WinnerBorn(playerlist[winnerIndex].addr, playerlist[winnerIndex].name, playerlist[winnerIndex].opt, playerlist[winnerIndex].round);
+ }
+ 
+ }
+ 
+ }
+ // 查看获胜
+ // 返回值： 1. 昵称 2. 玩家1出手 3. 玩家2出手 4. 轮次
+ function winner() override external view returns (string memory, string memory, string memory, uint256) {
+ if(!isFinished) {
+ return ("none", "none", "none", 88888);
+ }
+
+ uint8 rival = 0; // 表示输的一方下标
+ if(winnerIndex == 0) rival = 1;
+
+ return (
+ playerlist[winnerIndex].name, 
+ gameOpts[playerlist[winnerIndex].opt],
+ gameOpts[playerlist[rival].opt],
+ playerlist[winnerIndex].round
+ );
+ }
+
+ // 判断是否是注册玩家
+ function isPlayer(address _addr) public view returns (bool) {
+ if(_addr == playerlist[0].addr || _addr == playerlist[1].addr) return true;
+ return false;
+ }
+ //yekai 123 2 0xe4c1209281b0ee06c09e03055af06926da954ba2697a9798e20ae11ed9bb531e
+ //fuhongxue 123 1 0x5610d70754a691266ad97a972c2306bd75073fa9756a5cfeada56b6ab4aefd0e
+ function helper(string memory _salt, uint8 _opt) public view returns (bytes32) {
+ return keccak256(abi.encode(_salt, _opt));
+ }
+ 
+ // 区分本人和对手的序号
+ function getIndex(address _addr) internal view returns (uint8, uint8) {
+ // 区分玩家1 和 玩家2 
+ uint8 host; // 代表本人
+ uint8 rival; // 代表对方
+ if(playerlist[0].addr == _addr) {
+ host = 0;
+ rival = 1;
+ } else {
+ host = 1;
+ rival = 0;
+ }
+ 
+ return (host, rival);
+ }
+ 
+ // 重新开始游戏
+ function reset() external {
+ require(isFinished, "game is running");
+ isFinished = false;
+ playerlist[0].status = 0;
+ playerlist[0].round = 0;
+ playerlist[1].status = 0;
+ playerlist[1].round = 0;
+ }
+}

contracts/business_template/divergence/IDivergence.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity^0.6.10;
+
+// 定义接口
+interface IDivergence {
+ // 注册
+ function register(string memory _name) external;
+ // 出手
+ function punch(bytes32 _hash) external;
+ // 证明
+ function proofing(string memory _salt, uint8 _opt) external;
+ // 查看获胜
+ // 返回值： 1. 昵称 2. 玩家1出手 3. 玩家2出手 4. 轮次
+ function winner() external view returns (string memory, string memory, string memory, uint256);
+}

contracts/business_template/divergence/LibGameCompare.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: UNLICENSED
+
+// 定义library 计算获胜方
+library LibGameCompare {
+ // 玩家1 & 玩家2 
+ // 返回值: 0 - 相等 ; 1 - 大于 ; 2 - 小于
+ function max(uint8 a, uint8 b) internal pure returns (uint8) {
+ require(a <= 2);
+ require(b <= 2);
+ if(a == b) {
+ return 0;
+ } else if(a > b) {
+ // 1 ,0 ; 2,1; 2, 0
+ return a - b;
+
+ } else {
+ if(b - a == 2) return 1;
+ if(b - a == 1) return 2;
+ }
+
+ return 0;
+ }
+}