diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7dec845d41360f63a14af6d1f8431957b2e2ee0d..3ff2a834460d62cd9cb516f19cb804c133fe076e 100644 --- a/.gitlab-ci.yml +++ b/.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/**/* diff --git a/app/modules/bma/lib/dtos.ts b/app/modules/bma/lib/dtos.ts index 6a17335d51e3a70bfb6505b43bcd7bbe32da4ce4..1ba54fe4ad868ed08f51831de5fe06adcaaef113 100644 --- a/app/modules/bma/lib/dtos.ts +++ b/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, diff --git a/app/modules/bma/lib/tojson.ts b/app/modules/bma/lib/tojson.ts index 8330c2cf3cd4d72c61e88798cb135ffb25055106..2fc834f5d2defcc91fd233d9844702f4dbef2699 100644 --- a/app/modules/bma/lib/tojson.ts +++ b/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); diff --git a/app/modules/config.ts b/app/modules/config.ts index cbbff7b09e8ee9794a3e606836755c2994744640..6776cd0455d7849cfd12fe921e937ec8e85b66d4 100644 --- a/app/modules/config.ts +++ b/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 { diff --git a/neon/build.sh b/neon/build.sh index f12cd426d7233172a27bfb8fc08d7da5a4c61893..a4553e72877809f259ff850bc1d94e678bad843b 100755 --- a/neon/build.sh +++ b/neon/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cd neon