From 6b0fc1cbd3e5ea228ecef4c2f0af4c6408745670 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Mon, 9 Oct 2017 21:10:20 +0200
Subject: [PATCH] [fix] #1145 Hot keyring changing is not taken into account
for the proof
---
app/modules/prover/lib/blockProver.ts | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/modules/prover/lib/blockProver.ts b/app/modules/prover/lib/blockProver.ts
index eb55ff838..1c68518f7 100644
--- a/app/modules/prover/lib/blockProver.ts
+++ b/app/modules/prover/lib/blockProver.ts
@@ -1,10 +1,10 @@
import {Constants} from "./constants"
-import {ConfDTO, Keypair} from "../../../lib/dto/ConfDTO"
import {Server} from "../../../../server"
import {PowEngine} from "./engine"
import {DBBlock} from "../../../lib/db/DBBlock"
import {CommonConstants} from "../../../lib/common-libs/constants"
import {BlockDTO} from "../../../lib/dto/BlockDTO"
+import {ConfDTO, Keypair} from "../../../lib/dto/ConfDTO"
const os = require('os')
const querablep = require('querablep')
@@ -94,15 +94,11 @@ export class WorkerFarm {
export class BlockProver {
- conf:ConfDTO
- pair:Keypair|null
logger:any
waitResolve:any
workerFarmPromise:any
constructor(private server:Server) {
- this.conf = server.conf
- this.pair = this.conf.pair
this.logger = server.logger
const debug = process.execArgv.toString().indexOf('--debug') !== -1;
@@ -112,6 +108,14 @@ export class BlockProver {
}
}
+ get conf():ConfDTO {
+ return this.server.conf
+ }
+
+ get pair(): Keypair|null {
+ return this.conf.pair
+ }
+
getWorker(): Promise<WorkerFarm> {
if (!this.workerFarmPromise) {
this.workerFarmPromise = (async () => {
--
GitLab