merge manually

src/controller.h

@@ -72,6 +72,8 @@ public:
 
     void saveWallet(const std::function<void(json)>& cb) { zrpc->saveWallet(cb); }
 
+    void clearWallet(const std::function<void(json)>& cb) { zrpc->clearWallet(cb); }
+
     void createNewZaddr(bool sapling, const std::function<void(json)>& cb) { 
         unlockIfEncrypted([=] () {
             zrpc->createNewZaddr(sapling, cb);
@@ -117,6 +119,7 @@ public:
     QString getDefaultTAddress();   
     
 private:
+    void processInfo(const json&);
     void refreshBalances();
 
     void refreshTransactions();