Remove loop, instead hook into 'locked' state

Change 'coldstaking' to 'ui:coldstaking'
particl · Oct 31, 2017 · 99d824c · 99d824c
1 parent 05e6afe
commit 99d824c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 28 deletions.
diff --git a/src/app/core/rpc/rpc-state.class.ts b/src/app/core/rpc/rpc-state.class.ts
@@ -16,7 +16,7 @@ export class RPCStateClass {
     this.lastBlockTimeState();
     this.blockLoop();
     this.walletLockedState();
-    this.coldStakeLoop();
+    this.coldStakeHook();
     this.initWalletState();
   }
 
@@ -50,36 +50,43 @@ export class RPCStateClass {
       .set('locked', ['Locked', 'Unlocked, staking only'].includes(status)));
   }
 
-  private coldStakeLoop() {
-    if (this.rpc.state.get('locked') === false) {
-      // only available if unlocked
-      this.rpc.call('walletsettings', ['changeaddress'])
-      .subscribe(
-        response => this.rpc.state.set('coldstaking',
-          response.changeaddress === 'default' ? false : !!response.changeaddress.coldstakingaddress
-        ),
-        error => this.log.er('walletsettings changeaddress, returned an error', error));
-
-    }
+  /*
+  * coldStakeHook
+  *   Subscribes to general unlock events and makes use of the time to
+  *   update the coldstaking state.
+  */
+  private coldStakeHook() {
+    this.rpc.state.observe('locked').subscribe(
+      locked => {
+        if (locked === false) {
+          // only available if unlocked
+          this.rpc.call('walletsettings', ['changeaddress'])
+          .subscribe(
+            // set state for coldstaking
+            response => this.rpc.state.set('ui:coldstaking',
+              response.changeaddress === 'default' ? false : !!response.changeaddress.coldstakingaddress
+              ),
+            error => this.log.er('walletsettings changeaddress, returned an error', error));
 
-    setTimeout(this.coldStakeLoop.bind(this), 1000);
+        }
+      });
   }
 
-    private initWalletState() {
+  private initWalletState() {
 
-      this.rpc.state.observe('encryptionstatus').take(1)
-      .subscribe(
-        status => {
-          const locked = this.rpc.state.get('locked');
+    this.rpc.state.observe('encryptionstatus').take(1)
+    .subscribe(
+      status => {
+        const locked = this.rpc.state.get('locked');
 
-          if (locked) {
-            this.rpc.state.set('walletInitialized', true);
-            return;
-          }
+        if (locked) {
+          this.rpc.state.set('walletInitialized', true);
+          return;
+        }
 
-          this.rpc.call('extkey', ['list'])
-          .subscribe(
-            response => {
+        this.rpc.call('extkey', ['list'])
+        .subscribe(
+          response => {
                 // check if account is active
                 if (response.result === 'No keys to list.') {
                   this.rpc.state.set('walletInitialized', false);
@@ -88,6 +95,6 @@ export class RPCStateClass {
                 }
               },
               error => this.log.er('RPC Call returned an error', error));
-        });
-    }
+      });
   }
+}
diff --git a/src/app/overview/widgets/coldstake/coldstake.component.ts b/src/app/overview/widgets/coldstake/coldstake.component.ts
@@ -16,7 +16,7 @@ export class ColdstakeComponent implements OnInit {
     private _modals: ModalsService,
     private _rpc: RPCService
   ) {
-    this._rpc.state.observe('coldstaking').subscribe(status => this.coldStakingEnabled = status);
+    this._rpc.state.observe('ui:coldstaking').subscribe(status => this.coldStakingEnabled = status);
   }
 
   ngOnInit() {