From b59c4895a4a72fd261d3c9175c6c0b6920efd89b Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Fri, 2 Jun 2023 19:03:04 +0200
Subject: [PATCH] fix(bma) transactions are always stored in 1.9+ (need by GVA)
---
app/lib/dto/ConfDTO.ts | 2 --
app/modules/bma/lib/controllers/node.ts | 4 +---
neon/native/src/server.rs | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/app/lib/dto/ConfDTO.ts b/app/lib/dto/ConfDTO.ts
index 83bc1240d..21318da66 100644
--- a/app/lib/dto/ConfDTO.ts
+++ b/app/lib/dto/ConfDTO.ts
@@ -24,7 +24,6 @@ export interface Keypair {
export interface StorageDTO {
storage?: {
- transactions?: boolean;
wotwizard?: boolean;
};
}
@@ -200,7 +199,6 @@ export class ConfDTO
},
public powNoSecurity = false,
public storage = {
- transactions: false,
wotwizard: false,
},
public txsMempoolSize?: number
diff --git a/app/modules/bma/lib/controllers/node.ts b/app/modules/bma/lib/controllers/node.ts
index 84073fda0..3441db755 100644
--- a/app/modules/bma/lib/controllers/node.ts
+++ b/app/modules/bma/lib/controllers/node.ts
@@ -23,9 +23,7 @@ export class NodeBinding extends AbstractController {
version: this.server.version,
forkWindowSize: this.server.conf.forksize,
storage: {
- transactions: this.server.conf.storage
- ? this.server.conf.storage.transactions
- : true, // true by default (see app/module/config.ts)
+ transactions: true, // Always true, in 1.9
wotwizard: this.server.conf.storage?.wotwizard || false, // false by default (see app/module/config.ts)
},
},
diff --git a/neon/native/src/server.rs b/neon/native/src/server.rs
index db30bc09d..19a211707 100644
--- a/neon/native/src/server.rs
+++ b/neon/native/src/server.rs
@@ -54,7 +54,7 @@ declare_types! {
let self_key_pair = if let Some(self_keypair_str) = rust_server_conf_stringified.self_keypair {
into_neon_res(&mut cx, crate::crypto::keypair_from_expanded_base58_secret_key(&self_keypair_str))?
} else {
- Ed25519KeyPair::generate_random().expect("fail to gen random keyypair")
+ Ed25519KeyPair::generate_random().expect("fail to gen random keypair")
};
let txs_mempool_size = rust_server_conf_stringified.txs_mempool_size as usize;
let conf = DuniterCoreConf {
--
GitLab