Merge #1328: Report offerlist in /session call if possible

b2ab4db add nickname field to session response (Adam Gibson)
8ee6b39 Report offerlist in /session call if possible (Adam Gibson)

docs/api/wallet-rpc.yaml

@@ -732,6 +732,25 @@ components:
         wallet_name:
           type: string
           example: wallet.jmdat
+        offer_list:
+          type: array
+          items:
+            type: object
+            properties:
+              oid:
+                type: integer
+              ordertype:
+                type: string
+              minsize:
+                type: integer
+              maxsize:
+                type: integer
+              txfee:
+                type: integer
+              cjfee:
+                type: string
+        nickname:
+          type: string
     ListUtxosResponse:
       type: object
       properties:

jmclient/jmclient/wallet_rpc.py

@@ -590,18 +590,30 @@ class JMWalletDaemon(Service):
             session = not self.cookie==None
             maker_running = self.coinjoin_state == CJ_MAKER_RUNNING
             coinjoin_in_process = self.coinjoin_state == CJ_TAKER_RUNNING
+
+            # fields which may or may not be available:
             schedule = None
+            offer_list = None
+            nickname = None
 
             if self.services["wallet"]:
                 if self.services["wallet"].isRunning():
                     wallet_name = self.wallet_name
-                    if self.coinjoin_state == CJ_TAKER_RUNNING and self.tumbler_options is not None:
-                        auth_header = request.getHeader('Authorization')
-                        if auth_header is not None:
-                            # At this point if an `auth_header` is present, it has been checked
-                            # by the call to `check_cookie_if_present` above.
-                            if self.taker is not None and not self.taker.aborted:
-                                schedule = self.taker.schedule
+                    # At this point if an `auth_header` is present, it has been checked
+                    # by the call to `check_cookie_if_present` above.
+                    auth_header = request.getHeader('Authorization')
+                    if auth_header is not None:
+                        if self.coinjoin_state == CJ_TAKER_RUNNING and \
+                           self.tumbler_options is not None:
+                                if self.taker is not None and not self.taker.aborted:
+                                    schedule = self.taker.schedule
+                        elif maker_running:
+                            offer_list = self.services["maker"].yieldgen.offerlist
+                            # maker's nick is useful for tracking; so we only report
+                            # it if authed and maker running:
+                            if jm_single().nickname is not None:
+                                nickname = jm_single().nickname
+
                 else:
                     wallet_name = "not yet loaded"
             else:
@@ -611,7 +623,9 @@ class JMWalletDaemon(Service):
                             maker_running=maker_running,
                             coinjoin_in_process=coinjoin_in_process,
                             schedule=schedule,
-                            wallet_name=wallet_name)
+                            wallet_name=wallet_name,
+                            offer_list=offer_list,
+                            nickname=nickname)
 
         @app.route('/wallet/<string:walletname>/taker/direct-send', methods=['POST'])
         def directsend(self, request, walletname):