Merge branch '2.6'

ArkEcosystem · Mar 9, 2020 · 34b4ad3 · 34b4ad3
2 parents 2e56792 + 8ad963d
commit 34b4ad3
Show file tree

Hide file tree

Showing 56 changed files with 544 additions and 307 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -17,7 +17,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:

diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
@@ -28,7 +28,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -76,7 +76,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -124,7 +124,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -172,7 +172,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -220,7 +220,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -268,7 +268,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -316,7 +316,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -364,7 +364,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -412,7 +412,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -460,7 +460,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -508,7 +508,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -556,7 +556,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -604,7 +604,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -652,7 +652,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -700,7 +700,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -748,7 +748,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -796,7 +796,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -824,3 +824,51 @@ jobs:
                   POSTGRES_USER: ark
                   POSTGRES_PASSWORD: password
                   POSTGRES_DB: ark_unitnet
+
+    pool:
+        runs-on: ubuntu-latest
+
+        services:
+            postgres:
+                image: postgres:10.8
+                env:
+                    POSTGRES_USER: ark
+                    POSTGRES_PASSWORD: password
+                    POSTGRES_DB: ark_unitnet
+                ports:
+                    - 5432:5432
+                options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+        strategy:
+            matrix:
+                node-version: [12.x]
+
+        steps:
+            - uses: actions/checkout@v1
+            - name: Cache node modules
+              uses: actions/cache@v1
+              with:
+                  path: node_modules
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
+                  restore-keys: ${{ runner.os }}-node-
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v1
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - name: Update system
+              run: sudo apt-get update -y
+            - name: Install xsel & postgresql-client
+              run: sudo apt-get install -q xsel postgresql-client
+            - name: Install and build packages
+              run: yarn setup
+            - name: Create .core/database directory
+              run: mkdir -p $HOME/.core/database
+            - name: Functional tests
+              run: yarn test __tests__/functional/pool/pool.test.ts
+
+              env:
+                  CORE_DB_DATABASE: ark_unitnet
+                  CORE_DB_USERNAME: ark
+                  POSTGRES_USER: ark
+                  POSTGRES_PASSWORD: password
+                  POSTGRES_DB: ark_unitnet
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -54,7 +54,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:
@@ -75,16 +75,15 @@ jobs:
               run: mkdir -p $HOME/.core/database
             - name: Integration tests
               run: yarn test:integration:coverage --coverageDirectory .coverage/integration/
+              env:
+                CORE_DB_DATABASE: ark_unitnet
+                CORE_DB_USERNAME: ark
+                POSTGRES_USER: ark
+                POSTGRES_PASSWORD: password
+                POSTGRES_DB: ark_unitnet
             - name: Codecov
               run: ./node_modules/.bin/codecov --token=${{ secrets.CODECOV_TOKEN }}
 
-              env:
-                  CORE_DB_DATABASE: ark_unitnet
-                  CORE_DB_USERNAME: ark
-                  POSTGRES_USER: ark
-                  POSTGRES_PASSWORD: password
-                  POSTGRES_DB: ark_unitnet
-
     e2e:
         runs-on: ubuntu-latest
 
@@ -93,7 +92,7 @@ jobs:
                 node-version: [12.x]
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Cache node modules
               uses: actions/cache@v1
               with:

diff --git a/.gitignore b/.gitignore
@@ -27,9 +27,6 @@ lib-cov
 # node-waf configuration
 .lock-wscript
 
-# Build results
-app.js
-
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.6.25] - 2020-03-09
+
+## Fixed
+
+-   AcceptBlockHandler apply block to tx pool before db ([#3590])
+
 ## [2.6.24] - 2020-03-04
 
 ## Fixed
@@ -909,6 +915,7 @@ Closed security vulnerabilities:
 -   Initial Release
 
 [unreleased]: https://github.com/ARKEcosystem/core/compare/master...develop
+[2.6.25]: https://github.com/ARKEcosystem/core/compare/2.6.24...2.6.25
 [2.6.24]: https://github.com/ARKEcosystem/core/compare/2.6.21...2.6.24
 [2.6.21]: https://github.com/ARKEcosystem/core/compare/2.6.11...2.6.21
 [2.6.11]: https://github.com/ARKEcosystem/core/compare/2.6.10...2.6.11
@@ -1446,6 +1453,7 @@ Closed security vulnerabilities:
 [#3573]: https://github.com/ARKEcosystem/core/pull/3573
 [#3574]: https://github.com/ARKEcosystem/core/pull/3574
 [#3575]: https://github.com/ARKEcosystem/core/pull/3575
+[#3590]: https://github.com/ARKEcosystem/core/pull/3590
 [032caa1b990e91937e4bc1561bc1aeaeca9e37d]: https://github.com/ARKEcosystem/core/commit/032caa1b990e91937e4bc1561bc1aeaeca9e37d9
 [1209a36366c8fd3ba31fab2463011b7ce1a7d84]: https://github.com/ARKEcosystem/core/commit/1209a36366c8fd3ba31fab2463011b7ce1a7d844
 [34749bf84bcec3fecd0098c0d42f52deb1f6ba4]: https://github.com/ARKEcosystem/core/commit/34749bf84bcec3fecd0098c0d42f52deb1f6ba4a

diff --git a/__tests__/functional/multipayment-applyToRecipient/multipayment.test.ts b/__tests__/functional/multipayment-applyToRecipient/multipayment.test.ts
diff --git a/...ent-applyToRecipient/__support__/index.ts → ...ts__/functional/pool/__support__/index.ts b/...ent-applyToRecipient/__support__/index.ts → ...ts__/functional/pool/__support__/index.ts