Skip to content

Commit 64f2277

Browse files
faustbrianfaustbrian
authored
Merge pull request #2097 from supaiku0/2.1.2
2 parents 9a4397b + e227cf7 commit 64f2277

File tree

49 files changed

+4923
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+4923
-71
lines changed

‎CHANGELOG.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
## [2.1.2] - 2019-02-13
11+
12+
### Fixed
13+
14+
- Fix quorum related issues
15+
- Limit payload size
16+
- Remove `signatures` from transaction payload
17+
1018
## [2.1.1] - 2019-02-12
1119

1220
### Fixed
@@ -184,7 +192,8 @@ Closed security vulnerabilities:
184192

185193
- Initial Release
186194

187-
[unreleased]: https://github.com/ArkEcosystem/core/compare/2.1.1...develop
195+
[unreleased]: https://github.com/ArkEcosystem/core/compare/2.1.2...develop
196+
[2.1.2]: https://github.com/ArkEcosystem/core/compare/2.1.1..2.1.2
188197
[2.1.1]: https://github.com/ArkEcosystem/core/compare/2.1.0..2.1.1
189198
[2.1.0]: https://github.com/ArkEcosystem/core/compare/2.0.19...2.1.0
190199
[2.0.19]: https://github.com/ArkEcosystem/core/compare/2.0.18...2.0.19
@@ -280,3 +289,4 @@ Closed security vulnerabilities:
280289
[#2080]: https://github.com/ArkEcosystem/core/pull/2080
281290
[#2082]: https://github.com/ArkEcosystem/core/pull/2082
282291
[#2083]: https://github.com/ArkEcosystem/core/pull/2083
292+
[#2091]: https://github.com/ArkEcosystem/core/pull/2091

‎lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"npmClient": "yarn",
44
"packages": ["packages/*", "plugins/*"],
55
"useWorkspaces": true,
6-
"version": "2.1.1"
6+
"version": "2.1.2"
77
}

‎packages/core-api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-api",
33
"description": "Public API for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Kristjan Košič <kristjan@ark.io>",
77
"Brian Faust <brian@ark.io>"

‎packages/core-api/src/versions/1/transactions/controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export class TransactionsController extends Controller {
3838
const pagination = super.paginate(request);
3939

4040
const transactions = this.transactionPool
41-
.getTransactions(pagination.offset, pagination.limit)
41+
.getTransactions(pagination.offset, pagination.limit, 0)
4242
.map(transaction => ({
4343
serialized: transaction,
4444
}));

‎packages/core-api/src/versions/2/transactions/controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class TransactionsController extends Controller {
7272

7373
const pagination = super.paginate(request);
7474

75-
let transactions = this.transactionPool.getTransactions(pagination.offset, pagination.limit);
75+
let transactions = this.transactionPool.getTransactions(pagination.offset, pagination.limit, 0);
7676
transactions = transactions.map(transaction => ({
7777
serialized: transaction,
7878
}));

‎packages/core-blockchain/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-blockchain",
33
"description": "Blockchain Manager for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"François-Xavier Thoorens <fx@ark.io>",
77
"Kristjan Košič <kristjan@ark.io>",

‎packages/core-blockchain/src/blockchain.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ export class Blockchain implements blockchain.IBlockchain {
244244
return;
245245
}
246246

247-
if (this.state.started && this.state.blockchain.value === "idle") {
247+
if (this.state.started) {
248248
this.dispatch("NEWBLOCK");
249249
this.enqueueBlocks([block]);
250250
} else {

‎packages/core-container/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-container",
33
"description": "Container for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

‎packages/core-database-postgres/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-database-postgres",
33
"description": "PostgreSQL integration for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

‎packages/core-database/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-database",
33
"description": "Database Interface for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"François-Xavier Thoorens <fx@ark.io>",
77
"Kristjan Košič <kristjan@ark.io>",

‎packages/core-debugger-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-debugger-cli",
33
"description": "Debugger CLI for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

‎packages/core-elasticsearch/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-elasticsearch",
33
"description": "A powerful Elasticsearch integration for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-error-tracker-bugsnag",
33
"description": "Bugsnag error tracker integration for Ark Core.",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-error-tracker-sentry",
33
"description": "Sentry error tracker integration for Ark Core.",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

‎packages/core-event-emitter/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-event-emitter",
33
"description": "Event Manager for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

‎packages/core-forger/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-forger",
33
"description": "Forger for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"François-Xavier Thoorens <fx@ark.io>",
77
"Kristjan Košič <kristjan@ark.io>",

‎packages/core-forger/src/manager.ts

+4-11
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ export class ForgerManager {
9999
await this.__loadUsernames();
100100

101101
round = await this.client.getRound();
102-
const delayTime = +this.config.getMilestone(round.lastBlock.height).blocktime * 1000 - 2000;
103-
104102
if (!round.canForge) {
105103
// this.logger.debug('Block already forged in current slot')
106104
// technically it is possible to compute doing shennanigan with arkjs.slots lib
@@ -111,7 +109,6 @@ export class ForgerManager {
111109
}
112110

113111
const delegate = this.__isDelegateActivated(round.currentForger.publicKey);
114-
115112
if (!delegate) {
116113
// this.logger.debug(`Current forging delegate ${
117114
// round.currentForger.publicKey
@@ -125,22 +122,18 @@ export class ForgerManager {
125122
await this.client.syncCheck();
126123
}
127124

128-
await delay(delayTime); // we will check at next slot
125+
await delay(slots.getTimeInMsUntilNextSlot()); // we will check at next slot
129126

130127
return this.__monitor(round);
131128
}
132129

133130
const networkState = await this.client.getNetworkState();
134131

135-
if (!this.__parseNetworkState(networkState, delegate)) {
136-
await delay(delayTime); // we will check at next slot
137-
138-
return this.__monitor(round);
132+
if (this.__parseNetworkState(networkState, delegate)) {
133+
await this.__forgeNewBlock(delegate, round);
139134
}
140135

141-
await this.__forgeNewBlock(delegate, round);
142-
143-
await delay(delayTime); // we will check at next slot
136+
await delay(slots.getTimeInMsUntilNextSlot()); // we will check at next slot
144137

145138
return this.__monitor(round);
146139
} catch (error) {

‎packages/core-graphql/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-graphql",
33
"description": "GraphQL Integration for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Lúcio Rubens <lucio@ark.io>"
77
],

‎packages/core-http-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-http-utils",
33
"description": "Http Utilities for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

‎packages/core-interfaces/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-interfaces",
33
"description": "Interface types for essential Ark core modules",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"François-Xavier Thoorens <fx@ark.io>",
77
"Kristjan Košič <kristjan@ark.io>",

‎packages/core-interfaces/src/core-transaction-pool/transaction-pool.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export interface ITransactionPool {
8585
* Get all transactions within the specified range [start, start + size), ordered by fee.
8686
* @return {(Array|void)} array of serialized transaction hex strings
8787
*/
88-
getTransactions(start: number, size: number): string[];
88+
getTransactions(start: number, size: number, maxBytes: number): string[];
8989

9090
/**
9191
* Get all transactions within the specified range [start, start + size).
@@ -99,7 +99,7 @@ export interface ITransactionPool {
9999
* insertion time, if fees equal (earliest transaction first).
100100
* @return {Array} array of transaction[property]
101101
*/
102-
getTransactionsData(start: number, size: number, property: string): any[];
102+
getTransactionsData(start: number, size: number, property: string, maxBytes: number): any[];
103103

104104
/**
105105
* Remove all transactions from the transaction pool belonging to specific sender.

‎packages/core-jest-matchers/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-jest-matchers",
33
"description": "Jest matchers for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>",
77
"Erwann Gentric <erwann@ark.io>",

‎packages/core-json-rpc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-json-rpc",
33
"description": "A JSON-RPC 2.0 Specification compliant server to interact with the Ark Blockchain.",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"François-Xavier Thoorens <fx@ark.io>",
77
"Brian Faust <brian@ark.io>"

‎packages/core-logger-winston/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-logger-winston",
33
"description": "Winston Logger for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"François-Xavier Thoorens <fx@ark.io>",
77
"Brian Faust <brian@ark.io>"

‎packages/core-logger/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@arkecosystem/core-logger",
33
"description": "Logger Manager for Ark Core",
4-
"version": "2.1.1",
4+
"version": "2.1.2",
55
"contributors": [
66
"Brian Faust <brian@ark.io>"
77
],

0 commit comments

Comments
 (0)