From 8d5c1ed9ae5487d6c12ca2926ca4fba3005b5f9a Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Mon, 25 Sep 2017 13:16:41 +0200
Subject: [PATCH] [fix] #1118 WS2P pull was broken due to a missing property on
the remote node object
---
app/modules/ws2p/lib/WS2PBlockPuller.ts | 4 +++-
app/modules/ws2p/lib/WS2PRequester.ts | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/modules/ws2p/lib/WS2PBlockPuller.ts b/app/modules/ws2p/lib/WS2PBlockPuller.ts
index 59ee4da09..df7ec78c9 100644
--- a/app/modules/ws2p/lib/WS2PBlockPuller.ts
+++ b/app/modules/ws2p/lib/WS2PBlockPuller.ts
@@ -27,6 +27,7 @@ interface RemoteNode {
getCurrent: () => Promise<BlockDTO>
getBlock: (number:number) => Promise<BlockDTO>
getBlocks: (count:number, fromNumber:number) => Promise<BlockDTO[]>
+ pubkey:string
}
class WS2PDao extends AbstractDAO {
@@ -50,7 +51,8 @@ class WS2PDao extends AbstractDAO {
},
getBlocks: async (count:number, fromNumber:number) => {
return this.requester.getBlocks(count, fromNumber)
- }
+ },
+ pubkey: this.requester.getPubkey()
}
}
diff --git a/app/modules/ws2p/lib/WS2PRequester.ts b/app/modules/ws2p/lib/WS2PRequester.ts
index f3ed8818d..cd2d7c647 100644
--- a/app/modules/ws2p/lib/WS2PRequester.ts
+++ b/app/modules/ws2p/lib/WS2PRequester.ts
@@ -29,6 +29,10 @@ export class WS2PRequester {
return this.query(WS2P_REQ.BLOCKS_CHUNK, { count, fromNumber })
}
+ getPubkey() {
+ return this.ws2pc.pubkey || "########"
+ }
+
async getRequirementsPending(minCert = 1): Promise<any> {
return this.query(WS2P_REQ.WOT_REQUIREMENTS_OF_PENDING, { minCert })
}
--
GitLab