Draft/2.0.1

.solhint.json

@@ -16,6 +16,7 @@
     "modifier-name-mixedcase": "warn",
     "no-empty-blocks": "off",
     "no-inline-assembly": "off",
+    "no-global-import": "off",
     "var-name-mixedcase": "off",
     "reason-string": [
       "warn",

contracts/WitnetBytecodes.sol

@@ -4,12 +4,13 @@ pragma solidity >=0.7.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
 import "./interfaces/V2/IWitnetBytecodes.sol";
-import "./interfaces/V2/IWitnetBytecodesErrors.sol";
-import "./interfaces/V2/IWitnetBytecodesEvents.sol";
 
 abstract contract WitnetBytecodes
     is
-        IWitnetBytecodes,
-        IWitnetBytecodesErrors,
-        IWitnetBytecodesEvents
-{}
+        IWitnetBytecodes
+{
+    function class() virtual external view returns (string memory) {
+        return type(WitnetBytecodes).name;
+    }   
+    function specs() virtual external view returns (bytes4);
+}

contracts/WitnetRequestBoard.sol

@@ -1,35 +1,24 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity >=0.7.0 <0.9.0;
-pragma experimental ABIEncoderV2;
 
 import "./WitnetBytecodes.sol";
 import "./WitnetRequestFactory.sol";
-
-import "./interfaces/IWitnetRequestBoardEvents.sol";
-import "./interfaces/IWitnetRequestBoardReporter.sol";
-import "./interfaces/IWitnetRequestBoardRequestor.sol";
-import "./interfaces/IWitnetRequestBoardView.sol";
-
-import "./interfaces/IWitnetRequestBoardDeprecating.sol";
+import "./interfaces/V2/IWitnetRequestBoard.sol";
+import "./interfaces/V2/IWitnetRequestBoardEvents.sol";
 
 /// @title Witnet Request Board functionality base contract.
 /// @author The Witnet Foundation.
-abstract contract WitnetRequestBoard is
-    IWitnetRequestBoardDeprecating,
-    IWitnetRequestBoardEvents,
-    IWitnetRequestBoardReporter,
-    IWitnetRequestBoardRequestor,
-    IWitnetRequestBoardView
+abstract contract WitnetRequestBoard
+    is
+        IWitnetRequestBoard,
+        IWitnetRequestBoardEvents
 {
-    WitnetRequestFactory immutable public factory;
-    WitnetBytecodes immutable public registry;
-    constructor (WitnetRequestFactory _factory) {
-        require(
-            _factory.class() == type(WitnetRequestFactory).interfaceId,
-            "WitnetRequestBoard: uncompliant factory"
-        );
-        factory = _factory;
-        registry = _factory.registry();
+    function class() virtual external view returns (string memory) {
+        return type(WitnetRequestBoard).name;
     }
+    function channel() virtual external view returns (bytes4);
+    function factory() virtual external view returns (WitnetRequestFactory);
+    function registry() virtual external view returns (WitnetBytecodes);
+    function specs() virtual external view returns (bytes4);
 }

contracts/WitnetRequestFactory.sol

@@ -3,9 +3,16 @@
 pragma solidity >=0.7.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
+import "./WitnetBytecodes.sol";
+import "./WitnetRequestBoard.sol";
 import "./interfaces/V2/IWitnetRequestFactory.sol";
 
 abstract contract WitnetRequestFactory
     is
         IWitnetRequestFactory
-{}
+{
+    function class() virtual external view returns (string memory);
+    function registry() virtual external view returns (WitnetBytecodes);
+    function specs() virtual external view returns (bytes4);
+    function witnet() virtual external view returns (WitnetRequestBoard);
+}

contracts/requests/WitnetRequestTemplate.sol → contracts/WitnetRequestTemplate.sol

@@ -3,28 +3,32 @@
 pragma solidity >=0.7.0 <0.9.0;
 pragma experimental ABIEncoderV2;
 
-import "../WitnetRequestFactory.sol";
+import "./WitnetBytecodes.sol";
+import "./WitnetRequestBoard.sol";
+import "./WitnetRequestFactory.sol";
 
 abstract contract WitnetRequestTemplate
 {
     event WitnetRequestBuilt(address indexed request, bytes32 indexed radHash, string[][] args);
 
-    function class() virtual external view returns (bytes4);
+    function class() virtual external view returns (string memory);
     function factory() virtual external view returns (WitnetRequestFactory);
     function registry() virtual external view returns (WitnetBytecodes);
+    function specs() virtual external view returns (bytes4);
     function version() virtual external view returns (string memory);
+    function witnet() virtual external view returns (WitnetRequestBoard);
 
     function aggregator() virtual external view returns (bytes32);
     function parameterized() virtual external view returns (bool);
     function resultDataMaxSize() virtual external view returns (uint16);
-    function resultDataType() virtual external view returns (WitnetV2.RadonDataTypes);
+    function resultDataType() virtual external view returns (Witnet.RadonDataTypes);
     function retrievals() virtual external view returns (bytes32[] memory);
     function tally() virtual external view returns (bytes32);
 
-    function getRadonAggregator() virtual external view returns (WitnetV2.RadonReducer memory);
-    function getRadonRetrievalByIndex(uint256) virtual external view returns (WitnetV2.RadonRetrieval memory);
+    function getRadonAggregator() virtual external view returns (Witnet.RadonReducer memory);
+    function getRadonRetrievalByIndex(uint256) virtual external view returns (Witnet.RadonRetrieval memory);
     function getRadonRetrievalsCount() virtual external view returns (uint256);
-    function getRadonTally() virtual external view returns (WitnetV2.RadonReducer memory);
+    function getRadonTally() virtual external view returns (Witnet.RadonReducer memory);
 
     function buildRequest(string[][] calldata args) virtual external returns (address);
     function verifyRadonRequest(string[][] calldata args) virtual external returns (bytes32);