Merge branch 'fix/neon-build-script' into dev

.gitlab-ci.yml

@@ -8,7 +8,7 @@ stages:
 
 workflow:
   rules:
-    - if: $CI_COMMIT_REF_NAME =~ /^wip/
+    - if: $CI_COMMIT_REF_NAME =~ /^wip*/i
       when: never
     - changes:
       - .gitlab/**/*

app/modules/bma/lib/dtos.ts

@@ -14,6 +14,7 @@
 import { BlockDTO } from "../../../lib/dto/BlockDTO";
 import { WS2PHead } from "../../ws2p/lib/WS2PCluster";
 import { JSONDBPeer } from "../../../lib/db/DBPeer";
+import { TransactionDTO } from "../../../lib/dto/TransactionDTO";
 
 export const Summary = {
   duniter: {
@@ -292,7 +293,7 @@ export function block2HttpBlock(blockDTO: BlockDTO): HttpBlock {
     revoked: blockDTO.revoked,
     excluded: blockDTO.excluded,
     transactions: blockDTO.transactions.map(
-      (tx): HttpTransactionOfBlock => {
+      (tx: TransactionDTO): HttpTransactionOfBlock => {
         return {
           version: tx.version,
           currency: tx.currency,

app/modules/bma/lib/tojson.ts

@@ -13,12 +13,13 @@
 
 import { BlockDTO } from "../../../lib/dto/BlockDTO";
 import { Underscore } from "../../../lib/common-libs/underscore";
+import { HttpBlock } from "./dtos";
 
 export const stat = (stat: number[]) => {
   return { blocks: stat };
 };
 
-export const block = (block: any) => {
+export const block = (block: any): HttpBlock => {
   const json: any = {};
   json.version = parseInt(block.version);
   json.nonce = parseInt(block.nonce);

app/modules/config.ts

@@ -37,7 +37,10 @@ module.exports = {
           CommonConstants.SWITCH_ON_BRANCH_AHEAD_BY_X_BLOCKS;
 
         // Transactions storage
-        if (program.storeTxs) {
+        if (
+          program.storeTxs ||
+          (program.storeTxs === undefined && !conf.nobma)
+        ) {
           if (!conf.storage) {
             conf.storage = { transactions: true, wotwizard: false };
           } else {

neon/build.sh

-#!/bin/bash
+#!/bin/sh
 
 cd neon