Skip to content

Commit

Permalink
chore(0.4.25API): elucidate address in getPrice fxns
Browse files Browse the repository at this point in the history
  • Loading branch information
gskapka committed Jun 11, 2019
1 parent b71156f commit a8371e4
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions oraclizeAPI_0.4.25.sol
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,18 @@ contract OraclizeI {
function getPrice(byte _datasource) public view returns (uint256 _dsprice);
function randomDS_getSessionPubKeyHash() external constant returns(bytes32);
function getPrice(string memory _datasource) public view returns (uint256 _dsprice);
function getPrice(byte _datasource, address _address) public view returns (uint256 _dsprice);
function getPrice(byte _datasource, address _contractToQuery) public view returns (uint256 _dsprice);
function getPrice(byte _datasource, uint256 _gasLimit) public view returns (uint256 _dsprice);
function getPrice(string memory _datasource, address _address) public view returns (uint256 _dsprice);
function getPrice(string memory _datasource, address _contractToQuery) public view returns (uint256 _dsprice);
function getPrice(string memory _datasource, uint256 _gasLimit) public view returns (uint256 _dsprice);
function queryN(uint _timestamp, string _datasource, bytes _argN) public payable returns (bytes32 _id);
function query(uint _timestamp, string _datasource, string _arg) external payable returns (bytes32 _id);
function requestCallbackRebroadcast(bytes32 _queryId, uint256 _gasLimit, uint256 _gasPrice) payable external;
function getPrice(byte _datasource, uint256 _gasLimit, address _address) public view returns (uint256 _dsprice);
function getPrice(byte _datasource, uint256 _gasLimit, address _contractToQuery) public view returns (uint256 _dsprice);
function getRebroadcastCost(uint256 _gasLimit, uint256 _gasPrice) public pure returns (uint256 _rebroadcastCost);
function convertToERC20Price(uint256 _queryPriceInWei, address _tokenAddress) public view returns (uint256 _price);
function query2(uint _timestamp, string _datasource, string _arg1, string _arg2) public payable returns (bytes32 _id);
function getPrice(string memory _datasource, uint256 _gasLimit, address _address) public view returns (uint256 _dsprice);
function getPrice(string memory _datasource, uint256 _gasLimit, address _contractToQuery) public view returns (uint256 _dsprice);
function query_withGasLimit(uint _timestamp, string _datasource, string _arg, uint _gaslimit) external payable returns (bytes32 _id);
function queryN_withGasLimit(uint _timestamp, string _datasource, bytes _argN, uint _gaslimit) external payable returns (bytes32 _id);
function query2_withGasLimit(uint _timestamp, string _datasource, string _arg1, string _arg2, uint _gaslimit) external payable returns (bytes32 _id);
Expand Down Expand Up @@ -488,48 +488,48 @@ contract usingOraclize {

function oraclize_getPrice(
string memory _datasource,
address _address
address _contractToQuery
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.getPrice(_datasource, _address);
return oraclize.getPrice(_datasource, _contractToQuery);
}

function oraclize_getPrice(
byte _datasource,
address _address
address _contractToQuery
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.getPrice(_datasource, _address);
return oraclize.getPrice(_datasource, _contractToQuery);
}

function oraclize_getPrice(
string memory _datasource,
address _address,
address _contractToQuery,
uint256 _gasLimit
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.getPrice(_datasource, _gasLimit, _address);
return oraclize.getPrice(_datasource, _gasLimit, _contractToQuery);
}

function oraclize_getPrice(
byte _datasource,
address _address,
address _contractToQuery,
uint256 _gasLimit
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.getPrice(_datasource, _gasLimit, _address);
return oraclize.getPrice(_datasource, _gasLimit, _contractToQuery);
}

function oraclize_getPrice(
Expand Down Expand Up @@ -732,95 +732,95 @@ contract usingOraclize {

function oraclize_getPriceERC20(
string memory _datasource,
address _address
address _contractToQuery
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.convertToERC20Price(
oraclize.getPrice(_datasource, _address),
oraclize.getPrice(_datasource, _contractToQuery),
oraclize.addressCustomPaymentToken(address(this))
);
}

function oraclize_getPriceERC20(
byte _datasource,
address _address
address _contractToQuery
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.convertToERC20Price(
oraclize.getPrice(_datasource, _address),
oraclize.getPrice(_datasource, _contractToQuery),
oraclize.addressCustomPaymentToken(address(this))
);
}

function oraclize_getPriceERC20(
string memory _datasource,
address _address,
address _contractToQuery,
address _tokenAddress
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.convertToERC20Price(
oraclize.getPrice(_datasource, _address),
oraclize.getPrice(_datasource, _contractToQuery),
_tokenAddress
);
}

function oraclize_getPriceERC20(
byte _datasource,
address _address,
address _contractToQuery,
address _tokenAddress
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.convertToERC20Price(
oraclize.getPrice(_datasource, _address),
oraclize.getPrice(_datasource, _contractToQuery),
_tokenAddress
);
}

function oraclize_getPriceERC20(
string memory _datasource,
address _address,
address _contractToQuery,
uint256 _gasLimit
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.convertToERC20Price(
oraclize.getPrice(_datasource, _gasLimit, _address),
oraclize.getPrice(_datasource, _gasLimit, _contractToQuery),
oraclize.addressCustomPaymentToken(address(this))
);
}

function oraclize_getPriceERC20(
byte _datasource,
address _address,
address _contractToQuery,
uint256 _gasLimit
)
oraclizeAPI
internal
returns (uint256 _queryPrice)
{
return oraclize.convertToERC20Price(
oraclize.getPrice(_datasource, _gasLimit, _address),
oraclize.getPrice(_datasource, _gasLimit, _contractToQuery),
oraclize.addressCustomPaymentToken(address(this))
);
}

function oraclize_getPriceERC20(
string memory _datasource,
address _address,
address _contractToQuery,
uint256 _gasLimit,
address _tokenAddress
)
Expand All @@ -829,14 +829,14 @@ contract usingOraclize {
returns (uint256 _queryPrice)
{
return oraclize.convertToERC20Price(
oraclize.getPrice(_datasource, _gasLimit, _address),
oraclize.getPrice(_datasource, _gasLimit, _contractToQuery),
_tokenAddress
);
}

function oraclize_getPriceERC20(
byte _datasource,
address _address,
address _contractToQuery,
uint256 _gasLimit,
address _tokenAddress
)
Expand All @@ -845,7 +845,7 @@ contract usingOraclize {
returns (uint256 _queryPrice)
{
return oraclize.convertToERC20Price(
oraclize.getPrice(_datasource, _gasLimit, _address),
oraclize.getPrice(_datasource, _gasLimit, _contractToQuery),
_tokenAddress
);
}
Expand Down

0 comments on commit a8371e4

Please sign in to comment.