diff --git a/CHANGELOG.md b/CHANGELOG.md index ae6a163e91..a6bbd247c6 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/lerna.json b/lerna.json index 8d2adf7681..f4d4b229bd 100644 --- a/lerna.json +++ b/lerna.json @@ -3,5 +3,5 @@ "npmClient": "yarn", "packages": ["packages/*", "plugins/*"], "useWorkspaces": true, - "version": "2.3.15" + "version": "2.3.18" } diff --git a/packages/core-api/package.json b/packages/core-api/package.json index 594305e260..2eb2fc564a 100644 --- a/packages/core-api/package.json +++ b/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č ", "Brian Faust " @@ -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", diff --git a/packages/core-blockchain/package.json b/packages/core-blockchain/package.json index 83c2b1d1e2..732d9630b7 100644 --- a/packages/core-blockchain/package.json +++ b/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 ", "Kristjan Košič ", @@ -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", diff --git a/packages/core-container/package.json b/packages/core-container/package.json index 7d91dd8932..509e2d9283 100644 --- a/packages/core-container/package.json +++ b/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 " ], @@ -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", diff --git a/packages/core-database-postgres/package.json b/packages/core-database-postgres/package.json index d4e05bde88..6b76d87603 100644 --- a/packages/core-database-postgres/package.json +++ b/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 " ], @@ -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", diff --git a/packages/core-database/package.json b/packages/core-database/package.json index ef63d78c77..7c7d76bf89 100644 --- a/packages/core-database/package.json +++ b/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 ", "Kristjan Košič ", @@ -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", diff --git a/packages/core-database/src/database-service.ts b/packages/core-database/src/database-service.ts index c07ce444e7..b8852113fb 100644 --- a/packages/core-database/src/database-service.ts +++ b/packages/core-database/src/database-service.ts @@ -44,6 +44,12 @@ export class DatabaseService implements Database.IDatabaseService { } public async init(): Promise { + const lastBlock: Interfaces.IBlock = await this.getLastBlock(); + + if (lastBlock) { + Managers.configManager.setHeight(lastBlock.data.height); + } + await this.loadBlocksFromCurrentRound(); await this.createGenesisBlock(); } diff --git a/packages/core-elasticsearch/package.json b/packages/core-elasticsearch/package.json index 266577ba17..9622113976 100644 --- a/packages/core-elasticsearch/package.json +++ b/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 " ], @@ -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", diff --git a/packages/core-error-tracker-airbrake/package.json b/packages/core-error-tracker-airbrake/package.json index 7e182d7692..c238870eac 100644 --- a/packages/core-error-tracker-airbrake/package.json +++ b/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 " ], @@ -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": { diff --git a/packages/core-error-tracker-bugsnag/package.json b/packages/core-error-tracker-bugsnag/package.json index ccc4640c8a..81b5bc1f92 100644 --- a/packages/core-error-tracker-bugsnag/package.json +++ b/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 " ], @@ -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": { diff --git a/packages/core-error-tracker-raygun/package.json b/packages/core-error-tracker-raygun/package.json index 8e2b40f4d5..67e73fc044 100644 --- a/packages/core-error-tracker-raygun/package.json +++ b/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 " ], @@ -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": { diff --git a/packages/core-error-tracker-rollbar/package.json b/packages/core-error-tracker-rollbar/package.json index adf592115c..2e1b03a801 100644 --- a/packages/core-error-tracker-rollbar/package.json +++ b/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 " ], @@ -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": { diff --git a/packages/core-error-tracker-sentry/package.json b/packages/core-error-tracker-sentry/package.json index 212a3f00e1..f766f3e60f 100644 --- a/packages/core-error-tracker-sentry/package.json +++ b/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 " ], @@ -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": { diff --git a/packages/core-event-emitter/package.json b/packages/core-event-emitter/package.json index 2d3ef72bc8..05d10ba7e6 100644 --- a/packages/core-event-emitter/package.json +++ b/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 " ], diff --git a/packages/core-forger/package.json b/packages/core-forger/package.json index 8b1fb6e863..3436ad2ba7 100644 --- a/packages/core-forger/package.json +++ b/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 ", "Kristjan Košič ", @@ -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", diff --git a/packages/core-forger/src/manager.ts b/packages/core-forger/src/manager.ts index db8811c95a..3ddb8f34a5 100644 --- a/packages/core-forger/src/manager.ts +++ b/packages/core-forger/src/manager.ts @@ -136,12 +136,14 @@ export class ForgerManager { round: P2P.ICurrentRound, networkState: P2P.INetworkState, ): Promise { + 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, diff --git a/packages/core-http-utils/package.json b/packages/core-http-utils/package.json index 05ca02f7b7..7f2b928d80 100644 --- a/packages/core-http-utils/package.json +++ b/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 " ], @@ -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", diff --git a/packages/core-interfaces/package.json b/packages/core-interfaces/package.json index 1afcb8ad35..057ad9b659 100644 --- a/packages/core-interfaces/package.json +++ b/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 ", "Kristjan Košič ", @@ -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" }, diff --git a/packages/core-jest-matchers/package.json b/packages/core-jest-matchers/package.json index 5ee39f14fc..e0e1100e31 100644 --- a/packages/core-jest-matchers/package.json +++ b/packages/core-jest-matchers/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-jest-matchers", "description": "Jest matchers for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust ", "Erwann Gentric ", @@ -20,8 +20,8 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/crypto": "^2.3.15", + "@arkecosystem/core-container": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "@arkecosystem/utils": "^0.3.0", "bip39": "^3.0.1", "jest-extended": "^0.11.1", diff --git a/packages/core-json-rpc/package.json b/packages/core-json-rpc/package.json index db2397a725..87a84a3552 100644 --- a/packages/core-json-rpc/package.json +++ b/packages/core-json-rpc/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-json-rpc", "description": "A JSON-RPC 2.0 Specification compliant server to interact with the ARK Blockchain.", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "François-Xavier Thoorens ", "Brian Faust " @@ -20,11 +20,11 @@ "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-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-utils": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "@keyv/sqlite": "^2.0.0", "bip39": "^3.0.1", "boom": "^7.3.0", @@ -35,7 +35,7 @@ "wif": "^2.0.6" }, "devDependencies": { - "@arkecosystem/core-p2p": "^2.3.15", + "@arkecosystem/core-p2p": "^2.3.18", "@types/bip39": "^2.4.2", "@types/boom": "^7.2.1", "@types/is-reachable": "^3.0.0", diff --git a/packages/core-logger-pino/package.json b/packages/core-logger-pino/package.json index d950d25c37..5ef5d35d0a 100644 --- a/packages/core-logger-pino/package.json +++ b/packages/core-logger-pino/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-logger-pino", "description": "Pino integration for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust " ], @@ -19,9 +19,9 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/core-interfaces": "^2.3.15", - "@arkecosystem/core-logger": "^2.3.15", + "@arkecosystem/core-container": "^2.3.18", + "@arkecosystem/core-interfaces": "^2.3.18", + "@arkecosystem/core-logger": "^2.3.18", "pino": "^5.12.2", "pino-pretty": "^2.6.1", "pump": "^3.0.0", diff --git a/packages/core-logger-signale/package.json b/packages/core-logger-signale/package.json index 9bc44f9604..add39c5d2f 100644 --- a/packages/core-logger-signale/package.json +++ b/packages/core-logger-signale/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-logger-signale", "description": "Signale integration for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust " ], @@ -19,8 +19,8 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-interfaces": "^2.3.15", - "@arkecosystem/core-logger": "^2.3.15", + "@arkecosystem/core-interfaces": "^2.3.18", + "@arkecosystem/core-logger": "^2.3.18", "signale": "^1.4.0" }, "publishConfig": { diff --git a/packages/core-logger-winston/package.json b/packages/core-logger-winston/package.json index 1ef96e26ab..d0c201028e 100644 --- a/packages/core-logger-winston/package.json +++ b/packages/core-logger-winston/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-logger-winston", "description": "Winston Logger for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "François-Xavier Thoorens ", "Brian Faust " @@ -20,8 +20,8 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-interfaces": "^2.3.15", - "@arkecosystem/core-logger": "^2.3.15", + "@arkecosystem/core-interfaces": "^2.3.18", + "@arkecosystem/core-logger": "^2.3.18", "@faustbrian/dato": "^0.3.0", "chalk": "^2.4.2", "colors": "^1.3.3", diff --git a/packages/core-logger/package.json b/packages/core-logger/package.json index 96bc60588b..f8b88bcec3 100644 --- a/packages/core-logger/package.json +++ b/packages/core-logger/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-logger", "description": "Logger Manager for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust " ], @@ -19,8 +19,8 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/core-interfaces": "^2.3.15", + "@arkecosystem/core-container": "^2.3.18", + "@arkecosystem/core-interfaces": "^2.3.18", "lodash.isempty": "^4.4.0" }, "devDependencies": { diff --git a/packages/core-new-relic/package.json b/packages/core-new-relic/package.json index 0ffa19a240..2d25f6a732 100644 --- a/packages/core-new-relic/package.json +++ b/packages/core-new-relic/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-new-relic", "description": "New Relic integration for ARK Core.", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust " ], @@ -18,7 +18,7 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", + "@arkecosystem/core-container": "^2.3.18", "newrelic": "^5.6.4" }, "publishConfig": { diff --git a/packages/core-p2p/package.json b/packages/core-p2p/package.json index 801392af2e..1e1528c7ca 100644 --- a/packages/core-p2p/package.json +++ b/packages/core-p2p/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-p2p", "description": "P2P API for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "François-Xavier Thoorens ", "Kristjan Košič ", @@ -23,12 +23,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", "@faustbrian/dato": "^0.3.0", "ajv": "^6.10.0", "boom": "^7.3.0", diff --git a/packages/core-snapshots/package.json b/packages/core-snapshots/package.json index 563ec3d84b..3eae617c8f 100644 --- a/packages/core-snapshots/package.json +++ b/packages/core-snapshots/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-snapshots", "description": "Provides live local streamed snapshots functionality for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Kristjan Košič " ], @@ -20,11 +20,11 @@ "copy": "cd src/ && cpy './**/*.sql' --parents ../dist/ && cd ../" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/core-database-postgres": "^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-postgres": "^2.3.18", + "@arkecosystem/core-interfaces": "^2.3.18", + "@arkecosystem/core-utils": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "JSONStream": "^1.3.5", "cpy-cli": "^2.0.0", "create-hash": "^1.2.0", diff --git a/packages/core-snapshots/src/manager.ts b/packages/core-snapshots/src/manager.ts index bdaac23394..ff771f304c 100644 --- a/packages/core-snapshots/src/manager.ts +++ b/packages/core-snapshots/src/manager.ts @@ -47,22 +47,23 @@ export class SnapshotManager { const params = await this.init(options); if (params.truncate) { - params.lastBlock = await this.database.truncate(); + await this.database.truncate(); + params.lastBlock = null; } await importTable("blocks", params); await importTable("transactions", params); const lastBlock = await this.database.getLastBlock(); + const height = lastBlock.height as number; logger.info( - `Import from folder ${ - params.meta.folder - } completed. Last block in database: ${lastBlock.height.toLocaleString()}`, + `Import from folder ${params.meta.folder} completed. Last block in database: ${height.toLocaleString()}`, ); if (!params.skipRestartRound) { - const newLastBlock = await this.database.rollbackChain(lastBlock.height); + const roundInfo = roundCalculator.calculateRound(height); + const newLastBlock = await this.database.rollbackChain(roundInfo); logger.info( `Rolling back chain to last finished round with last block height ${newLastBlock.height.toLocaleString()}`, ); diff --git a/packages/core-state/package.json b/packages/core-state/package.json index 9459328985..4edbbfc9cd 100644 --- a/packages/core-state/package.json +++ b/packages/core-state/package.json @@ -1,8 +1,9 @@ { "name": "@arkecosystem/core-state", "description": "State Management for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ + "Brian Faust ", "Joshua Noack " ], "license": "MIT", @@ -20,9 +21,9 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/core-interfaces": "^2.3.15", - "@arkecosystem/crypto": "^2.3.15", + "@arkecosystem/core-container": "^2.3.18", + "@arkecosystem/core-interfaces": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "immutable": "^4.0.0-rc.12" }, "publishConfig": { diff --git a/packages/core-tester-cli/package.json b/packages/core-tester-cli/package.json index c15f204037..328b23f0d7 100644 --- a/packages/core-tester-cli/package.json +++ b/packages/core-tester-cli/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-tester-cli", "description": "Tester CLI for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust ", "Alex Barnsley " @@ -28,9 +28,9 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-forger": "^2.3.15", - "@arkecosystem/core-utils": "^2.3.15", - "@arkecosystem/crypto": "^2.3.15", + "@arkecosystem/core-forger": "^2.3.18", + "@arkecosystem/core-utils": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "@oclif/command": "^1.5.13", "@oclif/config": "^1.12.12", "@oclif/plugin-help": "^2.1.6", diff --git a/packages/core-transaction-pool/package.json b/packages/core-transaction-pool/package.json index cfa74303cb..b22e629208 100644 --- a/packages/core-transaction-pool/package.json +++ b/packages/core-transaction-pool/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-transaction-pool", "description": "Transaction Pool Manager for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Kristjan Košič ", "Brian Faust ", @@ -24,11 +24,11 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/core-database": "^2.3.15", - "@arkecosystem/core-interfaces": "^2.3.15", - "@arkecosystem/core-transactions": "^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-transactions": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "@faustbrian/dato": "^0.3.0", "@types/better-sqlite3": "^5.2.3", "@types/fs-extra": "^5.0.5", @@ -40,7 +40,7 @@ "pluralize": "^7.0.0" }, "devDependencies": { - "@arkecosystem/core-utils": "^2.3.15", + "@arkecosystem/core-utils": "^2.3.18", "@types/better-sqlite3": "^5.2.3", "@types/bip39": "^2.4.2", "@types/fs-extra": "^5.0.5", diff --git a/packages/core-transactions/package.json b/packages/core-transactions/package.json index ad659c6023..c943a91ac5 100644 --- a/packages/core-transactions/package.json +++ b/packages/core-transactions/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-transactions", "description": "Transaction Services for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Joshua Noack " ], @@ -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", "bs58check": "^2.1.2" }, "publishConfig": { diff --git a/packages/core-utils/package.json b/packages/core-utils/package.json index 669b03875b..f370737a56 100644 --- a/packages/core-utils/package.json +++ b/packages/core-utils/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-utils", "description": "Utilities for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust " ], @@ -18,9 +18,9 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/core-interfaces": "^2.3.15", - "@arkecosystem/crypto": "^2.3.15", + "@arkecosystem/core-container": "^2.3.18", + "@arkecosystem/core-interfaces": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "@faustbrian/dato": "^0.3.0", "cli-table3": "^0.5.1", "fast-json-parse": "^1.0.3", diff --git a/packages/core-vote-report/package.json b/packages/core-vote-report/package.json index 8e2d6d65a2..cf07e6dad5 100644 --- a/packages/core-vote-report/package.json +++ b/packages/core-vote-report/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-vote-report", "description": "Vote Report for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust " ], @@ -18,10 +18,10 @@ "clean": "del dist" }, "dependencies": { - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/core-http-utils": "^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-utils": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "handlebars": "^4.1.2", "lodash.sumby": "^4.6.0", "vision": "^5.4.4" diff --git a/packages/core-webhooks/package.json b/packages/core-webhooks/package.json index 2423e5b95b..92a08945c7 100644 --- a/packages/core-webhooks/package.json +++ b/packages/core-webhooks/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core-webhooks", "description": "Webhooks for ARK Core", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "Brian Faust " ], @@ -19,11 +19,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/core-utils": "^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/core-utils": "^2.3.18", "boom": "^7.3.0", "fs-extra": "^7.0.1", "joi": "^14.3.1", diff --git a/packages/core/package.json b/packages/core/package.json index 42c59b5bc8..468cd343d5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/core", "description": "Core of the ARK Blockchain", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "François-Xavier Thoorens ", "Kristjan Košič ", @@ -44,21 +44,21 @@ "full:testnet": "cross-env CORE_PATH_CONFIG=./bin/config/testnet CORE_ENV=test yarn ark core:run --networkStart" }, "dependencies": { - "@arkecosystem/core-api": "^2.3.15", - "@arkecosystem/core-blockchain": "^2.3.15", - "@arkecosystem/core-container": "^2.3.15", - "@arkecosystem/core-database-postgres": "^2.3.15", - "@arkecosystem/core-event-emitter": "^2.3.15", - "@arkecosystem/core-forger": "^2.3.15", - "@arkecosystem/core-json-rpc": "^2.3.15", - "@arkecosystem/core-logger-pino": "^2.3.15", - "@arkecosystem/core-p2p": "^2.3.15", - "@arkecosystem/core-snapshots": "^2.3.15", - "@arkecosystem/core-state": "^2.3.15", - "@arkecosystem/core-transaction-pool": "^2.3.15", - "@arkecosystem/core-utils": "^2.3.15", - "@arkecosystem/core-webhooks": "^2.3.15", - "@arkecosystem/crypto": "^2.3.15", + "@arkecosystem/core-api": "^2.3.18", + "@arkecosystem/core-blockchain": "^2.3.18", + "@arkecosystem/core-container": "^2.3.18", + "@arkecosystem/core-database-postgres": "^2.3.18", + "@arkecosystem/core-event-emitter": "^2.3.18", + "@arkecosystem/core-forger": "^2.3.18", + "@arkecosystem/core-json-rpc": "^2.3.18", + "@arkecosystem/core-logger-pino": "^2.3.18", + "@arkecosystem/core-p2p": "^2.3.18", + "@arkecosystem/core-snapshots": "^2.3.18", + "@arkecosystem/core-state": "^2.3.18", + "@arkecosystem/core-transaction-pool": "^2.3.18", + "@arkecosystem/core-utils": "^2.3.18", + "@arkecosystem/core-webhooks": "^2.3.18", + "@arkecosystem/crypto": "^2.3.18", "@faustbrian/dato": "^0.3.0", "@oclif/command": "^1.5.13", "@oclif/config": "^1.12.12", diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 2d7e0c66f2..ce0d8d0e2e 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -1,7 +1,7 @@ { "name": "@arkecosystem/crypto", "description": "Crypto utilities for the ARK Blockchain", - "version": "2.3.15", + "version": "2.3.18", "contributors": [ "François-Xavier Thoorens ", "Brian Faust ", diff --git a/packages/crypto/src/blocks/serializer.ts b/packages/crypto/src/blocks/serializer.ts index 7f3368bbf2..71107498e3 100644 --- a/packages/crypto/src/blocks/serializer.ts +++ b/packages/crypto/src/blocks/serializer.ts @@ -38,7 +38,7 @@ export class Serializer { } private static serializeHeader(block: IBlockData, buffer: ByteBuffer): void { - const constants = configManager.getMilestone(block.height - 1); + const constants = configManager.getMilestone(block.height - 1 || 1); if (constants.block.idFullSha256) { if (block.previousBlock.length !== 64) {