Merge remote-tracking branch 'ArkEcosystem/core/develop' into verify-…

…peer-state

* ArkEcosystem/core/develop:
  chore: few upgrade script fixes (#2060)
  misc: add github templates for docs, security and support (#2059)
  fix: remove entries with double and single quotes during the upgrade
  fix: syntax error in upgrade script
  fix(crypto): disable multisig (#2057)
  chore: add bash fallback for ARK > CORE in upgrade script
  refactor: move genesisBlock to network config and remove extraneous config (#2052)
  chore: store development docker files in docker/development (#2053)

.github/ISSUE_TEMPLATE/Documentation_issue.md

@@ -0,0 +1,8 @@
+---
+name: "Documentation Issue"
+about: "For documentation issues, see: https://github.com/ArkEcosystem/docs/issues"
+---
+
+The Ark Core documentation has its own dedicated repository. Please open your documentation-related issue at https://github.com/ArkEcosystem/docs/issues. **However, it's best to simply make a pull request to correct the issue you have found!**
+
+Thanks!

.github/ISSUE_TEMPLATE/Security_vulnerabilities.md

@@ -0,0 +1,8 @@
+---
+name: "Security Vulnerabilities"
+about: "For reporting security-related issues, see: https://docs.ark.io/security/"
+---
+
+PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
+
+If you discover a security vulnerability within Core, please send an e-mail to [email protected]. All security vulnerabilities will be promptly addressed.

.github/ISSUE_TEMPLATE/Support_question.md

@@ -0,0 +1,8 @@
+---
+name: "Support Question"
+about: "This repository is only for reporting bugs or problems."
+---
+
+This repository is only for reporting bugs or issues. If you need support, please send an e-mail to [email protected].
+
+Thanks!

packages/core-container/__tests__/config/loaders/file-loader.test.ts

@@ -8,10 +8,6 @@ const stubConfigPath = resolve(__dirname, "../../__stubs__/config");
 
 const stubConfig = {
     delegates: require(resolve(__dirname, "../../__stubs__/config/delegates")),
-    exceptions: require(resolve(__dirname, "../../__stubs__/config/exceptions")),
-    genesisBlock: require(resolve(__dirname, "../../__stubs__/config/genesisBlock")),
-    milestones: require(resolve(__dirname, "../../__stubs__/config/milestones")),
-    network: require(resolve(__dirname, "../../__stubs__/config/network")),
     peers: require(resolve(__dirname, "../../__stubs__/config/peers")),
     plugins: require(resolve(__dirname, "../../__stubs__/config/plugins")),
 };
@@ -33,7 +29,6 @@ describe("File Loader", () => {
         const { config } = await fileLoader.setUp(Network.setUp({}));
 
         expect(config.delegates).toEqual(stubConfig.delegates);
-        expect(config.genesisBlock).toEqual(stubConfig.genesisBlock);
         expect(config.peers).toEqual(stubConfig.peers);
     });
 });

packages/core-container/src/config/index.ts

@@ -53,6 +53,7 @@ class Config {
         this.config.network = crypto.all();
         this.config.exceptions = crypto.get("exceptions");
         this.config.milestones = crypto.get("milestones");
+        this.config.genesisBlock = crypto.get("genesisBlock");
 
         // Calculate milestone hash
         const milestonesBuffer = Buffer.from(JSON.stringify(this.config.milestones));

packages/core-container/src/config/network.ts

@@ -22,6 +22,7 @@ export class Network {
                 config = {
                     exceptions: require(`${networkPath}/exceptions`),
                     milestones: require(`${networkPath}/milestones`),
+                    genesisBlock: require(`${networkPath}/genesisBlock`),
                     network: require(`${networkPath}/network`),
                 };
             } catch (error) {

packages/core-container/src/config/schema.ts

@@ -10,6 +10,7 @@ export const schemaNetwork = Joi.object({
         outlookTable: Joi.object(),
         transactionIdFixTable: Joi.object(),
     }).default({ exceptions: {} }),
+    genesisBlock: Joi.object().required(),
     network: Joi.object({
         name: Joi.string().required(),
         messagePrefix: Joi.string().required(),
@@ -46,5 +47,4 @@ export const schemaConfig = Joi.object({
     }),
     peers: Joi.object().required(),
     plugins: Joi.object().required(),
-    genesisBlock: Joi.object().required(),
 }).unknown();