From 8f697bc5d26a81ee3e64e896f2315eb941564499 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Mon, 3 Dec 2018 12:44:26 +0100
Subject: [PATCH] [enh] BMA: blockchain/parameters: add sigReplay and msPeriod
---
app/lib/dal/fileDALs/ConfDAL.ts | 2 ++
app/lib/dto/BlockDTO.ts | 4 ++--
app/modules/bma/lib/controllers/blockchain.ts | 2 ++
app/modules/bma/lib/dtos.ts | 4 ++++
doc/HTTP_API.md | 2 ++
5 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/app/lib/dal/fileDALs/ConfDAL.ts b/app/lib/dal/fileDALs/ConfDAL.ts
index c0541f16f..c653734a2 100644
--- a/app/lib/dal/fileDALs/ConfDAL.ts
+++ b/app/lib/dal/fileDALs/ConfDAL.ts
@@ -44,8 +44,10 @@ export class ConfDAL extends AbstractCFS {
"sigWindow": parseInt(conf.sigWindow,10),
"sigValidity": parseInt(conf.sigValidity,10),
"sigQty": parseInt(conf.sigQty,10),
+ "sigReplay": parseInt(conf.sigReplay,10),
"idtyWindow": parseInt(conf.idtyWindow,10),
"msWindow": parseInt(conf.msWindow,10),
+ "msPeriod": parseInt(conf.msPeriod,10),
"xpercent": parseFloat(conf.xpercent),
"msValidity": parseInt(conf.msValidity,10),
"stepMax": parseInt(conf.stepMax,10),
diff --git a/app/lib/dto/BlockDTO.ts b/app/lib/dto/BlockDTO.ts
index 4a25a8f4f..e9e610ecd 100644
--- a/app/lib/dto/BlockDTO.ts
+++ b/app/lib/dto/BlockDTO.ts
@@ -279,7 +279,7 @@ export class BlockDTO implements Cloneable {
udTime0: parseInt(sp[17]),
udReevalTime0: parseInt(sp[18]),
dtReeval: parseInt(sp[19]),
- // New parameter, defaults to msWindow
+ // New parameters, defaults to msWindow
msPeriod: parseInt(sp[9]),
sigReplay: parseInt(sp[9]),
}
@@ -292,4 +292,4 @@ export class BlockDTO implements Cloneable {
static getHash(block:any) {
return BlockDTO.fromJSONObject(block).getHash()
}
-}
\ No newline at end of file
+}
diff --git a/app/modules/bma/lib/controllers/blockchain.ts b/app/modules/bma/lib/controllers/blockchain.ts
index d5afc6273..a142a7331 100644
--- a/app/modules/bma/lib/controllers/blockchain.ts
+++ b/app/modules/bma/lib/controllers/blockchain.ts
@@ -88,8 +88,10 @@ export class BlockchainBinding extends AbstractController {
"sigWindow": params.sigWindow,
"sigValidity": params.sigValidity,
"sigQty": params.sigQty,
+ "sigReplay": params.sigReplay,
"idtyWindow": params.idtyWindow,
"msWindow": params.msWindow,
+ "msPeriod": params.msPeriod,
"xpercent": params.xpercent,
"msValidity": params.msValidity,
"stepMax": params.stepMax,
diff --git a/app/modules/bma/lib/dtos.ts b/app/modules/bma/lib/dtos.ts
index 63805afe0..4756b2415 100644
--- a/app/modules/bma/lib/dtos.ts
+++ b/app/modules/bma/lib/dtos.ts
@@ -40,9 +40,11 @@ export const Parameters = {
sigStock: Number,
sigWindow: Number,
sigValidity: Number,
+ sigReplay: Number,
sigQty: Number,
idtyWindow: Number,
msWindow: Number,
+ msPeriod: Number,
xpercent: Number,
msValidity: Number,
stepMax: Number,
@@ -64,9 +66,11 @@ export interface HttpParameters {
sigStock: number
sigWindow: number
sigValidity: number
+ sigReplay: number
sigQty: number
idtyWindow: number
msWindow: number
+ msPeriod: number
xpercent: number
msValidity: number
stepMax: number
diff --git a/doc/HTTP_API.md b/doc/HTTP_API.md
index 7ad4f00b9..da9a03499 100644
--- a/doc/HTTP_API.md
+++ b/doc/HTTP_API.md
@@ -668,9 +668,11 @@ The synchronization parameters.
sigStock: 45,
sigWindow: 604800,
sigValidity: 2629800,
+ sigReplay: 604800,
sigQty: 3,
idtyWindow: 604800,
msWindow: 604800,
+ msPeriod: 604800,
xpercent: 5,
msValidity: 2629800,
stepMax: 3,
--
GitLab