- Added nodePublicKey in NodeInfo

- Cache nodePublicKey in RepoFactory

Author: rg911

e2e/infrastructure/NodeHttp.spec.ts

@@ -42,6 +42,7 @@ describe('NodeHttp', () => {
             expect(nodeInfo.publicKey).not.to.be.undefined;
             expect(nodeInfo.roles).not.to.be.undefined;
             expect(nodeInfo.version).not.to.be.undefined;
+            expect(nodeInfo.nodePublicKey).not.to.be.undefined;
         });
     });
 
@@ -93,7 +94,7 @@ describe('NodeHttp', () => {
 
     describe('getUnlockedAccount', () => {
         it('should return unlocked account', async () => {
-            const unlockedAccount = await nodeRepository.getUnlockedAccount('test').toPromise();
+            const unlockedAccount = await nodeRepository.getUnlockedAccount().toPromise();
             expect(unlockedAccount).not.to.be.null;
             expect(unlockedAccount.length).greaterThan(0);
         });

package-lock.json

@@ -113,7 +113,7 @@
         "ripemd160": "^2.0.2",
         "rxjs": "^6.6.3",
         "rxjs-compat": "^6.6.3",
-        "symbol-openapi-typescript-fetch-client": "0.10.1-SNAPSHOT.202011091143",
+        "symbol-openapi-typescript-fetch-client": "0.10.1-SNAPSHOT.202011141947",
         "tweetnacl": "^1.0.3",
         "ws": "^7.3.1"
     },

package.json

@@ -113,11 +113,10 @@ export class NodeHttp extends Http implements NodeRepository {
 
     /**
      * Return unlocked harvesting account from node.
-     * @param peer Peer node host name.
      * @returns Observable<string[]>
      */
-    getUnlockedAccount(peer: string): Observable<string[]> {
-        return this.call(this.nodeRoutesApi.getUnlockedAccount(peer), (body) => {
+    getUnlockedAccount(): Observable<string[]> {
+        return this.call(this.nodeRoutesApi.getUnlockedAccount(), (body) => {
             return body.unlockedAccount;
         });
     }
@@ -138,6 +137,7 @@ export class NodeHttp extends Http implements NodeRepository {
             this.getNodeRoles(nodeInfo.roles.valueOf()),
             nodeInfo.host,
             nodeInfo.friendlyName,
+            nodeInfo.nodePublicKey,
         );
     }
 

src/infrastructure/NodeHttp.ts

@@ -54,6 +54,7 @@ export interface NodeRepository {
 
     /**
      * Gets blockchain storage info.
+     * @param hostName Peer node host name.
      * @returns Observable<StorageInfo>
      */
     getStorageInfo(): Observable<StorageInfo>;
@@ -66,8 +67,7 @@ export interface NodeRepository {
 
     /**
      * Return unlocked harvesting account from node.
-     * @param peer Peer node host name.
      * @returns Observable<string[]>
      */
-    getUnlockedAccount(peer: string): Observable<string[]>;
+    getUnlockedAccount(): Observable<string[]>;
 }

src/infrastructure/NodeRepository.ts

@@ -153,4 +153,9 @@ export interface RepositoryFactory {
      * @returns the network currencies.
      */
     getCurrencies(): Observable<NetworkCurrencies>;
+
+    /**
+     * @returns the node public key
+     */
+    getNodePublicKey(): Observable<string | undefined>;
 }

src/infrastructure/RepositoryFactory.ts

@@ -51,4 +51,9 @@ export interface RepositoryFactoryConfig {
      * The preconfigured symbol network currencies for offline access. They are loaded from server by default if not provided.
      */
     networkCurrencies?: NetworkCurrencies;
+
+    /**
+     * The node public key used for NodeKeyLink transaction in delegated harvesting.
+     */
+    nodePublicKey?: string;
 }

src/infrastructure/RepositoryFactoryConfig.ts

@@ -73,6 +73,7 @@ export class RepositoryFactoryHttp implements RepositoryFactory {
     private readonly epochAdjustment: Observable<number>;
     private readonly networkProperties: Observable<NetworkConfiguration>;
     private readonly networkCurrencies: Observable<NetworkCurrencies>;
+    private readonly nodePublicKey: Observable<string | undefined>;
     /**
      * Constructor
      * @param url the server url.
@@ -93,13 +94,14 @@ export class RepositoryFactoryHttp implements RepositoryFactory {
                       }),
                   ),
               );
-        this.generationHash = configs?.generationHash
-            ? observableOf(configs.generationHash)
-            : this.cache(() =>
-                  this.createNodeRepository()
-                      .getNodeInfo()
-                      .pipe(map((b) => b.networkGenerationHashSeed)),
-              );
+        if (configs?.generationHash && configs?.nodePublicKey) {
+            this.generationHash = observableOf(configs.generationHash);
+            this.nodePublicKey = observableOf(configs.nodePublicKey);
+        } else {
+            const nodeInfoObservable = this.createNodeRepository().getNodeInfo();
+            this.generationHash = this.cache(() => nodeInfoObservable.pipe(map((b) => b.networkGenerationHashSeed)));
+            this.nodePublicKey = this.cache(() => nodeInfoObservable.pipe(map((b) => b.nodePublicKey)));
+        }
         this.websocketUrl = configs?.websocketUrl ? configs?.websocketUrl : `${url.replace(/\/$/, '')}/ws`;
         this.websocketInjected = configs?.websocketInjected;
         this.networkCurrencies = configs?.networkCurrencies
@@ -198,4 +200,10 @@ export class RepositoryFactoryHttp implements RepositoryFactory {
     getCurrencies(): Observable<NetworkCurrencies> {
         return this.networkCurrencies;
     }
+    /**
+     * @returns the node public key
+     */
+    getNodePublicKey(): Observable<string | undefined> {
+        return this.nodePublicKey;
+    }
 }

src/infrastructure/RepositoryFactoryHttp.ts

@@ -29,6 +29,7 @@ export class NodeInfo {
      * @param roles
      * @param host
      * @param friendlyName
+     * @param nodePublicKey
      */
     constructor(
         /**
@@ -63,5 +64,9 @@ export class NodeInfo {
          * The name of the node.
          */
         public readonly friendlyName: string,
+        /**
+         * The node public key used for NodeKeyLink transaction.
+         */
+        public readonly nodePublicKey?: string,
     ) {}
 }

src/model/node/NodeInfo.ts

@@ -203,9 +203,9 @@ describe('NodeHttp', () => {
     it('getUnlockedAccount', async () => {
         const body = { unlockedAccount: ['key1', 'key2'] };
 
-        when(nodeRoutesApi.getUnlockedAccount('test')).thenReturn(Promise.resolve(body));
+        when(nodeRoutesApi.getUnlockedAccount()).thenReturn(Promise.resolve(body));
 
-        const unlockedAccount = await nodeRepository.getUnlockedAccount('test').toPromise();
+        const unlockedAccount = await nodeRepository.getUnlockedAccount().toPromise();
         expect(unlockedAccount).to.be.not.null;
         expect(unlockedAccount[0]).to.be.equal('key1');
         expect(unlockedAccount[1]).to.be.equal('key2');