Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev branches #3

Merged
merged 3 commits into from
Feb 20, 2017
Merged

Merge dev branches #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75500dd
multiple args + cb addresses feature
D-Nice Feb 20, 2017
deb94b3
Merge branch 'dev' into dev1
D-Nice Feb 20, 2017
84dbb63
Merge branch 'dev' into dev1
D-Nice Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
182 changes: 123 additions & 59 deletions connectors/oraclizeConnector.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,61 @@
/*
Copyright (c) 2015-2016 Oraclize srl, Thomas Bertani
Copyright (c) 2015-2016 Oraclize SRL
Copyright (c) 2016 Oraclize LTD
*/

pragma solidity ^0.4.6;

contract AmIOnTheFork{
function forked() constant returns(bool);
}


contract Oraclize {
mapping (address => uint) reqc;

address public cbAddress = 0x26588a9301b0428d95e6fc3a5024fce8bec12d51;

address constant AmIOnTheForkAddress = 0x2bd2326c993dfaef84f696526064ff22eba5b362;


mapping (address => byte) public cbAddresses;
/*
0x01 = classic
0x02 = ledger nano
0x03 = intel sgx
*/

address constant AmIOnTheForkAddress = 0x2BD2326c993DFaeF84f696526064FF22eba5b362;

event Log1(address sender, bytes32 cid, uint timestamp, string datasource, string arg, uint gaslimit, byte proofType, uint gasPrice);
event Log2(address sender, bytes32 cid, uint timestamp, string datasource, string arg1, string arg2, uint gaslimit, byte proofType, uint gasPrice);

event LogN(address sender, bytes32 cid, uint timestamp, string datasource, bytes args, uint gaslimit, byte proofType, uint gasPrice);

address owner;

modifier onlyadmin {
if ((msg.sender != owner)&&(msg.sender != cbAddress)) throw;
_
if ((msg.sender != owner)&&(msg.sender != cbAddress())) throw;
_;
}

// proof is currently a placeholder for when associated proof for addressType is added
function addCbAddress(address newCbAddress, byte addressType, bytes proof) onlyadmin {
cbAddresses[newCbAddress] = addressType;
}


function addCbAddress(address newCbAddress, byte addressType) onlyadmin {
bytes memory nil = '';
addCbAddress(newCbAddress, addressType, nil);
}

function removeCbAddress(address newCbAddress) onlyadmin {
delete cbAddresses[newCbAddress];
}

function cbAddress() constant returns (address _cbAddress) {
if (cbAddresses[tx.origin] != 0)
_cbAddress = tx.origin;
}

function addDSource(string dsname, uint multiplier) {
addDSource(dsname, 0x00, multiplier);
}

function addDSource(string dsname, byte proofType, uint multiplier) onlyadmin {
bytes32 dsname_hash = sha3(dsname, proofType);
dsources[dsources.length++] = dsname_hash;
Expand All @@ -36,29 +64,29 @@ contract Oraclize {

mapping (bytes32 => bool) coupons;
bytes32 coupon;

function createCoupon(string _code) onlyadmin {
coupons[sha3(_code)] = true;
}

function deleteCoupon(string _code) onlyadmin {
coupons[sha3(_code)] = false;
}

function multisetProofType(uint[] _proofType, address[] _addr) onlyadmin {
for (uint i=0; i<_addr.length; i++) addr_proofType[_addr[i]] = byte(_proofType[i]);
}

function multisetCustomGasPrice(uint[] _gasPrice, address[] _addr) onlyadmin {
for (uint i=0; i<_addr.length; i++) addr_gasPrice[_addr[i]] = _gasPrice[i];
}

uint gasprice = 20000000000;

function setGasPrice(uint newgasprice) onlyadmin {
gasprice = newgasprice;
}

function setBasePrice(uint new_baseprice) onlyadmin { //0.001 usd in ether
baseprice = new_baseprice;
for (uint i=0; i<dsources.length; i++) price[dsources[i]] = new_baseprice*price_multiplier[dsources[i]];
Expand All @@ -68,23 +96,23 @@ contract Oraclize {
baseprice = new_baseprice;
for (uint i=0; i<dsources.length; i++) price[dsources[i]] = new_baseprice*price_multiplier[dsources[i]];
}

function withdrawFunds(address _addr) onlyadmin {
_addr.send(this.balance);
}

function() onlyadmin {}

function Oraclize() {
owner = msg.sender;
}

modifier costs(string datasource, uint gaslimit) {
uint price = getPrice(datasource, gaslimit, msg.sender);
if (msg.value >= price){
uint diff = msg.value - price;
if (diff > 0) msg.sender.send(diff);
_
_;
} else throw;
}

Expand All @@ -97,92 +125,128 @@ contract Oraclize {
function useCoupon(string _coupon) {
coupon = sha3(_coupon);
}

function setProofType(byte _proofType) {
addr_proofType[msg.sender] = _proofType;
}

function setCustomGasPrice(uint _gasPrice) {
addr_gasPrice[msg.sender] = _gasPrice;
}

function getPrice(string _datasource) public returns (uint _dsprice) {
return getPrice(_datasource, msg.sender);
}

function getPrice(string _datasource, uint _gaslimit) public returns (uint _dsprice) {
return getPrice(_datasource, _gaslimit, msg.sender);
}

function getPrice(string _datasource, address _addr) private returns (uint _dsprice) {
return getPrice(_datasource, 200000, _addr);
}

function getPrice(string _datasource, uint _gaslimit, address _addr) private returns (uint _dsprice) {
uint gasprice_ = addr_gasPrice[_addr];
if ((_gaslimit <= 200000)&&(reqc[_addr] == 0)&&(gasprice_ <= gasprice)&&(tx.origin != cbAddress)) return 0;
if ((_gaslimit <= 200000)&&(reqc[_addr] == 0)&&(gasprice_ <= gasprice)&&(tx.origin != cbAddress())) return 0;
if (gasprice_ == 0) gasprice_ = gasprice;
if ((coupon != 0)&&(coupons[coupon] == true)) return 0;
_dsprice = price[sha3(_datasource, addr_proofType[_addr])];
_dsprice += _gaslimit*gasprice_;
return _dsprice;
}

function query(string _datasource, string _arg) returns (bytes32 _id) {

function getCodeSize(address _addr) constant internal returns(uint _size) {
assembly {
_size := extcodesize(_addr)
}
}

function query(string _datasource, string _arg) payable returns (bytes32 _id) {
return query1(0, _datasource, _arg, 200000);
}
function query1(string _datasource, string _arg) returns (bytes32 _id) {

function query1(string _datasource, string _arg) payable returns (bytes32 _id) {
return query1(0, _datasource, _arg, 200000);
}
function query2(string _datasource, string _arg1, string _arg2) returns (bytes32 _id) {

function query2(string _datasource, string _arg1, string _arg2) payable returns (bytes32 _id) {
return query2(0, _datasource, _arg1, _arg2, 200000);
}

function query(uint _timestamp, string _datasource, string _arg) returns (bytes32 _id) {

function queryN(string _datasource, bytes _args) payable returns (bytes32 _id) {
return queryN(0, _datasource, _args, 200000);
}

function query(uint _timestamp, string _datasource, string _arg) payable returns (bytes32 _id) {
return query1(_timestamp, _datasource, _arg, 200000);
}
function query1(uint _timestamp, string _datasource, string _arg) returns (bytes32 _id) {

function query1(uint _timestamp, string _datasource, string _arg) payable returns (bytes32 _id) {
return query1(_timestamp, _datasource, _arg, 200000);
}
function query2(uint _timestamp, string _datasource, string _arg1, string _arg2) returns (bytes32 _id) {

function query2(uint _timestamp, string _datasource, string _arg1, string _arg2) payable returns (bytes32 _id) {
return query2(_timestamp, _datasource, _arg1, _arg2, 200000);
}

function query(uint _timestamp, string _datasource, string _arg, uint _gaslimit) returns (bytes32 _id) {

function queryN(uint _timestamp, string _datasource, bytes _args) payable returns (bytes32 _id) {
return queryN(_timestamp, _datasource, _args, 200000);
}

function query(uint _timestamp, string _datasource, string _arg, uint _gaslimit) payable returns (bytes32 _id) {
return query1(_timestamp, _datasource, _arg, _gaslimit);
}

function query1(uint _timestamp, string _datasource, string _arg, uint _gaslimit) costs(_datasource, _gaslimit) returns (bytes32 _id) {
if ((_timestamp > now+3600*24*60)||(_gaslimit > block.gaslimit)) throw;
bool forkFlag = AmIOnTheFork(AmIOnTheForkAddress).forked();

function query1(uint _timestamp, string _datasource, string _arg, uint _gaslimit) costs(_datasource, _gaslimit) payable returns (bytes32 _id) {
if ((_timestamp > now+3600*24*60)||(_gaslimit > block.gaslimit)) throw;
bool forkFlag;
if (getCodeSize(AmIOnTheForkAddress) > 0)
forkFlag = AmIOnTheFork(AmIOnTheForkAddress).forked();

_id = sha3(forkFlag, this, msg.sender, reqc[msg.sender]);
reqc[msg.sender]++;
Log1(msg.sender, _id, _timestamp, _datasource, _arg, _gaslimit, addr_proofType[msg.sender], addr_gasPrice[msg.sender]);
return _id;
}

function query2(uint _timestamp, string _datasource, string _arg1, string _arg2, uint _gaslimit) costs(_datasource, _gaslimit) returns (bytes32 _id) {
if ((_timestamp > now+3600*24*60)||(_gaslimit > block.gaslimit)) throw;
bool forkFlag = AmIOnTheFork(AmIOnTheForkAddress).forked();

function query2(uint _timestamp, string _datasource, string _arg1, string _arg2, uint _gaslimit) costs(_datasource, _gaslimit) payable returns (bytes32 _id) {
if ((_timestamp > now+3600*24*60)||(_gaslimit > block.gaslimit)) throw;
bool forkFlag;
if (getCodeSize(AmIOnTheForkAddress) > 0)
forkFlag = AmIOnTheFork(AmIOnTheForkAddress).forked();

_id = sha3(forkFlag, this, msg.sender, reqc[msg.sender]);
reqc[msg.sender]++;
Log2(msg.sender, _id, _timestamp, _datasource, _arg1, _arg2, _gaslimit, addr_proofType[msg.sender], addr_gasPrice[msg.sender]);
return _id;
}

function query_withGasLimit(uint _timestamp, string _datasource, string _arg, uint _gaslimit) returns (bytes32 _id) {

function queryN(uint _timestamp, string _datasource, bytes _args, uint _gaslimit) costs(_datasource, _gaslimit) payable returns (bytes32 _id) {
if ((_timestamp > now+3600*24*60)||(_gaslimit > block.gaslimit)) throw;
bool forkFlag;
if (getCodeSize(AmIOnTheForkAddress) > 0)
forkFlag = AmIOnTheFork(AmIOnTheForkAddress).forked();

_id = sha3(forkFlag, this, msg.sender, reqc[msg.sender]);
reqc[msg.sender]++;
LogN(msg.sender, _id, _timestamp, _datasource, _args, _gaslimit, addr_proofType[msg.sender], addr_gasPrice[msg.sender]);
return _id;
}

function query_withGasLimit(uint _timestamp, string _datasource, string _arg, uint _gaslimit) payable returns (bytes32 _id) {
return query(_timestamp, _datasource, _arg, _gaslimit);
}
function query1_withGasLimit(uint _timestamp, string _datasource, string _arg, uint _gaslimit) returns (bytes32 _id) {

function query1_withGasLimit(uint _timestamp, string _datasource, string _arg, uint _gaslimit) payable returns (bytes32 _id) {
return query1(_timestamp, _datasource, _arg, _gaslimit);
}
function query2_withGasLimit(uint _timestamp, string _datasource, string _arg1, string _arg2, uint _gaslimit) returns (bytes32 _id) {

function query2_withGasLimit(uint _timestamp, string _datasource, string _arg1, string _arg2, uint _gaslimit) payable returns (bytes32 _id) {
return query2(_timestamp, _datasource, _arg1, _arg2, _gaslimit);
}
}

function queryN_withGasLimit(uint _timestamp, string _datasource, bytes _args, uint _gaslimit) payable returns (bytes32 _id) {
return queryN(_timestamp, _datasource, _args, _gaslimit);
}
}
Loading