Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
timothe
duniter
Commits
8fa58ed7
Commit
8fa58ed7
authored
Dec 30, 2018
by
Cédric Moreau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[enh] BMA: blockchain/parameters: add sigReplay and msPeriod (cherry-picked from 1.7 branch)
parent
33db4e9c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
2 deletions
+12
-2
app/lib/dal/fileDALs/ConfDAL.ts
app/lib/dal/fileDALs/ConfDAL.ts
+2
-0
app/lib/dto/BlockDTO.ts
app/lib/dto/BlockDTO.ts
+2
-2
app/modules/bma/lib/controllers/blockchain.ts
app/modules/bma/lib/controllers/blockchain.ts
+2
-0
app/modules/bma/lib/dtos.ts
app/modules/bma/lib/dtos.ts
+4
-0
doc/HTTP_API.md
doc/HTTP_API.md
+2
-0
No files found.
app/lib/dal/fileDALs/ConfDAL.ts
View file @
8fa58ed7
...
...
@@ -42,8 +42,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
),
...
...
app/lib/dto/BlockDTO.ts
View file @
8fa58ed7
...
...
@@ -277,7 +277,7 @@ export class BlockDTO implements Cloneable {
udTime0
:
parseInt
(
sp
[
17
]),
udReevalTime0
:
parseInt
(
sp
[
18
]),
dtReeval
:
parseInt
(
sp
[
19
]),
// New parameter, defaults to msWindow
// New parameter
s
, defaults to msWindow
msPeriod
:
parseInt
(
sp
[
9
]),
sigReplay
:
parseInt
(
sp
[
9
]),
}
...
...
@@ -290,4 +290,4 @@ export class BlockDTO implements Cloneable {
static
getHash
(
block
:
any
)
{
return
BlockDTO
.
fromJSONObject
(
block
).
getHash
()
}
}
\ No newline at end of file
}
app/modules/bma/lib/controllers/blockchain.ts
View file @
8fa58ed7
...
...
@@ -86,8 +86,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
,
...
...
app/modules/bma/lib/dtos.ts
View file @
8fa58ed7
...
...
@@ -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
...
...
doc/HTTP_API.md
View file @
8fa58ed7
...
...
@@ -660,9 +660,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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment