| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 | + + + + + + + + + + + + + + + + + + + | // SPDX-License-Identifier: MIT
+pragma solidity >=0.4.22 <0.8.0;
+
+contract Migrations {
+ address public owner = msg.sender;
+ uint public last_completed_migration;
+
+ modifier restricted() {
+ require(
+ msg.sender == owner,
+ "This function is restricted to the contract's owner"
+ );
+ _;
+ }
+
+ function setCompleted(uint completed) public restricted {
+ last_completed_migration = completed;
+ }
+}
+ |
| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +4× +4× + + + + + + +4× +2× + + + + + + + + + + + + + + + + + + + + + + +2× + + + + + + + + + + + + + + + + + + + + +11× + + + + + + +9× + + + + + + + + +9× +3× +3× +3× + + + + + + + + + + +1× + + + + + + + + + + + + + + + + + + + +1× +1× +1× + + + | // SPDX-License-Identifier: MIT
+pragma solidity 0.7.0;
+
+import "@openzeppelin/contracts/access/AccessControl.sol";
+
+
+library SafeMath {
+
+ function add(uint256 a, uint256 b) internal pure returns (uint256) {
+ uint256 c = a + b;
+ require(c >= a, "SafeMath: addition overflow");
+
+ return c;
+ }
+
+ function sub(uint256 a, uint256 b) internal pure returns (uint256) {
+ return sub(a, b, "SafeMath: subtraction overflow");
+ }
+
+ function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {
+ require(b <= a, errorMessage);
+ uint256 c = a - b;
+
+ return c;
+ }
+
+
+ function mul(uint256 a, uint256 b) internal pure returns (uint256) {
+ // Gas optimization: this is cheaper than requiring 'a' not being zero, but the
+ // benefit is lost if 'b' is also tested.
+ // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522
+ if (a == 0) {
+ return 0;
+ }
+
+ uint256 c = a * b;
+ require(c / a == b, "SafeMath: multiplication overflow");
+
+ return c;
+ }
+
+ function div(uint256 a, uint256 b) internal pure returns (uint256) {
+ return div(a, b, "SafeMath: division by zero");
+ }
+
+ function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {
+ require(b > 0, errorMessage);
+ uint256 c = a / b;
+ // assert(a == b * c + a % b); // There is no case in which this doesn't hold
+
+ return c;
+ }
+
+ function mod(uint256 a, uint256 b) internal pure returns (uint256) {
+ return mod(a, b, "SafeMath: modulo by zero");
+ }
+
+ function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {
+ require(b != 0, errorMessage);
+ return a % b;
+ }
+}
+
+contract TellorAccess is AccessControl {
+
+ using SafeMath for uint256;
+
+ event NewValue(uint256 _requestId, uint256 _time, uint256 _value);
+
+ mapping(uint256 => mapping(uint256 => uint256)) public values; //requestId -> timestamp -> value
+// mapping(uint256 => mapping(uint256 => bool)) public isDisputed; //requestId -> timestamp -> value
+ mapping(uint256 => uint256[]) public timestamps;
+
+ bytes32 public constant REPORTER_ROLE = keccak256("reporter");
+
+
+
+ constructor () {
+ _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
+ _setRoleAdmin(REPORTER_ROLE, DEFAULT_ADMIN_ROLE);
+ }
+
+ /**
+ * @dev Modifier to restrict only to the admin role.
+ */
+ modifier onlyAdmin() {
+ require(isAdmin(msg.sender), "Restricted to admins.");
+ _;
+ }
+
+ /**
+ * @dev Restricted to members of the reporter role.
+ */
+ modifier onlyReporter() {
+ require(isReporter(msg.sender), "Restricted to reporters.");
+ _;
+ }
+
+ /**
+ @dev Add an account to the admin role. Restricted to admins.
+ */
+ function addAdmin(address account) public virtual onlyAdmin {
+ grantRole(DEFAULT_ADMIN_ROLE, account);
+ }
+
+ /**
+ * @dev Add an account to the reporter role. Restricted to admins.
+ * @param account is the address of the reporter to give permissions to submit data
+ */
+ function addReporter(address account) public virtual onlyAdmin {
+ grantRole(REPORTER_ROLE, account);
+ }
+
+ /**
+ * @dev Remove an account from the reporter role. Restricted to admins.
+ */
+ function removeReporter(address account) public virtual onlyAdmin {
+ revokeRole(REPORTER_ROLE, account);
+ }
+
+ /**
+ * @dev Remove oneself from the admin role.
+ */
+ function renounceAdmin() public virtual {
+ renounceRole(DEFAULT_ADMIN_ROLE, msg.sender);
+ }
+
+ /**
+ * @dev Return `true` if the account belongs to the admin role.
+ */
+ function isAdmin(address account) public virtual view returns (bool) {
+ return hasRole(DEFAULT_ADMIN_ROLE, account);
+ }
+
+ /**
+ * @dev Return `true` if the account belongs to the reporter role.
+ */
+ function isReporter(address account) public virtual view returns (bool) {
+ return hasRole(REPORTER_ROLE, account);
+ }
+
+ /**
+ * @dev A mock function to submit a value to be read withoun miners needed
+ * @param _requestId The tellorId to associate the value to
+ * @param _value the value for the requestId
+ */
+ function submitValue(uint256 _requestId,uint256 _value) external {
+ require(isReporter(msg.sender) || isAdmin(msg.sender), "Sender must be an Admin or Reporter to submitValue");
+ values[_requestId][block.timestamp] = _value;
+ timestamps[_requestId].push(block.timestamp);
+ emit NewValue(_requestId, block.timestamp, _value);
+ }
+
+
+ /**
+ * @dev Retreive value from oracle based on requestId/timestamp
+ * @param _requestId being requested
+ * @param _timestamp to retreive data/value from
+ * @return uint value for requestId/timestamp submitted
+ */
+ function retrieveData(uint256 _requestId, uint256 _timestamp) public view returns(uint256){
+ return values[_requestId][_timestamp];
+ }
+
+
+ /**
+ * @dev Counts the number of values that have been submited for the request
+ * @param _requestId the requestId to look up
+ * @return uint count of the number of values received for the requestId
+ */
+ function getNewValueCountbyRequestId(uint256 _requestId) public view returns(uint) {
+ return timestamps[_requestId].length;
+ }
+
+ /**
+ * @dev Gets the timestamp for the value based on their index
+ * @param _requestId is the requestId to look up
+ * @param index is the value index to look up
+ * @return uint timestamp
+ */
+ function getTimestampbyRequestIDandIndex(uint256 _requestId, uint256 index) public view returns(uint256) {
+ uint len = timestamps[_requestId].length;
+ Iif(len == 0 || len <= index) return 0;
+ return timestamps[_requestId][index];
+ }
+
+} |
| File | ++ | Statements | ++ | Branches | ++ | Functions | ++ | Lines | ++ |
|---|---|---|---|---|---|---|---|---|---|
| Migrations.sol | +0% | +0/2 | +0% | +0/2 | +0% | +0/2 | +0% | +0/3 | +|
| TellorAccess.sol | +35.9% | +14/39 | +25% | +5/20 | +38.1% | +8/21 | +37.5% | +15/40 | +
| File | ++ | Statements | ++ | Branches | ++ | Functions | ++ | Lines | ++ |
|---|---|---|---|---|---|---|---|---|---|
| contracts/ | +34.15% | +14/41 | +22.73% | +5/22 | +34.78% | +8/23 | +34.88% | +15/43 | +
| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 | + + + + + + + + + + + + + + + + + + + | // SPDX-License-Identifier: MIT
+pragma solidity >=0.4.22 <0.8.0;
+
+contract Migrations {
+ address public owner = msg.sender;
+ uint public last_completed_migration;
+
+ modifier restricted() {
+ require(
+ msg.sender == owner,
+ "This function is restricted to the contract's owner"
+ );
+ _;
+ }
+
+ function setCompleted(uint completed) public restricted {
+ last_completed_migration = completed;
+ }
+}
+ |
| 1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +4× +4× + + + + + + +4× +2× + + + + + + + + + + + + + + + + + + + + + + +2× + + + + + + + + + + + + + + + + + + + + +11× + + + + + + +9× + + + + + + + + +9× +3× +3× +3× + + + + + + + + + + +1× + + + + + + + + + + + + + + + + + + + +1× +1× +1× + + + | // SPDX-License-Identifier: MIT
+pragma solidity 0.7.0;
+
+import "@openzeppelin/contracts/access/AccessControl.sol";
+
+
+library SafeMath {
+
+ function add(uint256 a, uint256 b) internal pure returns (uint256) {
+ uint256 c = a + b;
+ require(c >= a, "SafeMath: addition overflow");
+
+ return c;
+ }
+
+ function sub(uint256 a, uint256 b) internal pure returns (uint256) {
+ return sub(a, b, "SafeMath: subtraction overflow");
+ }
+
+ function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {
+ require(b <= a, errorMessage);
+ uint256 c = a - b;
+
+ return c;
+ }
+
+
+ function mul(uint256 a, uint256 b) internal pure returns (uint256) {
+ // Gas optimization: this is cheaper than requiring 'a' not being zero, but the
+ // benefit is lost if 'b' is also tested.
+ // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522
+ if (a == 0) {
+ return 0;
+ }
+
+ uint256 c = a * b;
+ require(c / a == b, "SafeMath: multiplication overflow");
+
+ return c;
+ }
+
+ function div(uint256 a, uint256 b) internal pure returns (uint256) {
+ return div(a, b, "SafeMath: division by zero");
+ }
+
+ function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {
+ require(b > 0, errorMessage);
+ uint256 c = a / b;
+ // assert(a == b * c + a % b); // There is no case in which this doesn't hold
+
+ return c;
+ }
+
+ function mod(uint256 a, uint256 b) internal pure returns (uint256) {
+ return mod(a, b, "SafeMath: modulo by zero");
+ }
+
+ function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) {
+ require(b != 0, errorMessage);
+ return a % b;
+ }
+}
+
+contract TellorAccess is AccessControl {
+
+ using SafeMath for uint256;
+
+ event NewValue(uint256 _requestId, uint256 _time, uint256 _value);
+
+ mapping(uint256 => mapping(uint256 => uint256)) public values; //requestId -> timestamp -> value
+// mapping(uint256 => mapping(uint256 => bool)) public isDisputed; //requestId -> timestamp -> value
+ mapping(uint256 => uint256[]) public timestamps;
+
+ bytes32 public constant REPORTER_ROLE = keccak256("reporter");
+
+
+
+ constructor () {
+ _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
+ _setRoleAdmin(REPORTER_ROLE, DEFAULT_ADMIN_ROLE);
+ }
+
+ /**
+ * @dev Modifier to restrict only to the admin role.
+ */
+ modifier onlyAdmin() {
+ require(isAdmin(msg.sender), "Restricted to admins.");
+ _;
+ }
+
+ /**
+ * @dev Restricted to members of the reporter role.
+ */
+ modifier onlyReporter() {
+ require(isReporter(msg.sender), "Restricted to reporters.");
+ _;
+ }
+
+ /**
+ @dev Add an account to the admin role. Restricted to admins.
+ */
+ function addAdmin(address account) public virtual onlyAdmin {
+ grantRole(DEFAULT_ADMIN_ROLE, account);
+ }
+
+ /**
+ * @dev Add an account to the reporter role. Restricted to admins.
+ * @param account is the address of the reporter to give permissions to submit data
+ */
+ function addReporter(address account) public virtual onlyAdmin {
+ grantRole(REPORTER_ROLE, account);
+ }
+
+ /**
+ * @dev Remove an account from the reporter role. Restricted to admins.
+ */
+ function removeReporter(address account) public virtual onlyAdmin {
+ revokeRole(REPORTER_ROLE, account);
+ }
+
+ /**
+ * @dev Remove oneself from the admin role.
+ */
+ function renounceAdmin() public virtual {
+ renounceRole(DEFAULT_ADMIN_ROLE, msg.sender);
+ }
+
+ /**
+ * @dev Return `true` if the account belongs to the admin role.
+ */
+ function isAdmin(address account) public virtual view returns (bool) {
+ return hasRole(DEFAULT_ADMIN_ROLE, account);
+ }
+
+ /**
+ * @dev Return `true` if the account belongs to the reporter role.
+ */
+ function isReporter(address account) public virtual view returns (bool) {
+ return hasRole(REPORTER_ROLE, account);
+ }
+
+ /**
+ * @dev A mock function to submit a value to be read withoun miners needed
+ * @param _requestId The tellorId to associate the value to
+ * @param _value the value for the requestId
+ */
+ function submitValue(uint256 _requestId,uint256 _value) external {
+ require(isReporter(msg.sender) || isAdmin(msg.sender), "Sender must be an Admin or Reporter to submitValue");
+ values[_requestId][block.timestamp] = _value;
+ timestamps[_requestId].push(block.timestamp);
+ emit NewValue(_requestId, block.timestamp, _value);
+ }
+
+
+ /**
+ * @dev Retreive value from oracle based on requestId/timestamp
+ * @param _requestId being requested
+ * @param _timestamp to retreive data/value from
+ * @return uint value for requestId/timestamp submitted
+ */
+ function retrieveData(uint256 _requestId, uint256 _timestamp) public view returns(uint256){
+ return values[_requestId][_timestamp];
+ }
+
+
+ /**
+ * @dev Counts the number of values that have been submited for the request
+ * @param _requestId the requestId to look up
+ * @return uint count of the number of values received for the requestId
+ */
+ function getNewValueCountbyRequestId(uint256 _requestId) public view returns(uint) {
+ return timestamps[_requestId].length;
+ }
+
+ /**
+ * @dev Gets the timestamp for the value based on their index
+ * @param _requestId is the requestId to look up
+ * @param index is the value index to look up
+ * @return uint timestamp
+ */
+ function getTimestampbyRequestIDandIndex(uint256 _requestId, uint256 index) public view returns(uint256) {
+ uint len = timestamps[_requestId].length;
+ Iif(len == 0 || len <= index) return 0;
+ return timestamps[_requestId][index];
+ }
+
+} |
| File | ++ | Statements | ++ | Branches | ++ | Functions | ++ | Lines | ++ |
|---|---|---|---|---|---|---|---|---|---|
| Migrations.sol | +0% | +0/2 | +0% | +0/2 | +0% | +0/2 | +0% | +0/3 | +|
| TellorAccess.sol | +35.9% | +14/39 | +25% | +5/20 | +38.1% | +8/21 | +37.5% | +15/40 | +
| File | ++ | Statements | ++ | Branches | ++ | Functions | ++ | Lines | ++ |
|---|---|---|---|---|---|---|---|---|---|
| contracts/ | +34.15% | +14/41 | +22.73% | +5/22 | +34.78% | +8/23 | +34.88% | +15/43 | +