Merge pull request #2033 from bitshares/custom_plugin_wallet_error

remove custom operation plugin check from custom api creation
bitshares · Oct 29, 2019 · b70d7f2 · b70d7f2
2 parents b12bbcd + f6738ec
commit b70d7f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -1905,9 +1905,9 @@ signed_transaction wallet_api::account_store_map(string account, string catalog,
 }
 
 vector<account_storage_object> wallet_api::get_account_storage(string account, string catalog)
-{
+{ try {
    return my->_custom_operations->get_storage_info(account, catalog);
-}
+} FC_CAPTURE_AND_RETHROW( (account)(catalog) ) }
 
 signed_block_with_info::signed_block_with_info( const signed_block& block )
    : signed_block( block )

diff --git a/libraries/wallet/wallet_api_impl.cpp b/libraries/wallet/wallet_api_impl.cpp
@@ -56,9 +56,15 @@ namespace graphene { namespace wallet { namespace detail {
         _remote_api(rapi),
         _remote_db(rapi->database()),
         _remote_net_broadcast(rapi->network_broadcast()),
-        _remote_hist(rapi->history()),
-        _custom_operations(rapi->custom())
+        _remote_hist(rapi->history())
    {
+      try {
+         _custom_operations = rapi->custom();
+      }
+      catch(const fc::exception& e)
+      {
+         wlog("Custom operations API is not active on server.");
+      }
       chain_id_type remote_chain_id = _remote_db->get_chain_id();
       if( remote_chain_id != _chain_id )
       {