diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9d176599efd01d4cbe29696ab7f3a9b2fcc5bb1..9d7032b36ce7162890e84e1b3d66d2fb6c6bb635 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,7 +167,7 @@ releases:x64:
script:
- docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true
- docker build --cache-from $CI_REGISTRY_IMAGE:$IMAGE_TAG --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" -f release/docker/Dockerfile .
- - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
+ - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
package:test:docker-test-image:
@@ -202,12 +202,12 @@ package:prod:docker:
- docker:18.06-dind
script:
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" -f release/docker/Dockerfile .
- - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
+ - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" $CI_REGISTRY
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
- - docker tag "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" "duniter/duniter:$CI_BUILD_TAG"
+ - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" "duniter/duniter:$CI_COMMIT_TAG"
- docker push "duniter/duniter:$CI_COMMIT_TAG"
- - docker tag "$CI_REGISTRY_IMAGE:$CI_BUILD_TAG" duniter/duniter
+ - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" duniter/duniter
- docker push duniter/duniter
.release_jobs: &release_jobs
diff --git a/app/modules/bma/lib/controllers/transactions.ts b/app/modules/bma/lib/controllers/transactions.ts
index de6dd2236c6e74ec9cbb4b9f4d5d695dd56182cc..046aab7b6ce57fcad24b8f3e9d11c9aa81635707 100644
--- a/app/modules/bma/lib/controllers/transactions.ts
+++ b/app/modules/bma/lib/controllers/transactions.ts
@@ -154,6 +154,7 @@ export class TransactionBinding extends AbstractController {
dbTxHistory: {
sent?: DBTx[];
received?: DBTx[];
+ receiving?: DBTx[];
sending?: DBTx[];
pending?: DBTx[];
}
@@ -164,6 +165,7 @@ export class TransactionBinding extends AbstractController {
history: {
sending: dbTxHistory.sending?.map(dbtx2HttpTxOfHistory) || [],
received: dbTxHistory.received?.map(dbtx2HttpTxOfHistory) || [],
+ receiving: dbTxHistory.receiving?.map(dbtx2HttpTxOfHistory) || [],
sent: dbTxHistory.sent?.map(dbtx2HttpTxOfHistory) || [],
pending: dbTxHistory.pending?.map(dbtx2HttpTxOfHistory) || [],
},
diff --git a/app/modules/bma/lib/dtos.ts b/app/modules/bma/lib/dtos.ts
index d8ed1218605d37ca877ead9cb0de985b922c3e13..4b4817336737285e9069742d452aa9927ad551a0 100644
--- a/app/modules/bma/lib/dtos.ts
+++ b/app/modules/bma/lib/dtos.ts
@@ -876,6 +876,7 @@ export const TxHistory = {
sent: [TxOfHistory],
received: [TxOfHistory],
sending: [TxOfHistory],
+ receiving: [TxOfHistory],
pending: [TxOfHistory],
},
};
@@ -887,6 +888,7 @@ export interface HttpTxHistory {
sent: HttpTxOfHistory[];
received: HttpTxOfHistory[];
sending: HttpTxOfHistory[];
+ receiving: HttpTxOfHistory[];
pending: HttpTxOfHistory[];
};
}
diff --git a/gui/index.html b/gui/index.html
index 00a00f20f9b9ef74efcbf77cdfada1d7c6347c33..0b2f15bec07e84f5afc3dded4c3e596602392f6d 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>Duniter 1.8.7-rc4</title>
+ <title>Duniter 1.8.7</title>
<style>
html {
font-family: "Courier New", Courier, monospace;
diff --git a/package-lock.json b/package-lock.json
index 175db66e7c66146012b437b105e13cc7ba4ce2db..e66f190cd7db17c06ddd482245bb825396b91ec9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "duniter",
- "version": "1.8.7-rc4",
+ "version": "1.8.7",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 41c205293a23a7bfbe29f24e45a191efb9219ad7..cc6dfc6b237d71899ac0a40ded0cdc81ee95674e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "duniter",
- "version": "1.8.7-rc4",
+ "version": "1.8.7",
"engines": {
"node": ">= 10.19",
"npm": ">= 6.13",
@@ -13,7 +13,7 @@
"node-main": "./bin/duniter",
"window": {
"icon": "duniter.png",
- "title": "v1.8.7-rc4",
+ "title": "v1.8.7",
"width": 800,
"height": 800,
"min_width": 750,
diff --git a/release/arch/windows/duniter.iss b/release/arch/windows/duniter.iss
index dfd81f23c9ebc56d2c971420649b17aeb44a2987..afff3088750204f956149bb0a8e22ec0ccce672f 100644
--- a/release/arch/windows/duniter.iss
+++ b/release/arch/windows/duniter.iss
@@ -15,7 +15,7 @@
#error "Unable to find MyAppExe"
#endif
-#define MyAppVerStr "v1.8.7-rc4"
+#define MyAppVerStr "v1.8.7"
[Setup]
AppName={#MyAppName}
diff --git a/release/extra/debian/package/DEBIAN/control b/release/extra/debian/package/DEBIAN/control
index af44633b83191600ca69518f5b0dba719ebf8273..41baea0eb0b4afb373b1d8d4feaa5cfdc75a255d 100644
--- a/release/extra/debian/package/DEBIAN/control
+++ b/release/extra/debian/package/DEBIAN/control
@@ -1,5 +1,5 @@
Package: duniter
-Version: 1.8.7-rc4
+Version: 1.8.7
Depends: unzip
Section: misc
Priority: optional