2.1.x/pushable reports

.env_witnet

@@ -0,0 +1,10 @@
+### ethrpc-gateway
+#ETHRPC_DEFAULT_CHAIN=
+ETHRPC_PRIVATE_KEYS=["0x...",]
+#ETHRPC_PROVIDER_URL=
+
+### witnet-toolkit
+WITNET_TOOLKIT_MASTER_KEY=
+WITNET_TOOLKIT_PROVIDER_URL=
+WITNET_TOOLKIT_REPORTER_URL=
+WITNET_TOOLKIT_ASSETS_PATH=

README.md

@@ -54,7 +54,7 @@ Javacript methods and resources:
 - List of supported EVM chains:
     - `supportedNetworks()`
 - WEB addresses at a given chain:
-    - `getAddresses(network)`
+    - `getNetworkAddresses(network)`
 - WEB artifacts:
     - `assets.WitOracle`
     - `assets.WitPriceFeeds`

contracts/WitOracle.sol

@@ -6,20 +6,23 @@ import "./WitOracleRadonRegistry.sol";
 
 import "./interfaces/IWitAppliance.sol";
 import "./interfaces/IWitOracle.sol";
-import "./interfaces/IWitOracleEvents.sol";
+import "./interfaces/IWitOracleQueriable.sol";
+import "./interfaces/IWitOracleQueriableEvents.sol";
 
 /// @title Witnet Request Board functionality base contract.
 /// @author The Witnet Foundation.
 abstract contract WitOracle
     is
         IWitAppliance,
         IWitOracle,
-        IWitOracleEvents
+        IWitOracleQueriable,
+        IWitOracleQueriableEvents
 {
     function specs() virtual override external pure returns (bytes4) {
         return (
             type(IWitAppliance).interfaceId
                 ^ type(IWitOracle).interfaceId
+                ^ type(IWitOracleQueriable).interfaceId
         );
     }
 }

contracts/WitOraclePushOnly.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8.0 <0.9.0;
+
+import "./interfaces/IWitAppliance.sol";
+import "./interfaces/IWitOracle.sol";
+
+/// @title Witnet Request Board functionality base contract.
+/// @author The Witnet Foundation.
+abstract contract WitOraclePushOnly
+    is
+        IWitAppliance,
+        IWitOracle
+{
+    function specs() virtual override external pure returns (bytes4) {
+        return (
+            type(IWitAppliance).interfaceId
+                ^ type(IWitOracle).interfaceId
+        );
+    }
+}

contracts/WitPriceFeeds.sol

@@ -2,34 +2,28 @@
 
 pragma solidity >=0.8.0 <0.9.0;
 
-import "./WitFeeds.sol";
+import "ado-contracts/contracts/interfaces/IERC2362.sol";
 
 import "./interfaces/IWitPriceFeeds.sol";
-import "./interfaces/IWitPriceFeedsSolverFactory.sol";
+import "./interfaces/IWitPriceFeedsAdmin.sol";
 
-/// @title WitPriceFeeds: Price Feeds live repository reliant on the Wit/Oracle blockchain.
+/// @title WitPriceFeeds: Price Feeds repository powered by the Wit/Oracle, 
+/// @title and yet usable from both Chainlink and Pyth clients.
 /// @author The Witnet Foundation.
 abstract contract WitPriceFeeds
     is
-        WitFeeds,
+        IERC2362,
         IWitPriceFeeds,
-        IWitPriceFeedsSolverFactory
+        IWitPriceFeedsAdmin,
+        IWitOracleAppliance,
+        IWitOracleQueriableEvents
 {
-    constructor()
-        WitFeeds(
-            Witnet.RadonDataTypes.Integer,
-            "Price-"
-        ) 
-    {}
-
     function specs() virtual override external pure returns (bytes4) {
         return (
             type(IERC2362).interfaceId
-                ^ type(IWitOracleAppliance).interfaceId
-                ^ type(IWitFeeds).interfaceId
-                ^ type(IWitFeedsAdmin).interfaceId
                 ^ type(IWitPriceFeeds).interfaceId
-                ^ type(IWitPriceFeedsSolverFactory).interfaceId
+                ^ type(IWitPriceFeedsAdmin).interfaceId
+                ^ type(IWitOracleAppliance).interfaceId
         );
     }
 }

contracts/WitPriceFeedsLegacy.sol

@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8.0 <0.9.0;
+
+import "ado-contracts/contracts/interfaces/IERC2362.sol";
+
+import "./interfaces/legacy/IWitPriceFeedsLegacy.sol";
+import "./interfaces/legacy/IWitPriceFeedsLegacyAdmin.sol";
+import "./interfaces/legacy/IWitPriceFeedsLegacySolverFactory.sol";
+
+/// @title WitPriceFeedsLegacy: Price Feeds live repository reliant on the Wit/Oracle blockchain, up to V2.0. 
+/// @author The Witnet Foundation.
+abstract contract WitPriceFeedsLegacy
+    is
+        IERC2362,
+        IWitPriceFeedsLegacy,
+        IWitPriceFeedsLegacyAdmin,
+        IWitPriceFeedsLegacySolverFactory,
+        IWitOracleAppliance,
+        IWitOracleQueriableEvents
+{
+    Witnet.RadonDataTypes immutable public override dataType = Witnet.RadonDataTypes.Integer;
+    bytes32 immutable internal __prefix = "Price-";
+
+    function prefix() virtual override external view returns (string memory) {
+        return Witnet.toString(__prefix);
+    }
+
+    function specs() virtual override external pure returns (bytes4) {
+        return (
+            type(IERC2362).interfaceId
+                ^ type(IWitOracleAppliance).interfaceId
+                ^ type(IWitPriceFeedsLegacy).interfaceId
+                ^ type(IWitPriceFeedsLegacyAdmin).interfaceId
+                ^ type(IWitPriceFeedsLegacySolverFactory).interfaceId
+        );
+    }
+}

contracts/WitRandomness.sol

@@ -3,14 +3,14 @@
 pragma solidity >=0.8.0 <0.9.0;
 
 import "./interfaces/IWitOracleAppliance.sol";
-import "./interfaces/IWitOracleEvents.sol";
+import "./interfaces/IWitOracleQueriableEvents.sol";
 import "./interfaces/IWitRandomness.sol";
 import "./interfaces/IWitRandomnessEvents.sol";
 
 abstract contract WitRandomness
     is
         IWitOracleAppliance,
-        IWitOracleEvents,
+        IWitOracleQueriableEvents,
         IWitRandomness,
         IWitRandomnessEvents
 {