[GUI] Refactor ClientDataModel, implement account balances

libraries/app/api.cpp

@@ -82,14 +82,19 @@ namespace graphene { namespace app {
        return result;
     }
 
-    vector<optional<asset_object>> database_api::lookup_asset_symbols(const vector<string>& symbols)const
+    vector<optional<asset_object>> database_api::lookup_asset_symbols(const vector<string>& symbols_or_ids)const
     {
        const auto& assets_by_symbol = _db.get_index_type<asset_index>().indices().get<by_symbol>();
        vector<optional<asset_object> > result;
-       result.reserve(symbols.size());
+       result.reserve(symbols_or_ids.size());
-       std::transform(symbols.begin(), symbols.end(), std::back_inserter(result),
+       std::transform(symbols_or_ids.begin(), symbols_or_ids.end(), std::back_inserter(result),
-                      [&assets_by_symbol](const string& symbol) -> optional<asset_object> {
+                      [this, &assets_by_symbol](const string& symbol_or_id) -> optional<asset_object> {
-          auto itr = assets_by_symbol.find(symbol);
+          if( !symbol_or_id.empty() && std::isdigit(symbol_or_id[0]) )
+          {
+             auto ptr = _db.find(variant(symbol_or_id).as<asset_id_type>());
+             return ptr == nullptr? optional<asset_object>() : *ptr;
+          }
+          auto itr = assets_by_symbol.find(symbol_or_id);
           return itr == assets_by_symbol.end()? optional<asset_object>() : *itr;
        });
        return result;

libraries/app/include/graphene/app/api.hpp

@@ -110,12 +110,12 @@ namespace graphene { namespace app {
          vector<optional<account_object>> lookup_account_names(const vector<string>& account_names)const;
          /**
           * @brief Get a list of assets by symbol
-          * @param asset_symbols Symbols of the assets to retrieve
+          * @param asset_symbols Symbols or stringified IDs of the assets to retrieve
-          * @return The assets corresponding to the provided symbols
+          * @return The assets corresponding to the provided symbols or IDs
           *
           * This function has semantics identical to @ref get_objects
           */
-         vector<optional<asset_object>> lookup_asset_symbols(const vector<string>& asset_symbols)const;
+         vector<optional<asset_object>> lookup_asset_symbols(const vector<string>& symbols_or_ids)const;
 
          /**
           * @brief Get an account's balances in various assets

programs/light_client/ClientDataModel.cpp

@@ -5,58 +5,32 @@
 
 #include <fc/rpc/websocket_api.hpp>
 
+#include <QMetaObject>
+
 using namespace graphene::app;
 
-ChainDataModel::ChainDataModel( fc::thread& t, QObject* parent )
+template<typename T>
-:QObject(parent),m_thread(&t){}
+QString idToString(T id) {
+   return QString("%1.%2.%3").arg(T::space_id).arg(T::type_id).arg(ObjectId(id.instance));
+}
+QString idToString(graphene::db::object_id_type id) {
+   return QString("%1.%2.%3").arg(id.space(), id.type(), ObjectId(id.instance()));
+}
 
+ChainDataModel::ChainDataModel(fc::thread& t, QObject* parent)
+:QObject(parent),m_rpc_thread(&t){}
 
 Asset* ChainDataModel::getAsset(ObjectId id)
 {
-   auto& by_id_idx = m_assets.get<::by_id>();
+   auto& by_id_idx = m_assets.get<by_id>();
    auto itr = by_id_idx.find(id);
    if (itr == by_id_idx.end())
    {
-      auto tmp = new Asset(id, QString::number(--m_account_query_num), 0, this);
+      auto result = m_assets.insert(new Asset(id, QString::number(--m_account_query_num), 0, this));
-      auto result = m_assets.insert( tmp );
       assert(result.second);
 
-      /** execute in app thread */
+      // Run in RPC thread
-      m_thread->async( [this,id](){
+      m_rpc_thread->async([this,id,result]{ getAssetImpl(idToString(asset_id_type(id)), &*result.first); });
-         try {
-           ilog( "look up symbol.." );
-           auto result = m_db_api->get_assets( {asset_id_type(id)} );
-           wdump((result));
-
-           /** execute in main */
-           Q_EMIT queueExecute( [this,result,id](){
-              wlog( "process result" );
-              auto& by_id_idx = this->m_assets.get<::by_id>();
-              auto itr = by_id_idx.find(id);
-              assert( itr != by_id_idx.end() );
-
-              if( result.size() == 0 || !result.front() )
-              {
-                  elog( "delete later" );
-                  (*itr)->deleteLater();
-                  by_id_idx.erase( itr );
-              }
-              else
-              {
-                 by_id_idx.modify( itr,
-                    [=]( Asset* a ){
-                       a->setProperty("symbol", QString::fromStdString(result.front()->symbol) );
-                       a->setProperty("precision", result.front()->precision );
-                    }
-                 );
-              }
-           });
-         }
-         catch ( const fc::exception& e )
-         {
-            Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) );
-         }
-       });
       return *result.first;
    }
    return *itr;
@@ -68,84 +42,37 @@ Asset* ChainDataModel::getAsset(QString symbol)
    auto itr = by_symbol_idx.find(symbol);
    if (itr == by_symbol_idx.end())
    {
-      auto tmp = new Asset(--m_account_query_num, symbol, 0, this);
+      auto result = m_assets.insert(new Asset(--m_account_query_num, symbol, 0, this));
-      auto result = m_assets.insert( tmp );
       assert(result.second);
 
-      /** execute in app thread */
+      // Run in RPC thread
-      m_thread->async( [this,symbol](){
+      m_rpc_thread->async([this,symbol,result](){ getAssetImpl(symbol, &*result.first); });
-         try {
-           ilog( "look up symbol.." );
-           auto result = m_db_api->lookup_asset_symbols( {symbol.toStdString()} );
-           /** execute in main */
-           Q_EMIT queueExecute( [this,result,symbol](){
-              wlog( "process result" );
-              auto& by_symbol_idx = this->m_assets.get<by_symbol_name>();
-              auto itr = by_symbol_idx.find(symbol);
-              assert( itr != by_symbol_idx.end() );
-
-              if( result.size() == 0 || !result.front() )
-              {
-                  elog( "delete later" );
-                  (*itr)->deleteLater();
-                  by_symbol_idx.erase( itr );
-              }
-              else
-              {
-                 by_symbol_idx.modify( itr,
-                    [=]( Asset* a ){
-                       a->setProperty("id", ObjectId(result.front()->id.instance()));
-                       a->setProperty("precision", result.front()->precision );
-                    }
-                 );
-              }
-           });
-         }
-         catch ( const fc::exception& e )
-         {
-            Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) );
-         }
-       });
       return *result.first;
    }
    return *itr;
 }
 
-Account* ChainDataModel::getAccount(ObjectId id)
+void ChainDataModel::getAssetImpl(QString assetIdentifier, Asset* const * assetInContainer)
 {
-   auto& by_id_idx = m_accounts.get<::by_id>();
-   auto itr = by_id_idx.find(id);
-   if( itr == by_id_idx.end() )
-   {
-      auto tmp = new Account(id, QString::number(--m_account_query_num), this);
-      auto result = m_accounts.insert( tmp );
-      assert( result.second );
-
-      /** execute in app thread */
-      m_thread->async( [this,id](){
    try {
-           ilog( "look up names.." );
+      ilog("Fetching asset ${asset}", ("asset", assetIdentifier.toStdString()));
-           auto result = m_db_api->get_accounts( {account_id_type(id)} );
+      auto result = m_db_api->lookup_asset_symbols({assetIdentifier.toStdString()});
-           /** execute in main */
-           Q_EMIT queueExecute( [this,result,id](){
-              wlog( "process result" );
-              auto& by_id_idx = this->m_accounts.get<::by_id>();
-              auto itr = by_id_idx.find(id);
-              assert( itr != by_id_idx.end() );
 
-              if( result.size() == 0 || !result.front() )
+      // Run in main thread
-              {
+      Q_EMIT queueExecute([this,result,assetInContainer](){
-                  elog( "delete later" );
+         ilog("Processing result ${r}", ("r", result));
+         auto itr = m_assets.iterator_to(*assetInContainer);
+
+         if (result.size() == 0 || !result.front()) {
             (*itr)->deleteLater();
-                  by_id_idx.erase( itr );
+            m_assets.erase(itr);
-              }
+         } else {
-              else
+            m_assets.modify(itr,
-              {
+                            [=](Asset* a){
-                 by_id_idx.modify( itr,
+               a->setProperty("symbol", QString::fromStdString(result.front()->symbol));
-                    [=]( Account* a ){
+               a->setProperty("id", ObjectId(result.front()->id.instance()));
-                       a->setProperty("name", QString::fromStdString(result.front()->name) );
+               a->setProperty("precision", result.front()->precision);
-                    }
+            });
-                 );
          }
       });
    }
@@ -153,7 +80,98 @@ Account* ChainDataModel::getAccount(ObjectId id)
    {
       Q_EMIT exceptionThrown(QString::fromStdString(e.to_string()));
    }
+}
+
+void ChainDataModel::getAccountImpl(QString accountIdentifier, Account* const * accountInContainer)
+{
+   try {
+      ilog("Fetching account ${acct}", ("acct", accountIdentifier.toStdString()));
+      auto result = m_db_api->get_full_accounts([](const fc::variant& v) {
+         idump((v));
+      }, {accountIdentifier.toStdString()});
+      fc::variant_object accountPackage;
+
+      if (result.count(accountIdentifier.toStdString())) {
+         accountPackage = result.begin()->second.as<variant_object>();
+
+         // Fetch all necessary assets
+         auto balances = accountPackage["balances"].as<vector<account_balance_object>>();
+         QList<asset_id_type> assetsToFetch;
+         QList<Asset* const *> assetPlaceholders;
+         assetsToFetch.reserve(balances.size());
+         // Get list of asset IDs the account has a balance in
+         std::transform(balances.begin(), balances.end(), std::back_inserter(assetsToFetch),
+                        [](const account_balance_object& b) { return b.asset_type; });
+         auto function = [this,&assetsToFetch,&assetPlaceholders] {
+            auto itr = assetsToFetch.begin();
+            const auto& assets_by_id = m_assets.get<by_id>();
+            // Filter out assets I already have, create placeholders for the ones I don't.
+            while (itr != assetsToFetch.end()) {
+               if (assets_by_id.count(itr->instance))
+                  itr = assetsToFetch.erase(itr);
+               else {
+                  assetPlaceholders.push_back(&*m_assets.insert(new Asset(itr->instance, QString(), 0, this)).first);
+                  ++itr;
+               }
+            }
+         };
+         QMetaObject::invokeMethod(parent(), "execute", Qt::BlockingQueuedConnection,
+                                   Q_ARG(const std::function<void()>&, function));
+         assert(assetsToFetch.size() == assetPlaceholders.size());
+
+         // Blocking call to fetch and complete initialization for all the assets
+         for (int i = 0; i < assetsToFetch.size(); ++i)
+            getAssetImpl(idToString(assetsToFetch[i]), assetPlaceholders[i]);
+      }
+
+      // Run in main thread
+      Q_EMIT queueExecute([this,accountPackage,accountInContainer](){
+         ilog("Processing result ${r}", ("r", accountPackage));
+         auto itr = m_accounts.iterator_to(*accountInContainer);
+
+         if (!accountPackage.size()) {
+            (*itr)->deleteLater();
+            m_accounts.erase(itr);
+         } else {
+            m_accounts.modify(itr, [=](Account* a){
+               account_object account = accountPackage["account"].as<account_object>();
+               a->setProperty("id", ObjectId(account.id.instance()));
+               a->setProperty("name", QString::fromStdString(account.name));
+
+               // Set balances
+               QList<Balance*> balances;
+               auto balanceObjects = accountPackage["balances"].as<vector<account_balance_object>>();
+               std::transform(balanceObjects.begin(), balanceObjects.end(), std::back_inserter(balances),
+                              [this](const account_balance_object& b) {
+                  Balance* bal = new Balance;
+                  bal->setParent(this);
+                  bal->setProperty("amount", QVariant::fromValue(b.balance.value));
+                  bal->setProperty("type", QVariant::fromValue(getAsset(ObjectId(b.asset_type.instance))));
+                  return bal;
                });
+               a->setBalances(balances);
+            });
+         }
+      });
+   }
+   catch (const fc::exception& e)
+   {
+      Q_EMIT exceptionThrown(QString::fromStdString(e.to_string()));
+   }
+}
+
+Account* ChainDataModel::getAccount(ObjectId id)
+{
+   auto& by_id_idx = m_accounts.get<by_id>();
+   auto itr = by_id_idx.find(id);
+   if( itr == by_id_idx.end() )
+   {
+      auto tmp = new Account(id, tr("Account #%1").arg(--m_account_query_num), this);
+      auto result = m_accounts.insert(tmp);
+      assert(result.second);
+
+      // Run in RPC thread
+      m_rpc_thread->async([this, id, result]{getAccountImpl(idToString(account_id_type(id)), &*result.first);});
       return *result.first;
    }
    return *itr;
@@ -169,39 +187,8 @@ Account* ChainDataModel::getAccount(QString name)
       auto result = m_accounts.insert(tmp);
       assert(result.second);
 
-      /** execute in app thread */
+      // Run in RPC thread
-      m_thread->async( [this,name](){
+      m_rpc_thread->async([this, name, result]{getAccountImpl(name, &*result.first);});
-         try {
-           ilog( "look up names.." );
-           auto result = m_db_api->lookup_account_names( {name.toStdString()} );
-           /** execute in main */
-           Q_EMIT queueExecute( [this,result,name](){
-              wlog( "process result" );
-              auto& by_name_idx = this->m_accounts.get<by_account_name>();
-              auto itr = by_name_idx.find(name);
-              assert( itr != by_name_idx.end() );
-
-              if( result.size() == 0 || !result.front() )
-              {
-                  elog( "delete later" );
-                  (*itr)->deleteLater();
-                  by_name_idx.erase( itr );
-              }
-              else
-              {
-                 by_name_idx.modify( itr,
-                    [=]( Account* a ){
-                       a->setProperty("id", ObjectId(result.front()->id.instance()));
-                    }
-                 );
-              }
-           });
-         }
-         catch ( const fc::exception& e )
-         {
-            Q_EMIT exceptionThrown( QString::fromStdString(e.to_string()) );
-         }
-       });
       return *result.first;
    }
    return *itr;
@@ -209,20 +196,14 @@ Account* ChainDataModel::getAccount(QString name)
 
 QQmlListProperty<Balance> Account::balances()
 {
-   // This entire block is dummy data. Throw it away when this function gets a real implementation.
+   auto count = [](QQmlListProperty<Balance>* list) {
-   if (m_balances.empty())
+      return reinterpret_cast<Account*>(list->data)->m_balances.size();
-   {
+   };
-      auto asset = new Asset(0, QStringLiteral("CORE"), 5, this);
+   auto at = [](QQmlListProperty<Balance>* list, int index) {
-      m_balances.append(new Balance);
+      return reinterpret_cast<Account*>(list->data)->m_balances[index];
-      m_balances.back()->setProperty("amount", 5000000);
+   };
-      m_balances.back()->setProperty("type", QVariant::fromValue(asset));
-      asset = new Asset(0, QStringLiteral("USD"), 2, this);
-      m_balances.append(new Balance);
-      m_balances.back()->setProperty("amount", 3099);
-      m_balances.back()->setProperty("type", QVariant::fromValue(asset));
-   }
 
-   return QQmlListProperty<Balance>(this, m_balances);
+   return QQmlListProperty<Balance>(this, this, count, at);
 }
 
 GrapheneApplication::GrapheneApplication(QObject* parent)

programs/light_client/ClientDataModel.hpp

@@ -18,6 +18,8 @@
 using boost::multi_index_container;
 using namespace boost::multi_index;
 
+using graphene::chain::by_id;
+
 using ObjectId = qint64;
 Q_DECLARE_METATYPE(ObjectId)
 
@@ -83,7 +85,6 @@ Q_SIGNALS:
    void precisionChanged();
 };
 
-struct by_id;
 struct by_symbol_name;
 typedef multi_index_container<
    Asset*,
@@ -130,6 +131,13 @@ public:
    QString name()const { return m_name; }
    QQmlListProperty<Balance> balances();
 
+   void setBalances(QList<Balance*> balances) {
+      if (balances != m_balances) {
+         m_balances = balances;
+         Q_EMIT balancesChanged();
+      }
+   }
+
 Q_SIGNALS:
    void nameChanged();
    void balancesChanged();
@@ -147,6 +155,9 @@ typedef multi_index_container<
 class ChainDataModel : public QObject {
    Q_OBJECT
 
+   void getAssetImpl(QString assetIdentifier, Asset* const * assetInContainer);
+   void getAccountImpl(QString accountIdentifier, Account* const * accountInContainer);
+
 public:
    Q_INVOKABLE Account* getAccount(ObjectId id);
    Q_INVOKABLE Account* getAccount(QString name);
@@ -163,7 +174,7 @@ Q_SIGNALS:
    void exceptionThrown( QString message );
 
 private:
-   fc::thread*                           m_thread = nullptr;
+   fc::thread*                           m_rpc_thread = nullptr;
    std::string                           m_api_url;
    fc::api<graphene::app::database_api>  m_db_api;
 
@@ -190,7 +201,9 @@ class GrapheneApplication : public QObject {
 
    void setIsConnected(bool v);
 
-   Q_SLOT void execute( const std::function<void()>& )const;
+protected Q_SLOTS:
+   void execute(const std::function<void()>&)const;
+
 public:
    GrapheneApplication(QObject* parent = nullptr);
    ~GrapheneApplication();

programs/light_client/qml/FormBox.qml

@@ -84,7 +84,6 @@ Rectangle {
          StateChangeScript {
             name: "postHidden"
             script: {
-               console.log("Post")
                greySheet.closed()
                formContainer.data = []
                if (internal.callback instanceof Function)

programs/light_client/qml/main.qml

@@ -110,15 +110,10 @@ ApplicationWindow {
             if (acct == null)
                console.log("Got back null account")
             else if ( !(parseInt(acct.name) <= 0)  )
-            {
-               console.log("NAME ALREADY SET" );
                console.log(JSON.stringify(acct))
-            }
+            else {
-            else
-            {
                console.log("Waiting for result...")
                acct.nameChanged.connect(function() {
-                  console.log( "NAME CHANGED" );
                   console.log(JSON.stringify(acct))
                })
             }
@@ -141,14 +136,12 @@ ApplicationWindow {
                console.log("Got back null asset")
             else if ( !(parseInt(acct.name) <= 0)  )
             {
-               console.log("NAME ALREADY SET" );
                console.log(JSON.stringify(acct))
             }
             else
             {
                console.log("Waiting for result...")
                acct.nameChanged.connect(function() {
-                  console.log( "NAME CHANGED" );
                   console.log(JSON.stringify(acct))
                })
             }