status-im
/
gitpivot
mirror of https://github.com/status-im/gitpivot.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed metadata support and improved contract size

This commit is contained in:
Ricardo Guilherme Schmidt 2017-05-05 06:01:25 -03:00
parent 112b36f92d
commit 20f8ad64ac
1 changed files with 8 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
contracts/src/GitHubRegisterEth.sol
View File

@ -6,24 +6,21 @@ import "lib/ethereans/management/Owned.sol";
contract GitHubRegisterEth is Owned, usingOraclize{
string private credentials = "";
string [] metadata = new string[](0);
mapping (bytes32 => UserClaim) userClaim; //temporary db for oraclize user register queries
mapping (bytes32 => uint256) indexes;
mapping (uint256 => User) users;
event RegisterUpdated(string name);
event newMetaTag(uint size, string tag);
//stores temporary data for oraclize user register request
struct UserClaim {
address sender;
string githubid;
string login;
}
struct User {
address addr;
string login;
mapping (bytes4 => string) meta;
}
function GitHubRegisterEth(){
@ -32,33 +29,21 @@ contract GitHubRegisterEth is Owned, usingOraclize{
function register(string _github_user, string _gistid) payable {
bytes32 ocid = oraclize_query("nested", _getQuery(_github_user, _gistid));
userClaim[ocid] = UserClaim({sender: msg.sender, githubid: _github_user});
userClaim[ocid] = UserClaim({sender: msg.sender, login: _github_user});
}
function getAddr(uint256 _id) public constant returns(address addr) {
return users[_id].addr;
}
function getMeta(uint256 _id, string key) public constant returns(string data){
return users[_id].meta[bytes4(sha3(key))];
}
function getName(address _addr) public constant returns(string name){
function getName(address _addr) public constant returns(string name){
return users[indexes[sha3(_addr)]].login;
}
function getMeta(address _addr, string key) public constant returns(string data){
return users[indexes[sha3(_addr)]].meta[bytes4(sha3(key))];
}
function getAddr(string _name) public constant returns(address addr) {
return users[indexes[sha3(_name)]].addr;
}
function getMeta(string _name, string key) public constant returns(string data){
return users[indexes[sha3(_name)]].meta[bytes4(sha3(key))];
}
event OracleEvent(bytes32 myid, string result, bytes proof);
//oraclize response callback
@ -80,7 +65,7 @@ contract GitHubRegisterEth is Owned, usingOraclize{
(addrLoaded,pos) = getNextAddr(v,pos);
(login,pos) = getNextString(v,pos);
(userId,pos) = getNextUInt(v,pos);
if(userClaim[myid].sender == addrLoaded && sha3(userClaim[myid].githubid) == sha3(login)){
if(userClaim[myid].sender == addrLoaded && sha3(userClaim[myid].login) == sha3(login)){
RegisterUpdated(login);
if(users[userId].addr != 0x0){
delete indexes[sha3(users[userId].login)];
@ -90,62 +75,23 @@ contract GitHubRegisterEth is Owned, usingOraclize{
indexes[sha3(login)] = userId;
users[userId].addr = addrLoaded;
users[userId].login = login;
for (uint i = 0; i < metadata.length; i++){
(users[userId].meta[bytes4(sha3(metadata[i]))],pos) = getNextString(v,pos);
}
}
delete userClaim[myid]; //should always be deleted
}
//owner management
function setAPICredentials(string _client_id, string _client_secret) only_owner {
credentials = concat(concat(concat("?client_id=",_client_id),"&client_secret="),_client_secret);
credentials = strConcat("?client_id=",_client_id,"&client_secret=",_client_secret,"");
}
function clearAPICredentials() only_owner {
credentials = "";
}
function addMetaTag(string tag) only_owner{
metadata.length++;
metadata[metadata.length-1] = tag;
newMetaTag(metadata.length-1,tag);
}
function resetMetaTags() only_owner{
metadata.length = 0;
}
//internal helper functions
function _getQuery(string _github_user, string _gistid) internal constant returns (string){
string memory a = concat(concat(concat("[identity] ${[URL] https://gist.githubusercontent.com/", _github_user),"/"),_gistid);
a = concat(concat(concat(a, "/raw/}, ${[URL] json(https://api.github.com/gists/"),_gistid),credentials);
a = concat(a, ").owner.[login,id]}");
if(metadata.length > 0){
a = concat(concat(concat(a, ", ${[URL] json(https://api.github.com/users/"),_github_user),credentials);
a = concat(a, ").[");
uint ml = metadata.length;
for (uint i = 0; i < ml; i++){
a = concat(a, metadata[i]);
if (i < ml-1) a = concat(a, ",");
}
a = concat(a, "]}");
}
return a;
}
function concat(string _a, string _b) internal constant returns (string) {
bytes memory _ba = bytes(_a);
bytes memory _bb = bytes(_b);
uint _balength = _ba.length;
uint _bblength = _bb.length;
string memory ab = new string(_balength + _bblength);
bytes memory bab = bytes(ab);
uint k = 0;
for (uint i = 0; i < _balength; i++) bab[k++] = _ba[i];
for (i = 0; i < _bblength; i++) bab[k++] = _bb[i];
return string(bab);
string memory a = strConcat("[identity] ${[URL] https://gist.githubusercontent.com/", _github_user,"/",_gistid,"/raw/registereth.txt}, ${[URL] json(https://api.github.com/gists/");
return strConcat(a, _gistid, credentials, ").owner.[login,id]}","");
}
function getNextString(bytes _str, uint8 _pos) internal constant returns (string,uint8) {
@ -211,4 +157,4 @@ contract GitHubRegisterEth is Owned, usingOraclize{
return val - (val < 58 ? 48 : (val < 97 ? 55 : 87));
}
}
}