Feat/modularize

.github/workflows/nodejs.yml

@@ -12,23 +12,26 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
 
     steps:
     - uses: actions/checkout@v1
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - uses: pnpm/action-setup@v3
+          with:
+            version: 8
     - name: Install dependencies
       run: |
-        npm install
+        pnpm install
     - name: Check format
       run: |
-        npm run fmt
+        pnpm run fmt
     - name: Compile solidity contracts
       run: |
-        npm run compile
+        pnpm run compile
     - name: Run tests
       run: |
-        npm run test
+        pnpm run test

.github/workflows/npm-publish.yml

@@ -0,0 +1,25 @@
+# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
+
+name: Publish NPM package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          registry-url: https://registry.npmjs.org/
+      - uses: pnpm/action-setup@v3
+          with:
+            version: 8
+      - run: pnpm install
+      - run: pnpm publish
+        env:
+          NODE_AUTH_TOKEN: ${{SECRETS.NPM_TOKEN}}

.gitignore

@@ -1,15 +1,13 @@
-node_modules/
+
+artifacts/
 build/
-coverage/
-coverage.json
-flattened/**
+cache/
+flattened/
+node_modules/
 
 .env
 .idea
 .vscode
 
-yarn.lock
-yarn-error.log
-package-lock.json
-
 *.tmp
+.old

.solhint.json

@@ -6,16 +6,20 @@
       ">=0.6.0 <0.9.0"
     ],
     "constructor-syntax": "warn",
+    "custom-errors": "off",
+    "explicit-types": "off",
     "func-param-name-mixedcase": "warn",
     "func-visibility": [
       "warn",
       {
         "ignoreConstructors": true
       }
     ],
+    "immutable-vars-naming": "off",
     "modifier-name-mixedcase": "warn",
     "no-empty-blocks": "off",
     "no-inline-assembly": "off",
+    "no-global-import": "off",
     "var-name-mixedcase": "off",
     "reason-string": [
       "warn",

contracts/WitnetOracle.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.7.0 <0.9.0;
+
+import "./WitnetRequestBytecodes.sol";
+import "./WitnetRequestFactory.sol";
+import "./interfaces/IWitnetOracle.sol";
+import "./interfaces/IWitnetOracleEvents.sol";
+
+/// @title Witnet Request Board functionality base contract.
+/// @author The Witnet Foundation.
+abstract contract WitnetOracle
+    is
+        IWitnetOracle,
+        IWitnetOracleEvents
+{
+    function class() virtual external view returns (string memory) {
+        return type(WitnetOracle).name;
+    }
+    function channel() virtual external view returns (bytes4);
+    function factory() virtual external view returns (WitnetRequestFactory);
+    function registry() virtual external view returns (WitnetRequestBytecodes);
+    function specs() virtual external view returns (bytes4);
+}

contracts/WitnetPriceFeeds.sol

@@ -1,24 +1,22 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >=0.8.0 <0.9.0;
+pragma solidity >=0.7.0 <0.9.0;
 
-import "ado-contracts/contracts/interfaces/IERC2362.sol";
-import "./interfaces/V2/IWitnetPriceFeeds.sol";
-import "./interfaces/V2/IWitnetPriceSolverDeployer.sol";
-import "./WitnetFeeds.sol";
+import "./apps/WitnetFeeds.sol";
 
+import "./interfaces/IWitnetPriceFeeds.sol";
+import "./interfaces/IWitnetPriceSolverDeployer.sol";
+
+/// @title WitnetPriceFeeds: Price Feeds live repository reliant on the Witnet Oracle blockchain.
+/// @author The Witnet Foundation.
 abstract contract WitnetPriceFeeds
     is
-        IERC2362,
+        WitnetFeeds,
         IWitnetPriceFeeds,
-        IWitnetPriceSolverDeployer,
-        WitnetFeeds
-{   
-    constructor(WitnetRequestBoard _wrb)
-        WitnetFeeds(
-            _wrb,
-            WitnetV2.RadonDataTypes.Integer,
-            "Price-"
-        )
+        IWitnetPriceSolverDeployer
+{
+    constructor()
+        WitnetFeeds(Witnet.RadonDataTypes.Integer, "Price-") 
     {}
-}
+
+}