Merge pull request ArkEcosystem#2199 from ArkEcosystem/2.2

PersonaIam · Mar 11, 2019 · ac778f8 · ac778f8
2 parents 64f2277 + 4e4e5fc
commit ac778f8
Show file tree

Hide file tree

Showing 325 changed files with 8,930 additions and 7,077 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -56,7 +56,6 @@ jobs:
             - ./packages/core-logger-winston/node_modules
             - ./packages/core-p2p/node_modules
             - ./packages/core-snapshots/node_modules
-            - ./packages/core-snapshots-cli/node_modules
             - ./packages/core-test-utils/node_modules
             - ./packages/core-tester-cli/node_modules
             - ./packages/core-transaction-pool/node_modules
@@ -68,11 +67,6 @@ jobs:
       - run:
           name: Create .core/database directory
           command: mkdir -p $HOME/.core/database
-      - run:
-          name: core
-          command: >-
-            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core/packages/core &&
-            yarn test:coverage
       - run:
           name: core-api
           command: >-
@@ -107,6 +101,9 @@ jobs:
           name: Last 1000 lines of test output
           when: on_fail
           command: tail -n 1000 test_output.txt
+      - run:
+          name: Lint
+          command: yarn lint
       - run:
           name: Codecov
           command: ./node_modules/.bin/codecov
@@ -166,7 +163,6 @@ jobs:
             - ./packages/core-logger-winston/node_modules
             - ./packages/core-p2p/node_modules
             - ./packages/core-snapshots/node_modules
-            - ./packages/core-snapshots-cli/node_modules
             - ./packages/core-test-utils/node_modules
             - ./packages/core-tester-cli/node_modules
             - ./packages/core-transaction-pool/node_modules
@@ -178,11 +174,6 @@ jobs:
       - run:
           name: Create .core/database directory
           command: mkdir -p $HOME/.core/database
-      - run:
-          name: core
-          command: >-
-            cd ~/core/.circleci && ./rebuild-db.sh && cd ~/core/packages/core &&
-            yarn test:coverage
       - run:
           name: core-api
           command: >-
@@ -217,6 +208,9 @@ jobs:
           name: Last 1000 lines of test output
           when: on_fail
           command: tail -n 1000 test_output.txt
+      - run:
+          name: Lint
+          command: yarn lint
       - run:
           name: Codecov
           command: ./node_modules/.bin/codecov
@@ -276,7 +270,6 @@ jobs:
             - ./packages/core-logger-winston/node_modules
             - ./packages/core-p2p/node_modules
             - ./packages/core-snapshots/node_modules
-            - ./packages/core-snapshots-cli/node_modules
             - ./packages/core-test-utils/node_modules
             - ./packages/core-tester-cli/node_modules
             - ./packages/core-transaction-pool/node_modules
@@ -337,6 +330,9 @@ jobs:
           name: Last 1000 lines of test output
           when: on_fail
           command: tail -n 1000 test_output.txt
+      - run:
+          name: Lint
+          command: yarn lint
       - run:
           name: Codecov
           command: ./node_modules/.bin/codecov
@@ -396,7 +392,6 @@ jobs:
             - ./packages/core-logger-winston/node_modules
             - ./packages/core-p2p/node_modules
             - ./packages/core-snapshots/node_modules
-            - ./packages/core-snapshots-cli/node_modules
             - ./packages/core-test-utils/node_modules
             - ./packages/core-tester-cli/node_modules
             - ./packages/core-transaction-pool/node_modules
@@ -452,6 +447,9 @@ jobs:
           name: Last 1000 lines of test output
           when: on_fail
           command: tail -n 1000 test_output.txt
+      - run:
+          name: Lint
+          command: yarn lint
       - run:
           name: Codecov
           command: ./node_modules/.bin/codecov
@@ -511,7 +509,6 @@ jobs:
             - ./packages/core-logger-winston/node_modules
             - ./packages/core-p2p/node_modules
             - ./packages/core-snapshots/node_modules
-            - ./packages/core-snapshots-cli/node_modules
             - ./packages/core-test-utils/node_modules
             - ./packages/core-tester-cli/node_modules
             - ./packages/core-transaction-pool/node_modules
@@ -572,6 +569,9 @@ jobs:
           name: Last 1000 lines of test output
           when: on_fail
           command: tail -n 1000 test_output.txt
+      - run:
+          name: Lint
+          command: yarn lint
       - run:
           name: Codecov
           command: ./node_modules/.bin/codecov
@@ -631,7 +631,6 @@ jobs:
             - ./packages/core-logger-winston/node_modules
             - ./packages/core-p2p/node_modules
             - ./packages/core-snapshots/node_modules
-            - ./packages/core-snapshots-cli/node_modules
             - ./packages/core-test-utils/node_modules
             - ./packages/core-tester-cli/node_modules
             - ./packages/core-transaction-pool/node_modules
@@ -687,6 +686,9 @@ jobs:
           name: Last 1000 lines of test output
           when: on_fail
           command: tail -n 1000 test_output.txt
+      - run:
+          name: Lint
+          command: yarn lint
       - run:
           name: Codecov
           command: ./node_modules/.bin/codecov

diff --git a/.circleci/configTemplate.json b/.circleci/configTemplate.json
@@ -76,6 +76,12 @@
                         "command": "tail -n 1000 test_output.txt"
                     }
                 },
+                {
+                    "run": {
+                        "name": "Lint",
+                        "command": "yarn lint"
+                    }
+                },
                 {
                     "run": {
                         "name": "Codecov",
@@ -159,6 +165,12 @@
                         "command": "tail -n 1000 test_output.txt"
                     }
                 },
+                {
+                    "run": {
+                        "name": "Lint",
+                        "command": "yarn lint"
+                    }
+                },
                 {
                     "run": {
                         "name": "Codecov",

diff --git a/.circleci/generateConfig.js b/.circleci/generateConfig.js
@@ -55,13 +55,15 @@ fs.readdir("./packages", (_, packages) => {
                 });
 
             const stepLog = job.steps[9];
-            const stepCoverage = job.steps[10];
+            const stepLint = job.steps[10];
+            const stepCoverage = job.steps[11];
 
             for (i = 0; i < steps.length; i++) {
                 job.steps[testStepIndex + i] = steps[i];
             }
 
             job.steps.push(stepLog);
+            job.steps.push(stepLint);
             job.steps.push(stepCoverage);
 
             config.jobs[name.slice(0, -1) + index] = job;

diff --git a/.codecov.yml b/.codecov.yml
@@ -12,3 +12,4 @@ ignore:
   - "packages/core-test-utils/src/fixtures/**/*"
   - "packages/core-tester-cli/**/*"
   - "packages/core-webhooks/src/database/migrations/**/*"
+  - "packages/core/**/*"
diff --git a/.gitignore b/.gitignore
@@ -68,3 +68,8 @@ docker/development
 
 # Vagrant
 .vagrant
+
+# oclif
+tmp
+oclif.manifest.json
+npm-shrinkwrap.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,38 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.0] - 2019-03-11
+
+### Added
+
+-   Implement a CLI with @oclif to replace commander ([#2100])
+-   Add sorting to voters endpoint ([#2103])
+-   Validate GET replies from other peers ([#2102])
+-   Pass query to findAllByVote method ([#2142])
+-   Fetch list of peers from at least a few others ([#2152])
+
+### Fixed
+
+-   Pass the base flags for programmatic calls in `core-tester-cli` ([#2108])
+-   Reduce complexity and fix wrong offset handling in `core-elasticsearch` ([#2108])
+-   Stuck at not ready to accept new block ([#2139])
+-   Properly sort BigNumber values ([#2144])
+-   Properly update wallet balances if a vote transaction is reverted ([#2207])
+-   Invalid transactions after a rollback because block timestamps were used as transaction timestamp ([#2217])
+
+### Changed
+
+-   Replaced lodash.sortBy/orderBy with faster implementations ([#2106])
+-   Improve fork handling in updatePeersOnMissingBlocks ([#2125])
+-   Throw an error if the peers or plugins file are missing ([#2135])
+-   Improve selection of peer for downloading blocks ([#2137])
+-   Merge core-snapshot-cli commands into core ([#2149])
+
+### Removed
+
+-   Remove unnecessary ping call in ([#2123])
+-   Remove broken getRandomDownloadBlocksPeer ([#2121])
+
 ## [2.1.2] - 2019-02-13
 
 ### Fixed
@@ -192,7 +224,8 @@ Closed security vulnerabilities:
 
 -   Initial Release
 
-[unreleased]: https://github.com/ArkEcosystem/core/compare/2.1.2...develop
+[unreleased]: https://github.com/ArkEcosystem/core/compare/2.2.0...develop
+[2.2.0]: https://github.com/ArkEcosystem/core/compare/2.1.2...2.2.0
 [2.1.2]: https://github.com/ArkEcosystem/core/compare/2.1.1..2.1.2
 [2.1.1]: https://github.com/ArkEcosystem/core/compare/2.1.0..2.1.1
 [2.1.0]: https://github.com/ArkEcosystem/core/compare/2.0.19...2.1.0
@@ -290,3 +323,21 @@ Closed security vulnerabilities:
 [#2082]: https://github.com/ArkEcosystem/core/pull/2082
 [#2083]: https://github.com/ArkEcosystem/core/pull/2083
 [#2091]: https://github.com/ArkEcosystem/core/pull/2091
+[#2100]: https://github.com/ArkEcosystem/core/pull/2100
+[#2102]: https://github.com/ArkEcosystem/core/pull/2102
+[#2103]: https://github.com/ArkEcosystem/core/pull/2103
+[#2106]: https://github.com/ArkEcosystem/core/pull/2106
+[#2108]: https://github.com/ArkEcosystem/core/pull/2108
+[#2119]: https://github.com/ArkEcosystem/core/pull/2119
+[#2121]: https://github.com/ArkEcosystem/core/pull/2121
+[#2123]: https://github.com/ArkEcosystem/core/pull/2123
+[#2125]: https://github.com/ArkEcosystem/core/pull/2125
+[#2135]: https://github.com/ArkEcosystem/core/pull/2135
+[#2137]: https://github.com/ArkEcosystem/core/pull/2137
+[#2139]: https://github.com/ArkEcosystem/core/pull/2139
+[#2142]: https://github.com/ArkEcosystem/core/pull/2142
+[#2144]: https://github.com/ArkEcosystem/core/pull/2144
+[#2149]: https://github.com/ArkEcosystem/core/pull/2149
+[#2152]: https://github.com/ArkEcosystem/core/pull/2152
+[#2207]: https://github.com/ArkEcosystem/core/pull/2207
+[#2217]: https://github.com/ArkEcosystem/core/pull/2217
diff --git a/packages/core-snapshots-cli/README.md → deprecated/core-snapshots-cli/README.md b/packages/core-snapshots-cli/README.md → deprecated/core-snapshots-cli/README.md
diff --git a/...ges/core-snapshots-cli/__tests__/.gitkeep → ...ted/core-snapshots-cli/__tests__/.gitkeep b/...ges/core-snapshots-cli/__tests__/.gitkeep → ...ted/core-snapshots-cli/__tests__/.gitkeep
diff --git a/packages/core-snapshots-cli/bin/run → deprecated/core-snapshots-cli/bin/run b/packages/core-snapshots-cli/bin/run → deprecated/core-snapshots-cli/bin/run
diff --git a/packages/core-snapshots-cli/bin/run.cmd → deprecated/core-snapshots-cli/bin/run.cmd b/packages/core-snapshots-cli/bin/run.cmd → deprecated/core-snapshots-cli/bin/run.cmd
diff --git a/packages/core-snapshots-cli/package.json → deprecated/core-snapshots-cli/package.json b/packages/core-snapshots-cli/package.json → deprecated/core-snapshots-cli/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@arkecosystem/core-snapshots-cli",
     "description": "Provides live cli interface to the core-snapshots module for ARK Core",
-    "version": "2.1.2",
+    "version": "2.2.0",
     "contributors": [
         "Kristjan Košič <[email protected]>"
     ],
@@ -17,6 +17,10 @@
     },
     "scripts": {
         "snapshot": "./bin/run",
+        "publish:alpha": "npm publish --tag alpha",
+        "publish:beta": "npm publish --tag beta",
+        "publish:rc": "npm publish --tag rc",
+        "publish:latest": "npm publish --tag latest",
         "prepublishOnly": "yarn build",
         "pretest": "yarn lint && yarn build",
         "prepack": "oclif-dev manifest && npm shrinkwrap",
@@ -51,17 +55,17 @@
         "updates": "../../node_modules/npm-check-updates/bin/npm-check-updates -a"
     },
     "dependencies": {
-        "@arkecosystem/core-container": "^2.1.0",
-        "@arkecosystem/core-interfaces": "^2.1.0",
-        "@arkecosystem/core-snapshots": "^2.1.0",
-        "@oclif/command": "^1.5.8",
-        "@oclif/config": "^1.12.4",
+        "@arkecosystem/core-container": "^2.2.0-beta.7",
+        "@arkecosystem/core-interfaces": "^2.2.0-beta.7",
+        "@arkecosystem/core-snapshots": "^2.2.0-beta.7",
+        "@oclif/command": "^1.5.10",
+        "@oclif/config": "^1.12.6",
         "@oclif/plugin-help": "^2.1.6",
         "@oclif/plugin-not-found": "^1.2.2",
         "@types/boom": "^7.2.1",
         "@types/cli-progress": "^1.8.0",
         "@types/commander": "^2.12.2",
-        "@types/fs-extra": "^5.0.4",
+        "@types/fs-extra": "^5.0.5",
         "cli-progress": "^2.1.1",
         "fs-extra": "^7.0.1"
     },

diff --git a/...ore-snapshots-cli/src/commands/command.ts → ...ore-snapshots-cli/src/commands/command.ts b/...ore-snapshots-cli/src/commands/command.ts → ...ore-snapshots-cli/src/commands/command.ts
diff --git a/...s/core-snapshots-cli/src/commands/dump.ts → ...d/core-snapshots-cli/src/commands/dump.ts b/...s/core-snapshots-cli/src/commands/dump.ts → ...d/core-snapshots-cli/src/commands/dump.ts
diff --git a/...ore-snapshots-cli/src/commands/restore.ts → ...ore-snapshots-cli/src/commands/restore.ts b/...ore-snapshots-cli/src/commands/restore.ts → ...ore-snapshots-cli/src/commands/restore.ts
diff --git a/...re-snapshots-cli/src/commands/rollback.ts → ...re-snapshots-cli/src/commands/rollback.ts b/...re-snapshots-cli/src/commands/rollback.ts → ...re-snapshots-cli/src/commands/rollback.ts
diff --git a/...re-snapshots-cli/src/commands/truncate.ts → ...re-snapshots-cli/src/commands/truncate.ts b/...re-snapshots-cli/src/commands/truncate.ts → ...re-snapshots-cli/src/commands/truncate.ts
diff --git a/...core-snapshots-cli/src/commands/verify.ts → ...core-snapshots-cli/src/commands/verify.ts b/...core-snapshots-cli/src/commands/verify.ts → ...core-snapshots-cli/src/commands/verify.ts
diff --git a/packages/core-snapshots-cli/src/index.ts → deprecated/core-snapshots-cli/src/index.ts b/packages/core-snapshots-cli/src/index.ts → deprecated/core-snapshots-cli/src/index.ts
diff --git a/packages/core-snapshots-cli/src/utils.ts → deprecated/core-snapshots-cli/src/utils.ts b/packages/core-snapshots-cli/src/utils.ts → deprecated/core-snapshots-cli/src/utils.ts
diff --git a/packages/core-snapshots-cli/tsconfig.json → deprecated/core-snapshots-cli/tsconfig.json b/packages/core-snapshots-cli/tsconfig.json → deprecated/core-snapshots-cli/tsconfig.json
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
@@ -9,7 +9,7 @@ COPY ./ /home/node/core
 RUN apk add --no-cache --virtual .build-deps make gcc g++ python git \
     && apk add --no-cache bash sudo git openntpd openssl \
     && npm i pm2 -g --loglevel notice \
-    && yarn setup \
+    && yarn global add @arkecosystem/core \
     && yarn cache clean \
     && apk del .build-deps \
     && echo 'node ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers