-added reason for failure messages to create offer

-trade manager now shows colour names for side wallets

Author: matt-o-how

electron-ui/trade_renderer.js

@@ -147,7 +147,7 @@ function set_callbacks(socket) {
 
         if (command == "start_server") {
             get_wallet_summaries()
-            get_wallets();
+            //get_wallets();
             get_height_info();
             get_sync_status();
             get_connection_info();
@@ -316,21 +316,21 @@ function handle_state_changed(data) {
     state = data["state"]
     console.log("State changed", state)
     if(global_syncing) {
-        get_wallets()
+        get_wallet_summaries()
         get_sync_status()
         get_height_info()
         return;
     }
 
     if (state == "coin_removed") {
     } else if (state == "coin_added") {
-        get_wallets()
+        get_wallet_summaries()
     } else if (state == "pending_transaction") {
-        get_wallets()
+        get_wallet_summaries()
     } else if (state == "tx_sent") {
-        get_wallets()
+        get_wallet_summaries()
     } else if (state == "balance_changed") {
-        get_wallets()
+        get_wallet_summaries()
     } else if (state == "sync_changed") {
         get_sync_status()
     } else if (state == "new_block") {
@@ -697,6 +697,35 @@ function get_wallet_summaries_response(data){
   select_option = create_select_options(wallets_details)
   select_menu.innerHTML = select_option
   set_drop_down()
+  var new_innerHTML = ""
+  for (var i in data) {
+      var wallet = data[i];
+      var type = wallet["type"]
+      var id = i
+      var name = wallet["type"]
+
+      get_wallet_balance(id)
+      //href, wallet_name, wallet_description, wallet_amount
+      var href = ""
+      if (type == "STANDARD_WALLET") {
+          href = "./wallet-dark.html"
+          name = "Chia Wallet"
+          type = "Chia"
+      } else if (type == "RATE_LIMITED") {
+          href = "rl_wallet/rl_wallet.html"
+      } else if (type == "COLOURED_COIN") {
+          href = "cc_wallet/cc_wallet.html"
+          name = "CC Wallet"
+          type = wallet["name"]
+          if (type.length > 18) {
+            type = type.substring(0,18);
+            type = type.concat("...")
+          }
+      }
+      new_innerHTML += create_side_wallet(id, href, name, type, 0, false)
+  }
+  new_innerHTML += create_wallet_button()
+  wallets_tab.innerHTML = new_innerHTML
 }
 
 

src/wallet/trade_manager.py

@@ -57,7 +57,9 @@ async def create_offer_for_ids(
                 wallet = self.wallet_state_manager.wallets[wallet_id]
                 if isinstance(wallet, CCWallet):
                     balance = await wallet.get_confirmed_balance()
-                    if balance == 0:
+                    if balance < abs(amount) and amount < 0:
+                        raise Exception(f"insufficient funds in wallet {wallet_id}")
+                    if balance == 0 and amount > 0:
                         if spend_bundle is None:
                             to_exclude: List[Coin] = []
                         else:
@@ -67,9 +69,7 @@ async def create_offer_for_ids(
                         ] = await wallet.generate_zero_val_coin(False, to_exclude)
 
                         if zero_spend_bundle is None:
-                            raise ValueError(
-                                "Failed to generate offer. Zero value coin not created."
-                            )
+                            raise Exception("Failed to generate offer. Zero value coin not created.")
                         if spend_bundle is None:
                             spend_bundle = zero_spend_bundle
                         else:
@@ -102,7 +102,7 @@ async def create_offer_for_ids(
                 else:
                     return False, None
                 if new_spend_bundle.removals() == [] or new_spend_bundle is None:
-                    return False, None
+                    raise Exception(f"Wallet {id} was unable to create offer.")
                 if spend_bundle is None:
                     spend_bundle = new_spend_bundle
                 else:
@@ -111,11 +111,12 @@ async def create_offer_for_ids(
                     )
 
             return True, spend_bundle
-        except Exception:
-            return False, None
+        except Exception as e:
+            return False, str(e)
 
     def write_offer_to_disk(self, file_path: Path, offer: SpendBundle):
-        file_path.write_text(bytes(offer).hex())
+        if offer is not None:
+            file_path.write_text(bytes(offer).hex())
 
     async def get_discrepancies_for_offer(
         self, file_path: Path

src/wallet/websocket_server.py

@@ -458,8 +458,10 @@ async def create_offer_for_ids(self, websocket, request, response_api):
         success, spend_bundle = await self.trade_manager.create_offer_for_ids(offer)
         if success:
             self.trade_manager.write_offer_to_disk(Path(file_name), spend_bundle)
+            response = {"success": success}
+        else:
+            response = {"success": success, "reason": spend_bundle}
 
-        response = {"success": success}
         return await websocket.send(format_response(response_api, response))
 
     async def respond_to_offer(self, websocket, request, response_api):