refactor: split config into network, milestones, exceptions and dynamic-fees

.circleci/config.yml

@@ -35,7 +35,6 @@ jobs:
             - ./packages/core/node_modules
             - ./packages/core-api/node_modules
             - ./packages/core-blockchain/node_modules
-            - ./packages/core-config/node_modules
             - ./packages/core-container/node_modules
             - ./packages/core-database/node_modules
             - ./packages/core-database-postgres/node_modules
@@ -66,23 +65,26 @@ jobs:
           name: Create .ark/database directory
           command: mkdir -p $HOME/.ark/database
       - run:
-          name: core-utils
-          command: 'cd ~/ark-core/packages/core-utils && yarn test:coverage'
+          name: core-vote-report
+          command: 'cd ~/ark-core/packages/core-vote-report && yarn test:coverage'
       - run:
-          name: core-test-utils
-          command: 'cd ~/ark-core/packages/core-test-utils && yarn test:coverage'
+          name: core-tester-cli
+          command: 'cd ~/ark-core/packages/core-tester-cli && yarn test:coverage'
       - run:
-          name: core-p2p
-          command: 'cd ~/ark-core/packages/core-p2p && yarn test:coverage'
+          name: core-snapshots
+          command: 'cd ~/ark-core/packages/core-snapshots && yarn test:coverage'
       - run:
-          name: core-http-utils
-          command: 'cd ~/ark-core/packages/core-http-utils && yarn test:coverage'
+          name: core-logger
+          command: 'cd ~/ark-core/packages/core-logger && yarn test:coverage'
       - run:
-          name: core-event-emitter
-          command: 'cd ~/ark-core/packages/core-event-emitter && yarn test:coverage'
+          name: core-forger
+          command: 'cd ~/ark-core/packages/core-forger && yarn test:coverage'
       - run:
-          name: core-config
-          command: 'cd ~/ark-core/packages/core-config && yarn test:coverage'
+          name: core-debugger-cli
+          command: 'cd ~/ark-core/packages/core-debugger-cli && yarn test:coverage'
+      - run:
+          name: core-container
+          command: 'cd ~/ark-core/packages/core-container && yarn test:coverage'
       - run:
           name: core
           command: 'cd ~/ark-core/packages/core && yarn test:coverage'
@@ -128,7 +130,6 @@ jobs:
             - ./packages/core/node_modules
             - ./packages/core-api/node_modules
             - ./packages/core-blockchain/node_modules
-            - ./packages/core-config/node_modules
             - ./packages/core-container/node_modules
             - ./packages/core-database/node_modules
             - ./packages/core-database-postgres/node_modules
@@ -159,23 +160,26 @@ jobs:
           name: Create .ark/database directory
           command: mkdir -p $HOME/.ark/database
       - run:
-          name: core-utils
-          command: 'cd ~/ark-core/packages/core-utils && yarn test:coverage'
+          name: core-vote-report
+          command: 'cd ~/ark-core/packages/core-vote-report && yarn test:coverage'
       - run:
-          name: core-test-utils
-          command: 'cd ~/ark-core/packages/core-test-utils && yarn test:coverage'
+          name: core-tester-cli
+          command: 'cd ~/ark-core/packages/core-tester-cli && yarn test:coverage'
       - run:
-          name: core-p2p
-          command: 'cd ~/ark-core/packages/core-p2p && yarn test:coverage'
+          name: core-snapshots
+          command: 'cd ~/ark-core/packages/core-snapshots && yarn test:coverage'
       - run:
-          name: core-http-utils
-          command: 'cd ~/ark-core/packages/core-http-utils && yarn test:coverage'
+          name: core-logger
+          command: 'cd ~/ark-core/packages/core-logger && yarn test:coverage'
       - run:
-          name: core-event-emitter
-          command: 'cd ~/ark-core/packages/core-event-emitter && yarn test:coverage'
+          name: core-forger
+          command: 'cd ~/ark-core/packages/core-forger && yarn test:coverage'
       - run:
-          name: core-config
-          command: 'cd ~/ark-core/packages/core-config && yarn test:coverage'
+          name: core-debugger-cli
+          command: 'cd ~/ark-core/packages/core-debugger-cli && yarn test:coverage'
+      - run:
+          name: core-container
+          command: 'cd ~/ark-core/packages/core-container && yarn test:coverage'
       - run:
           name: core
           command: 'cd ~/ark-core/packages/core && yarn test:coverage'
@@ -221,7 +225,6 @@ jobs:
             - ./packages/core/node_modules
             - ./packages/core-api/node_modules
             - ./packages/core-blockchain/node_modules
-            - ./packages/core-config/node_modules
             - ./packages/core-container/node_modules
             - ./packages/core-database/node_modules
             - ./packages/core-database-postgres/node_modules
@@ -302,7 +305,6 @@ jobs:
             - ./packages/core/node_modules
             - ./packages/core-api/node_modules
             - ./packages/core-blockchain/node_modules
-            - ./packages/core-config/node_modules
             - ./packages/core-container/node_modules
             - ./packages/core-database/node_modules
             - ./packages/core-database-postgres/node_modules
@@ -333,26 +335,23 @@ jobs:
           name: Create .ark/database directory
           command: mkdir -p $HOME/.ark/database
       - run:
-          name: core-vote-report
-          command: 'cd ~/ark-core/packages/core-vote-report && yarn test:coverage'
-      - run:
-          name: core-tester-cli
-          command: 'cd ~/ark-core/packages/core-tester-cli && yarn test:coverage'
+          name: core-webhooks
+          command: 'cd ~/ark-core/packages/core-webhooks && yarn test:coverage'
       - run:
-          name: core-snapshots
-          command: 'cd ~/ark-core/packages/core-snapshots && yarn test:coverage'
+          name: core-transaction-pool
+          command: 'cd ~/ark-core/packages/core-transaction-pool && yarn test:coverage'
       - run:
-          name: core-logger
-          command: 'cd ~/ark-core/packages/core-logger && yarn test:coverage'
+          name: core-logger-winston
+          command: 'cd ~/ark-core/packages/core-logger-winston && yarn test:coverage'
       - run:
-          name: core-forger
-          command: 'cd ~/ark-core/packages/core-forger && yarn test:coverage'
+          name: core-graphql
+          command: 'cd ~/ark-core/packages/core-graphql && yarn test:coverage'
       - run:
-          name: core-debugger-cli
-          command: 'cd ~/ark-core/packages/core-debugger-cli && yarn test:coverage'
+          name: core-deployer
+          command: 'cd ~/ark-core/packages/core-deployer && yarn test:coverage'
       - run:
-          name: core-container
-          command: 'cd ~/ark-core/packages/core-container && yarn test:coverage'
+          name: core-database
+          command: 'cd ~/ark-core/packages/core-database && yarn test:coverage'
       - run:
           name: core-api
           command: 'cd ~/ark-core/packages/core-api && yarn test:coverage'
@@ -398,7 +397,6 @@ jobs:
             - ./packages/core/node_modules
             - ./packages/core-api/node_modules
             - ./packages/core-blockchain/node_modules
-            - ./packages/core-config/node_modules
             - ./packages/core-container/node_modules
             - ./packages/core-database/node_modules
             - ./packages/core-database-postgres/node_modules
@@ -429,23 +427,20 @@ jobs:
           name: Create .ark/database directory
           command: mkdir -p $HOME/.ark/database
       - run:
-          name: core-webhooks
-          command: 'cd ~/ark-core/packages/core-webhooks && yarn test:coverage'
-      - run:
-          name: core-transaction-pool
-          command: 'cd ~/ark-core/packages/core-transaction-pool && yarn test:coverage'
+          name: core-utils
+          command: 'cd ~/ark-core/packages/core-utils && yarn test:coverage'
       - run:
-          name: core-logger-winston
-          command: 'cd ~/ark-core/packages/core-logger-winston && yarn test:coverage'
+          name: core-test-utils
+          command: 'cd ~/ark-core/packages/core-test-utils && yarn test:coverage'
       - run:
-          name: core-graphql
-          command: 'cd ~/ark-core/packages/core-graphql && yarn test:coverage'
+          name: core-p2p
+          command: 'cd ~/ark-core/packages/core-p2p && yarn test:coverage'
       - run:
-          name: core-deployer
-          command: 'cd ~/ark-core/packages/core-deployer && yarn test:coverage'
+          name: core-http-utils
+          command: 'cd ~/ark-core/packages/core-http-utils && yarn test:coverage'
       - run:
-          name: core-database
-          command: 'cd ~/ark-core/packages/core-database && yarn test:coverage'
+          name: core-event-emitter
+          command: 'cd ~/ark-core/packages/core-event-emitter && yarn test:coverage'
       - run:
           name: core-blockchain
           command: 'cd ~/ark-core/packages/core-blockchain && yarn test:coverage'
@@ -491,7 +486,6 @@ jobs:
             - ./packages/core/node_modules
             - ./packages/core-api/node_modules
             - ./packages/core-blockchain/node_modules
-            - ./packages/core-config/node_modules
             - ./packages/core-container/node_modules
             - ./packages/core-database/node_modules
             - ./packages/core-database-postgres/node_modules
@@ -572,7 +566,6 @@ jobs:
             - ./packages/core/node_modules
             - ./packages/core-api/node_modules
             - ./packages/core-blockchain/node_modules
-            - ./packages/core-config/node_modules
             - ./packages/core-container/node_modules
             - ./packages/core-database/node_modules
             - ./packages/core-database-postgres/node_modules
@@ -603,26 +596,23 @@ jobs:
           name: Create .ark/database directory
           command: mkdir -p $HOME/.ark/database
       - run:
-          name: core-vote-report
-          command: 'cd ~/ark-core/packages/core-vote-report && yarn test:coverage'
-      - run:
-          name: core-tester-cli
-          command: 'cd ~/ark-core/packages/core-tester-cli && yarn test:coverage'
+          name: core-webhooks
+          command: 'cd ~/ark-core/packages/core-webhooks && yarn test:coverage'
       - run:
-          name: core-snapshots
-          command: 'cd ~/ark-core/packages/core-snapshots && yarn test:coverage'
+          name: core-transaction-pool
+          command: 'cd ~/ark-core/packages/core-transaction-pool && yarn test:coverage'
       - run:
-          name: core-logger
-          command: 'cd ~/ark-core/packages/core-logger && yarn test:coverage'
+          name: core-logger-winston
+          command: 'cd ~/ark-core/packages/core-logger-winston && yarn test:coverage'
       - run:
-          name: core-forger
-          command: 'cd ~/ark-core/packages/core-forger && yarn test:coverage'
+          name: core-graphql
+          command: 'cd ~/ark-core/packages/core-graphql && yarn test:coverage'
       - run:
-          name: core-debugger-cli
-          command: 'cd ~/ark-core/packages/core-debugger-cli && yarn test:coverage'
+          name: core-deployer
+          command: 'cd ~/ark-core/packages/core-deployer && yarn test:coverage'
       - run:
-          name: core-container
-          command: 'cd ~/ark-core/packages/core-container && yarn test:coverage'
+          name: core-database
+          command: 'cd ~/ark-core/packages/core-database && yarn test:coverage'
       - run:
           name: core-api
           command: 'cd ~/ark-core/packages/core-api && yarn test:coverage'
@@ -668,7 +658,6 @@ jobs:
             - ./packages/core/node_modules
             - ./packages/core-api/node_modules
             - ./packages/core-blockchain/node_modules
-            - ./packages/core-config/node_modules
             - ./packages/core-container/node_modules
             - ./packages/core-database/node_modules
             - ./packages/core-database-postgres/node_modules
@@ -699,23 +688,20 @@ jobs:
           name: Create .ark/database directory
           command: mkdir -p $HOME/.ark/database
       - run:
-          name: core-webhooks
-          command: 'cd ~/ark-core/packages/core-webhooks && yarn test:coverage'
-      - run:
-          name: core-transaction-pool
-          command: 'cd ~/ark-core/packages/core-transaction-pool && yarn test:coverage'
+          name: core-utils
+          command: 'cd ~/ark-core/packages/core-utils && yarn test:coverage'
       - run:
-          name: core-logger-winston
-          command: 'cd ~/ark-core/packages/core-logger-winston && yarn test:coverage'
+          name: core-test-utils
+          command: 'cd ~/ark-core/packages/core-test-utils && yarn test:coverage'
       - run:
-          name: core-graphql
-          command: 'cd ~/ark-core/packages/core-graphql && yarn test:coverage'
+          name: core-p2p
+          command: 'cd ~/ark-core/packages/core-p2p && yarn test:coverage'
       - run:
-          name: core-deployer
-          command: 'cd ~/ark-core/packages/core-deployer && yarn test:coverage'
+          name: core-http-utils
+          command: 'cd ~/ark-core/packages/core-http-utils && yarn test:coverage'
       - run:
-          name: core-database
-          command: 'cd ~/ark-core/packages/core-database && yarn test:coverage'
+          name: core-event-emitter
+          command: 'cd ~/ark-core/packages/core-event-emitter && yarn test:coverage'
       - run:
           name: core-blockchain
           command: 'cd ~/ark-core/packages/core-blockchain && yarn test:coverage'

README.md

@@ -34,7 +34,6 @@ This repository contains all plugins that make up the Ark Core.
 | **[core](/packages/core)**                                         | [![npm](https://badgen.now.sh/npm/v/@arkecosystem/core)](https://www.npmjs.com/package/@arkecosystem/core)                                             | **Includes all packages**            |
 | [core-api](/packages/core-api)                                     | [![npm](https://badgen.now.sh/npm/v/@arkecosystem/core-api)](https://www.npmjs.com/package/@arkecosystem/core-api)                                     | Public REST API                      |
 | [core-blockchain](/packages/core-blockchain)                       | [![npm](https://badgen.now.sh/npm/v/@arkecosystem/core-blockchain)](https://www.npmjs.com/package/@arkecosystem/core-blockchain)                       | Blockchain Managment                 |
-| [core-config](/packages/core-config)                               | [![npm](https://badgen.now.sh/npm/v/@arkecosystem/core-config)](https://www.npmjs.com/package/@arkecosystem/core-config)                               | Configuration Loader                 |
 | [core-container](/packages/core-container)                         | [![npm](https://badgen.now.sh/npm/v/@arkecosystem/core-container)](https://www.npmjs.com/package/@arkecosystem/core-container)                         | Container Managment                  |
 | [core-database](/packages/core-database)                           | [![npm](https://badgen.now.sh/npm/v/@arkecosystem/core-database)](https://www.npmjs.com/package/@arkecosystem/core-database)                           | Database Interface                   |
 | [core-database-postgres](/packages/core-database-postgres)         | [![npm](https://badgen.now.sh/npm/v/@arkecosystem/core-database-postgres)](https://www.npmjs.com/package/@arkecosystem/core-database-postgres)         | Database Implementation - PostgreSQL |

greenkeeper.json

@@ -5,7 +5,6 @@
                 "package.json",
                 "packages/core-api/package.json",
                 "packages/core-blockchain/package.json",
-                "packages/core-config/package.json",
                 "packages/core-container/package.json",
                 "packages/core-database-postgres/package.json",
                 "packages/core-database/package.json",

packages/core-api/__tests__/repositories/transactions.test.ts

@@ -14,8 +14,6 @@ beforeAll(async () => {
 
     repository = new TransactionsRepository();
 
-    // Create the genesis block after the setup has finished or else it uses a potentially
-    // wrong network config.
     genesisTransaction = genesisBlock.transactions[0];
 });
 

packages/core-api/__tests__/v1/handlers/blocks.test.ts

@@ -1,3 +1,4 @@
+import { app } from "@arkecosystem/core-container";
 import "@arkecosystem/core-test-utils";
 import genesisBlock from "../../../../core-test-utils/src/config/testnet/genesisBlock.json";
 import { setUp, tearDown } from "../../__support__/setup";
@@ -75,10 +76,9 @@ describe("API 1.0 - Blocks", () => {
 
             expect(response.data.nethash).toBeString();
 
-            const { app: container } = require("@arkecosystem/core-container");
-            const config = container.resolvePlugin("config");
+            const config = app.getConfig();
 
-            expect(response.data.nethash).toBe(config.network.nethash);
+            expect(response.data.nethash).toBe(config.get("network.nethash"));
         });
     });
 

packages/core-api/__tests__/v2/handlers/delegates.test.ts

@@ -33,7 +33,7 @@ describe("API 2.0 - Delegates", () => {
                     const response = await utils[request]("GET", "delegates");
                     expect(response).toBeSuccessfulResponse();
                     expect(response.data.data).toBeArray();
-                    expect(response.data.data.sort((a, b) => (a.rank < b.rank))).toEqual(response.data.data);
+                    expect(response.data.data.sort((a, b) => a.rank < b.rank)).toEqual(response.data.data);
 
                     utils.expectDelegate(response.data.data[0]);
                 });
@@ -47,7 +47,7 @@ describe("API 2.0 - Delegates", () => {
                     const response = await utils[request]("GET", "delegates", { orderBy: "rank:desc" });
                     expect(response).toBeSuccessfulResponse();
                     expect(response.data.data).toBeArray();
-                    expect(response.data.data.sort((a, b) => (a.rank > b.rank))).toEqual(response.data.data);
+                    expect(response.data.data.sort((a, b) => a.rank > b.rank)).toEqual(response.data.data);
 
                     utils.expectDelegate(response.data.data[0]);
                 });

packages/core-api/src/plugins/validation/formats/address.ts

@@ -2,13 +2,13 @@ import { app } from "@arkecosystem/core-container";
 import * as bs58check from "bs58check";
 
 export function registerAddressFormat(ajv) {
-    const config = app.resolvePlugin("config");
+    const config = app.getConfig();
 
     ajv.addFormat("address", {
         type: "string",
         validate: value => {
             try {
-                return bs58check.decode(value)[0] === config.network.pubKeyHash;
+                return bs58check.decode(value)[0] === config.get("network.pubKeyHash");
             } catch (e) {
                 return false;
             }

packages/core-api/src/repositories/transactions.ts

@@ -156,7 +156,7 @@ export class TransactionsRepository extends Repository implements IRepository {
      */
     public async allVotesBySender(senderPublicKey, parameters: any = {}): Promise<any> {
         return this.findAll({
-            ...{ senderPublicKey, type: constants.TRANSACTION_TYPES.VOTE },
+            ...{ senderPublicKey, type: constants.TransactionTypes.Vote },
             ...parameters,
         });
     }

packages/core-api/src/versions/1/accounts/controller.ts

@@ -11,7 +11,7 @@ export class AccountsController extends Controller {
     public constructor() {
         super();
 
-        this.config = app.resolvePlugin("config");
+        this.config = app.getConfig();
         this.database = app.resolvePlugin("database");
         this.blockchain = app.resolvePlugin("blockchain");
     }
@@ -59,7 +59,7 @@ export class AccountsController extends Controller {
     public async fee(request: Hapi.Request, h: Hapi.ResponseToolkit) {
         try {
             return super.respondWith({
-                fee: this.config.getConstants(this.blockchain.getLastHeight()).fees.staticFees.delegateRegistration,
+                fee: this.config.getMilestone(this.blockchain.getLastHeight()).fees.staticFees.delegateRegistration,
             });
         } catch (error) {
             return Boom.badImplementation(error);