Refactor/2.1.0

README.md

@@ -33,7 +33,7 @@ Should any artifact require customized contract implementations:
 
 When modifying the existing source code, or the contents of `settings/artifacts` or `settings/specs`, you may need to upgrade some of the artifacts on certain networks. Just add the `--artifacts` parameter and a comma-separated list of the artifacts you need to upgrade. For instance:
 
-`$ pnpm run migrate <ecosystem>:<chain-name> WitnetErrorsLib,WitnetPriceFeeds`
+`$ pnpm run migrate <ecosystem>:<chain-name> WitOracleResultErrorsLib,WitPriceFeeds`
 
 When specifying deployable library artifacts, the depending contracts will be attempted to be upgraded as well.
 
@@ -56,13 +56,13 @@ Javacript methods and resources:
 - WEB addresses at a given chain:
     - `getAddresses(network)`
 - WEB artifacts:
-    - `assets.WitnetOracle`
-    - `assets.WitnetPriceFeeds`
+    - `assets.WitOracle`
+    - `assets.WitPriceFeeds`
     - `assets.WitnetPriceRouteSolver`
-    - `assets.WitnetRequest`
-    - `assets.WitnetRequestBytecodes`
-    - `assets.WitnetRequestFactory`
-    - `assets.WitnetRequestTemplate`
+    - `assets.WitOracleRequest`
+    - `assets.WitOracleRadonRegistry`
+    - `assets.WitOracleRequestFactory`
+    - `assets.WitOracleRequestTemplate`
     - `assets.WitnetUpgrableBase`
 
 ### `require("witnet-solidity-bridge/utils")`

contracts/WitnetFeeds.sol → contracts/WitFeeds.sol

@@ -2,25 +2,22 @@
 
 pragma solidity >=0.7.0 <0.9.0;
 
-import "./interfaces/IFeeds.sol";
-import "./interfaces/IWitnetFeeds.sol";
-import "./interfaces/IWitnetFeedsAdmin.sol";
+import "./interfaces/IWitFeeds.sol";
+import "./interfaces/IWitFeedsEvents.sol";
+import "./interfaces/IWitOracleAppliance.sol";
 
 import "ado-contracts/contracts/interfaces/IERC2362.sol";
 
-abstract contract WitnetFeeds
+abstract contract WitFeeds
     is 
         IERC2362,
-        IFeeds,
-        IWitnetFeeds,
-        IWitnetFeedsAdmin,
-        IWitnetOracleEvents
+        IWitFeeds,
+        IWitFeedsEvents,
+        IWitOracleAppliance,
+        IWitOracleEvents
 {
     Witnet.RadonDataTypes immutable public override dataType;
-
-    function class() virtual external view returns (string memory);
-    function specs() virtual external view returns (bytes4);
-    function witnet() virtual external view returns (WitnetOracle);
+    bytes32 immutable internal __prefix;
 
     constructor(
             Witnet.RadonDataTypes _dataType,
@@ -31,8 +28,6 @@ abstract contract WitnetFeeds
         __prefix = Witnet.toBytes32(bytes(_prefix));
     }
 
-    bytes32 immutable internal __prefix;
-
     function prefix() override public view returns (string memory) {
         return Witnet.toString(__prefix);
     }

contracts/WitOracle.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.7.0 <0.9.0;
+
+import "./WitOracleRadonRegistry.sol";
+import "./WitOracleRequestFactory.sol";
+
+import "./interfaces/IWitAppliance.sol";
+import "./interfaces/IWitOracle.sol";
+import "./interfaces/IWitOracleEvents.sol";
+
+/// @title Witnet Request Board functionality base contract.
+/// @author The Witnet Foundation.
+abstract contract WitOracle
+    is
+        IWitAppliance,
+        IWitOracle,
+        IWitOracleEvents
+{}

contracts/WitOracleRadonRegistry.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.7.0 <0.9.0;
+pragma experimental ABIEncoderV2;
+
+import "./interfaces/IWitAppliance.sol";
+import "./interfaces/IWitOracleRadonRegistry.sol";
+import "./interfaces/IWitOracleRadonRegistryEvents.sol";
+
+abstract contract WitOracleRadonRegistry
+    is
+        IWitAppliance,
+        IWitOracleRadonRegistry,
+        IWitOracleRadonRegistryEvents
+{}

contracts/WitOracleRequest.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.7.0 <0.9.0;
+pragma experimental ABIEncoderV2;
+
+import "./interfaces/IWitOracleAppliance.sol";
+import "./interfaces/IWitOracleRequest.sol";
+
+abstract contract WitOracleRequest
+    is
+        IWitOracleAppliance,
+        IWitOracleRequest
+{}

contracts/WitOracleRequestFactory.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.7.0 <0.9.0;
+pragma experimental ABIEncoderV2;
+
+import "./interfaces/IWitOracleAppliance.sol";
+import "./interfaces/IWitOracleRadonRegistryEvents.sol";
+import "./interfaces/IWitOracleRequestFactory.sol";
+import "./interfaces/IWitOracleRequestFactoryEvents.sol";
+
+abstract contract WitOracleRequestFactory
+    is
+        IWitOracleAppliance, 
+        IWitOracleRadonRegistryEvents,
+        IWitOracleRequestFactory,
+        IWitOracleRequestFactoryEvents
+{}

contracts/WitOracleRequestTemplate.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.7.0 <0.9.0;
+pragma experimental ABIEncoderV2;
+
+import "./interfaces/IWitOracleAppliance.sol";
+import "./interfaces/IWitOracleRadonRegistryEvents.sol";
+import "./interfaces/IWitOracleRequestFactoryEvents.sol";
+import "./interfaces/IWitOracleRequestTemplate.sol";
+
+abstract contract WitOracleRequestTemplate
+    is
+        IWitOracleAppliance,
+        IWitOracleRadonRegistryEvents,
+        IWitOracleRequestFactoryEvents,
+        IWitOracleRequestTemplate
+{}

contracts/WitPriceFeeds.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.7.0 <0.9.0;
+
+import "./WitFeeds.sol";
+import "./interfaces/IWitPriceFeeds.sol";
+
+/// @title WitPriceFeeds: Price Feeds live repository reliant on the Witnet Oracle blockchain.
+/// @author The Witnet Foundation.
+abstract contract WitPriceFeeds
+    is
+        WitFeeds,
+        IWitPriceFeeds
+{
+    constructor()
+        WitFeeds(
+            Witnet.RadonDataTypes.Integer,
+            "Price-"
+        ) 
+    {}
+}

contracts/WitRandomness.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8.0 <0.9.0;
+
+import "./interfaces/IWitOracleAppliance.sol";
+import "./interfaces/IWitOracleEvents.sol";
+import "./interfaces/IWitRandomness.sol";
+import "./interfaces/IWitRandomnessEvents.sol";
+
+abstract contract WitRandomness
+    is
+        IWitOracleAppliance,
+        IWitOracleEvents,
+        IWitRandomness,
+        IWitRandomnessEvents
+{}