Merge branch 'release/1.8.7' into 'release/1.8'

BMA.tx Re-introduce empty 'receiving' field + release v1.8.7 as stable See merge request !1438

Merge branch 'release/1.8.7' into 'release/1.8'
7a51be31 · Moul · f7c8fea1 · 3a14acb0 · 7a51be31 · 7a51be31
Commit 7a51be31 authored 2 years ago by Moul
--- 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

--- 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) || [],
      },

--- 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[];
  };
 }

--- 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;

--- a/package-lock.json
+++ b/package-lock.json
 {
  "name": "duniter",
-  "version": "1.8.7-rc4",
+  "version": "1.8.7",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {

--- a/package.json
+++ b/package.json
 {
  "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,

--- 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}

--- a/release/extra/debian/package/DEBIAN/control
+++ b/release/extra/debian/package/DEBIAN/control
 Package: duniter
-Version: 1.8.7-rc4
+Version: 1.8.7
 Depends: unzip
 Section: misc
 Priority: optional