Merge pull request #1628 from ArkEcosystem/develop

ArkEcosystem · Dec 4, 2018 · 6c1dc3e · 6c1dc3e
2 parents 4efbde7 + e41269c
commit 6c1dc3e
Show file tree

Hide file tree

Showing 37 changed files with 47 additions and 555 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -23,7 +23,7 @@ _Put an `x` in the boxes that apply and remove the rest of them: keep this PR as
 _Put an `x` in the boxes that apply and remove this text and the rest of them. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._
 -->
 
-- [ ] I have read the [CONTRIBUTING](https://docs.ark.io/developers/guidelines/contributing.html) documentation
+- [ ] I have read the [CONTRIBUTING](https://docs.ark.io/guidebook/contribution-guidelines/contributing.html) documentation
 - [ ] Lint and unit tests pass locally with my changes
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] I have added necessary documentation (if appropriate)

diff --git a/packages/core-api/CHANGELOG.md b/packages/core-api/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.2.1 - 2018-12-04
+
+### Added
+
+- Allow block display via height in v2 API
+
+### Fixed
+
+- Return the correct total count for `/api/v2/peers`
+
 ## 0.2.0 - 2018-12-03
 
 ### Added

diff --git a/packages/core-api/jsdoc.json b/packages/core-api/jsdoc.json
diff --git a/packages/core-api/lib/repositories/blocks.js b/packages/core-api/lib/repositories/blocks.js
@@ -52,14 +52,18 @@ class BlocksRepository extends Repository {
 
   /**
    * Get a block.
-   * @param  {Number} id
+   * @param  {Number} value
    * @return {Object}
    */
-  async findById(id) {
+  async findById(value) {
     const query = this.query
       .select()
       .from(this.query)
-      .where(this.query.id.equals(id))
+      .where(this.query.id.equals(value))
+
+    if (Number.isSafeInteger(value)) {
+      query.or(this.query.height.equals(value))
+    }
 
     return this._find(query)
   }

diff --git a/packages/core-api/lib/versions/2/handlers/peers.js b/packages/core-api/lib/versions/2/handlers/peers.js
@@ -44,7 +44,7 @@ exports.index = {
 
     return utils.toPagination(
       request,
-      { rows: result, count: result.length },
+      { rows: result, count: allPeers.length },
       'peer',
     )
   },

diff --git 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": "0.2.0",
+  "version": "0.2.1",
   "contributors": [
     "Kristjan Košič <kristjan@ark.io>",
     "Brian Faust <brian@ark.io>"

diff --git a/packages/core-blockchain/__tests__/blockchain.test.js b/packages/core-blockchain/__tests__/blockchain.test.js
@@ -149,7 +149,7 @@ describe('Blockchain', () => {
         tx => tx.type !== 2,
       )
 
-      await blockchain.transactionPool.flush()
+      blockchain.transactionPool.flush()
       await blockchain.postTransactions(transactionsWithoutType2, false)
       const transactions = blockchain.transactionPool.getTransactions(0, 200)
 
@@ -159,7 +159,7 @@ describe('Blockchain', () => {
         transactionsWithoutType2.map(transaction => transaction.serialized),
       )
 
-      await blockchain.transactionPool.flush()
+      blockchain.transactionPool.flush()
     })
   })
 
@@ -321,7 +321,7 @@ describe('Blockchain', () => {
         tx => tx.type !== 2,
       )
 
-      await blockchain.transactionPool.flush()
+      blockchain.transactionPool.flush()
       await blockchain.postTransactions(transactionsWithoutType2, false)
       const unconfirmedTransactions = blockchain.getUnconfirmedTransactions(200)
 
@@ -333,7 +333,7 @@ describe('Blockchain', () => {
         transactionsWithoutType2.map(transaction => transaction.serialized),
       )
 
-      await blockchain.transactionPool.flush()
+      blockchain.transactionPool.flush()
     })
   })
 

diff --git a/packages/core-blockchain/jsdoc.json b/packages/core-blockchain/jsdoc.json
diff --git a/packages/core-config/jsdoc.json b/packages/core-config/jsdoc.json
diff --git a/packages/core-container/jsdoc.json b/packages/core-container/jsdoc.json
diff --git a/packages/core-database-postgres/jsdoc.json b/packages/core-database-postgres/jsdoc.json
diff --git a/packages/core-database/jsdoc.json b/packages/core-database/jsdoc.json
diff --git a/packages/core-deployer/jsdoc.json b/packages/core-deployer/jsdoc.json
diff --git a/packages/core-elasticsearch/jsdoc.json b/packages/core-elasticsearch/jsdoc.json
diff --git 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": "0.2.0",
+  "version": "0.1.0",
   "contributors": [
     "Brian Faust <brian@ark.io>"
   ],

diff --git a/packages/core-error-tracker-bugsnag/jsdoc.json b/packages/core-error-tracker-bugsnag/jsdoc.json
diff --git 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": "0.2.0",
+  "version": "0.1.0",
   "contributors": [
     "Brian Faust <brian@ark.io>"
   ],

diff --git 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": "0.2.0",
+  "version": "0.1.0",
   "contributors": [
     "Brian Faust <brian@ark.io>"
   ],

diff --git a/packages/core-event-emitter/jsdoc.json b/packages/core-event-emitter/jsdoc.json
diff --git a/packages/core-forger/jsdoc.json b/packages/core-forger/jsdoc.json