add solution id to more places

HarukaMa · Jul 12, 2024 · ad10546 · ad10546
1 parent fef48b4
commit ad10546
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/db/address.py b/db/address.py
@@ -21,7 +21,7 @@ async def get_recent_solutions_by_address(self, address: str) -> list[dict[str,
             async with conn.cursor() as cur:
                 try:
                     await cur.execute(
-                        "SELECT b.height, b.timestamp, s.counter, s.target, reward, ps.target_sum "
+                        "SELECT b.height, b.timestamp, s.counter, s.target, s.solution_id, reward, ps.target_sum "
                         "FROM solution s "
                         "JOIN puzzle_solution ps ON ps.id = s.puzzle_solution_id "
                         "JOIN block b ON b.id = ps.block_id "
@@ -54,7 +54,7 @@ async def get_solution_by_address(self, address: str, start: int, end: int) -> l
             async with conn.cursor() as cur:
                 try:
                     await cur.execute(
-                        "SELECT b.height, b.timestamp, s.counter, s.target, reward, ps.target_sum "
+                        "SELECT b.height, b.timestamp, s.counter, s.target, s.solution_id, reward, ps.target_sum "
                         "FROM solution s "
                         "JOIN puzzle_solution ps ON ps.id = s.puzzle_solution_id "
                         "JOIN block b ON b.id = ps.block_id "

diff --git a/webui/proving_routes.py b/webui/proving_routes.py
@@ -143,6 +143,7 @@ async def address_route(request: Request):
             "counter": solution["counter"],
             "target": solution["target"],
             "target_sum": solution["target_sum"],
+            "solution_id": solution["solution_id"],
         })
     recent_programs: list[dict[str, Any]] = []
     for program in programs:
@@ -301,6 +302,7 @@ async def address_solution_route(request: Request):
             "counter": solution["counter"],
             "target": solution["target"],
             "target_sum": solution["target_sum"],
+            "solution_id": solution["solution_id"],
         })
     sync_info = await out_of_sync_check(request.app.state.session, db)
     ctx = {

diff --git a/webui/templates/htmx/address.jinja2 b/webui/templates/htmx/address.jinja2
@@ -145,6 +145,7 @@
                         <th>Block</th>
                         <th>Epoch</th>
                         <th>Timestamp</th>
+                        <th>Solution ID</th>
                         <th>Counter</th>
                         <th>Target / Total</th>
                         <th>Reward</th>
@@ -156,6 +157,7 @@
                             <td><a href="/block?h={{ solution.height }}">{{ solution.height | format_number | safe }}</a></td>
                             <td>{{ solution.height // 256 }}</td>
                             <td>{{ solution.timestamp | format_time | safe }}</td>
+                            <td><span class="mono">{{ solution.solution_id }}</span></td>
                             <td>{{ solution.counter }}</td>
                             <td>{{ solution.target | format_number | safe }}<span class="note"> / {{ solution.target_sum | format_number | safe }}</span></td>
                             <td>{{ solution.reward | format_aleo_credit | safe }}</td>

diff --git a/webui/templates/htmx/address_solution.jinja2 b/webui/templates/htmx/address_solution.jinja2
@@ -17,6 +17,7 @@
                     <th>Block</th>
                     <th>Epoch</th>
                     <th>Timestamp</th>
+                    <th>Solution ID</th>
                     <th>counter</th>
                     <th>Target / Total</th>
                     <th>Reward</th>
@@ -28,6 +29,7 @@
                         <td><a href="/block?h={{ solution.height }}">{{ solution.height }}</a></td>
                         <td>{{ solution.height // 256 }}</td>
                         <td>{{ solution.timestamp | format_time | safe }}</td>
+                        <td><span class="mono">{{ solution.solution_id }}</span></td>
                         <td>{{ solution.counter }}</td>
                         <td>{{ solution.target }}<span class="note"> / {{ solution.target_sum }}</span></td>
                         <td>{{ solution.reward | format_aleo_credit | safe }}</td>

diff --git a/webui/templates/htmx/block.jinja2 b/webui/templates/htmx/block.jinja2
@@ -155,21 +155,21 @@
                 <table id="coinbase-table" class="unstriped">
                     <thead>
                     <tr>
+                        <td>Solution ID</td>
                         <td>Address</td>
                         <td>Counter</td>
                         <td>Target / Total</td>
                         <td>Reward</td>
-                        <td>SolutionID</td>
                     </tr>
                     </thead>
                     <tbody>
                     {% for partial_solution in coinbase_solutions %}
                     <tr>
+                        <td><span class="mono">{{ partial_solution.solution_id }}</span></td>
                         <td><a href="/address?a={{ partial_solution.address }}"><span class="mono">{{ partial_solution.address_trunc }}</span></a></td>
                         <td><span class="mono">{{ partial_solution.counter }}</span></td>
                         <td>{{ partial_solution.target | format_number | safe }}<span class="note"> / {{ target_sum | format_number | safe }}</span></td>
                         <td>{{ partial_solution.reward | format_aleo_credit | safe }}</td>
-                        <td> {{ partial_solution.solution_id }}</td>
                     </tr>
                     {% endfor %}
                     </tbody>