make try except more concise, add verbose param to package_broadcast

Author: f321x

electrumx/server/session.py

@@ -1474,7 +1474,7 @@ async def transaction_broadcast(self, raw_tx):
             self.logger.info(f'sent tx: {hex_hash}')
             return hex_hash
 
-    async def package_broadcast(self, tx_package: List[str]):
+    async def package_broadcast(self, tx_package: List[str], verbose: bool = False) -> dict:
         """Broadcast a package of raw transactions to the network (submitpackage).
         The package must consist of a child with its parents,
         and none of the parents may depend on one another.
@@ -1483,12 +1483,13 @@ async def package_broadcast(self, tx_package: List[str]):
         self.bump_cost(0.25 + sum(len(tx) / 5000 for tx in tx_package))
         try:
             txids = [sha256(bytes.fromhex(tx)).hex() for tx in tx_package]
-            result = await self.session_mgr.broadcast_package(tx_package)
         except ValueError:
             self.logger.info(f"error calculating txids: {traceback.format_exc()}")
             raise RPCError(
                 BAD_REQUEST,
                 f'not a valid hex encoded transaction package: {tx_package}')
+        try:
+            result = await self.session_mgr.broadcast_package(tx_package)
         except DaemonError as e:
             error, = e.args
             message = error['message']
@@ -1497,16 +1498,11 @@ async def package_broadcast(self, tx_package: List[str]):
                            f'network rules.\n\n{message}. Package txids: {txids}')
         else:
             self.txs_sent += len(tx_package)
-            client_ver = util.protocol_tuple(self.client)
-            if client_ver != (0, ):
-                msg = self.coin.warn_old_client_on_tx_broadcast(client_ver)
-                if msg:
-                    self.logger.info(f'sent package: {txids}. and warned user to upgrade their '
-                                     f'client from {self.client}')
-                    return msg
-
             self.logger.info(f'broadcasted package: {txids}')
-            return result
+            if verbose:
+                return result
+            return {'package_msg': result.get('package_msg', ''),
+                    'replaced_txs': result.get('replaced_txs', [])}
 
     async def transaction_get(self, tx_hash, verbose=False):
         '''Return the serialized raw transaction given its hash