Merge branch 'master' into develop

CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.3.18] - 2019-04-26
+
+### Fixed
+
+-   Reset unfinished round after importing a snapshot ([#2486])
+-   Update the height of the crypto config manager for milestones in the forger _(only caused an issue for split setups)_ ([#2487])
+
+## [2.3.16] - 2019-04-25
+
+### Fixed
+
+-   Initialise the crypto config manager with the latest height on boot ([#2482])
+
 ## [2.3.15] - 2019-04-25
 
 Fix release of `2.3.14` due to npm connectivity issues.
@@ -309,6 +322,8 @@ Closed security vulnerabilities:
 -   Initial Release
 
 [unreleased]: https://github.com/ARKEcosystem/core/compare/2.3.0...develop
+[2.3.18]: https://github.com/ARKEcosystem/core/compare/2.3.16...2.3.18
+[2.3.16]: https://github.com/ARKEcosystem/core/compare/2.3.15...2.3.16
 [2.3.15]: https://github.com/ARKEcosystem/core/compare/2.3.14...2.3.15
 [2.3.14]: https://github.com/ARKEcosystem/core/compare/2.3.12...2.3.14
 [2.3.12]: https://github.com/ARKEcosystem/core/compare/2.3.1...2.3.12
@@ -470,3 +485,6 @@ Closed security vulnerabilities:
 [#2464]: https://github.com/ARKEcosystem/core/pull/2464
 [#2471]: https://github.com/ARKEcosystem/core/pull/2471
 [#2476]: https://github.com/ARKEcosystem/core/pull/2476
+[#2482]: https://github.com/ARKEcosystem/core/pull/2482
+[#2486]: https://github.com/ARKEcosystem/core/pull/2486
+[#2487]: https://github.com/ARKEcosystem/core/pull/2487

lerna.json

@@ -3,5 +3,5 @@
     "npmClient": "yarn",
     "packages": ["packages/*", "plugins/*"],
     "useWorkspaces": true,
-    "version": "2.3.15"
+    "version": "2.3.18"
 }

packages/core-api/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-api",
     "description": "Public API for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Kristjan Košič <[email protected]>",
         "Brian Faust <[email protected]>"
@@ -21,12 +21,12 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
-        "@arkecosystem/core-http-utils": "^2.3.15",
-        "@arkecosystem/core-interfaces": "^2.3.15",
-        "@arkecosystem/core-transaction-pool": "^2.3.15",
-        "@arkecosystem/core-utils": "^2.3.15",
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
+        "@arkecosystem/core-http-utils": "^2.3.18",
+        "@arkecosystem/core-interfaces": "^2.3.18",
+        "@arkecosystem/core-transaction-pool": "^2.3.18",
+        "@arkecosystem/core-utils": "^2.3.18",
+        "@arkecosystem/crypto": "^2.3.18",
         "@arkecosystem/utils": "^0.3.0",
         "@faustbrian/dato": "^0.3.0",
         "@faustbrian/hapi-version": "^0.2.11",

packages/core-blockchain/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-blockchain",
     "description": "Blockchain Manager for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "François-Xavier Thoorens <[email protected]>",
         "Kristjan Košič <[email protected]>",
@@ -22,10 +22,10 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
-        "@arkecosystem/core-interfaces": "^2.3.15",
-        "@arkecosystem/core-utils": "^2.3.15",
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
+        "@arkecosystem/core-interfaces": "^2.3.18",
+        "@arkecosystem/core-utils": "^2.3.18",
+        "@arkecosystem/crypto": "^2.3.18",
         "async": "^2.6.2",
         "delay": "^4.2.0",
         "immutable": "^4.0.0-rc.12",
@@ -35,7 +35,7 @@
         "xstate": "^4.5.0"
     },
     "devDependencies": {
-        "@arkecosystem/core-p2p": "^2.3.15",
+        "@arkecosystem/core-p2p": "^2.3.18",
         "@types/async": "^2.4.1",
         "@types/lodash.get": "^4.4.6",
         "@types/pluralize": "^0.0.29",

packages/core-container/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-container",
     "description": "Container for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -19,8 +19,8 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-interfaces": "^2.3.15",
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/core-interfaces": "^2.3.18",
+        "@arkecosystem/crypto": "^2.3.18",
         "awilix": "^4.2.1",
         "delay": "^4.2.0",
         "env-paths": "^2.2.0",

packages/core-database-postgres/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-database-postgres",
     "description": "PostgreSQL integration for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -21,11 +21,11 @@
         "copy": "cd src/ && cpy './**/*.sql' --parents ../dist/ && cd ../"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
-        "@arkecosystem/core-database": "^2.3.15",
-        "@arkecosystem/core-interfaces": "^2.3.15",
-        "@arkecosystem/core-utils": "^2.3.15",
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
+        "@arkecosystem/core-database": "^2.3.18",
+        "@arkecosystem/core-interfaces": "^2.3.18",
+        "@arkecosystem/core-utils": "^2.3.18",
+        "@arkecosystem/crypto": "^2.3.18",
         "@arkecosystem/utils": "^0.3.0",
         "@faustbrian/dato": "^0.3.0",
         "@types/bluebird": "^3.5.26",

packages/core-database/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-database",
     "description": "Database Interface for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "François-Xavier Thoorens <[email protected]>",
         "Kristjan Košič <[email protected]>",
@@ -22,12 +22,12 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
-        "@arkecosystem/core-event-emitter": "^2.3.15",
-        "@arkecosystem/core-interfaces": "^2.3.15",
-        "@arkecosystem/core-transactions": "^2.3.15",
-        "@arkecosystem/core-utils": "^2.3.15",
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
+        "@arkecosystem/core-event-emitter": "^2.3.18",
+        "@arkecosystem/core-interfaces": "^2.3.18",
+        "@arkecosystem/core-transactions": "^2.3.18",
+        "@arkecosystem/core-utils": "^2.3.18",
+        "@arkecosystem/crypto": "^2.3.18",
         "@arkecosystem/utils": "^0.3.0",
         "lodash.clonedeep": "^4.5.0",
         "lodash.compact": "^3.0.1",

packages/core-database/src/database-service.ts

@@ -44,6 +44,12 @@ export class DatabaseService implements Database.IDatabaseService {
     }
 
     public async init(): Promise<void> {
+        const lastBlock: Interfaces.IBlock = await this.getLastBlock();
+
+        if (lastBlock) {
+            Managers.configManager.setHeight(lastBlock.data.height);
+        }
+
         await this.loadBlocksFromCurrentRound();
         await this.createGenesisBlock();
     }

packages/core-elasticsearch/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-elasticsearch",
     "description": "A powerful Elasticsearch integration for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -18,11 +18,11 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
-        "@arkecosystem/core-event-emitter": "^2.3.15",
-        "@arkecosystem/core-http-utils": "^2.3.15",
-        "@arkecosystem/core-interfaces": "^2.3.15",
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
+        "@arkecosystem/core-event-emitter": "^2.3.18",
+        "@arkecosystem/core-http-utils": "^2.3.18",
+        "@arkecosystem/core-interfaces": "^2.3.18",
+        "@arkecosystem/crypto": "^2.3.18",
         "boom": "^7.3.0",
         "elasticsearch": "^15.4.1",
         "fs-extra": "^7.0.1",

packages/core-error-tracker-airbrake/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-error-tracker-airbrake",
     "description": "Airbrake error tracker integration for ARK Core.",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -18,7 +18,7 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
         "airbrake-js": "^1.6.6"
     },
     "publishConfig": {

packages/core-error-tracker-bugsnag/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-error-tracker-bugsnag",
     "description": "Bugsnag error tracker integration for ARK Core.",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -18,7 +18,7 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
         "@bugsnag/js": "^6.1.0"
     },
     "publishConfig": {

packages/core-error-tracker-raygun/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-error-tracker-raygun",
     "description": "Raygun error tracker integration for ARK Core.",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -18,7 +18,7 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
         "raygun": "^0.10.1"
     },
     "publishConfig": {

packages/core-error-tracker-rollbar/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-error-tracker-rollbar",
     "description": "Rollbar error tracker integration for ARK Core.",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -18,7 +18,7 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
         "rollbar": "^2.6.0"
     },
     "publishConfig": {

packages/core-error-tracker-sentry/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-error-tracker-sentry",
     "description": "Sentry error tracker integration for ARK Core.",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -18,7 +18,7 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
         "@sentry/node": "^5.1.0"
     },
     "publishConfig": {

packages/core-event-emitter/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-event-emitter",
     "description": "Event Manager for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],

packages/core-forger/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-forger",
     "description": "Forger for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "François-Xavier Thoorens <[email protected]>",
         "Kristjan Košič <[email protected]>",
@@ -21,11 +21,11 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
-        "@arkecosystem/core-interfaces": "^2.3.15",
-        "@arkecosystem/core-p2p": "^2.3.15",
-        "@arkecosystem/core-utils": "^2.3.15",
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
+        "@arkecosystem/core-interfaces": "^2.3.18",
+        "@arkecosystem/core-p2p": "^2.3.18",
+        "@arkecosystem/core-utils": "^2.3.18",
+        "@arkecosystem/crypto": "^2.3.18",
         "delay": "^4.2.0",
         "lodash.isempty": "^4.4.0",
         "lodash.uniq": "^4.5.0",

packages/core-forger/src/manager.ts

@@ -136,12 +136,14 @@ export class ForgerManager {
         round: P2P.ICurrentRound,
         networkState: P2P.INetworkState,
     ): Promise<void> {
+        Managers.configManager.setHeight(networkState.nodeHeight);
+
         const transactions: Interfaces.ITransactionData[] = await this.getTransactionsForForging();
 
         const block: Interfaces.IBlock = delegate.forge(transactions, {
             previousBlock: {
                 id: networkState.lastBlockId,
-                idHex: Managers.configManager.getMilestone(networkState.nodeHeight).block.idFullSha256
+                idHex: Managers.configManager.getMilestone().block.idFullSha256
                     ? networkState.lastBlockId
                     : Blocks.Block.toBytesHex(networkState.lastBlockId),
                 height: networkState.nodeHeight,

packages/core-http-utils/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-http-utils",
     "description": "Http Utilities for ARK Core",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "Brian Faust <[email protected]>"
     ],
@@ -18,9 +18,9 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.3.15",
-        "@arkecosystem/core-utils": "^2.3.15",
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/core-container": "^2.3.18",
+        "@arkecosystem/core-utils": "^2.3.18",
+        "@arkecosystem/crypto": "^2.3.18",
         "boom": "^7.3.0",
         "expand-home-dir": "^0.0.3",
         "good": "^8.1.2",

packages/core-interfaces/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-interfaces",
     "description": "Interface types for essential ARK Core modules",
-    "version": "2.3.15",
+    "version": "2.3.18",
     "contributors": [
         "François-Xavier Thoorens <[email protected]>",
         "Kristjan Košič <[email protected]>",
@@ -23,7 +23,7 @@
         "clean": "del dist"
     },
     "dependencies": {
-        "@arkecosystem/crypto": "^2.3.15",
+        "@arkecosystem/crypto": "^2.3.18",
         "@faustbrian/dato": "^0.3.0",
         "awilix": "^4.2.1"
     },