renegade-bots: integrate new descriptions

renegade-fi · Mar 23, 2024 · cde032f · cde032f
1 parent 3340316
commit cde032f
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 42 deletions.
diff --git a/trade.renegade.fi/components/panels/wallets-panel.tsx b/trade.renegade.fi/components/panels/wallets-panel.tsx
@@ -355,9 +355,9 @@ function HistorySection() {
     const TASK_TO_NAME = {
       Queued: "Queued",
       [TaskState.Proving]: "Proving",
-      [TaskState.SubmittingTx]: "Submitting Transaction",
-      [TaskState.FindingOpening]: "Validating",
-      [TaskState.UpdatingValidityProofs]: "Validating",
+      [TaskState["Submitting Tx"]]: "Submitting Transaction",
+      [TaskState["Finding Opening"]]: "Validating",
+      [TaskState["Updating Validity Proofs"]]: "Validating",
       [TaskState.Completed]: "Completed",
     }
     return (

diff --git a/trade.renegade.fi/components/task-status.tsx b/trade.renegade.fi/components/task-status.tsx
@@ -14,70 +14,69 @@ import { useOrders } from "@/hooks/use-order"
 const TASK_TO_LATENCY = {
   [TaskType.InitializeAccount]: {
     [TaskState.Proving]: 41000,
-    [TaskState.SubmittingTx]: 4000,
-    // @ts-ignore
-    FindingMerkleOpening: 4000,
-    [TaskState.FindingOpening]: 4000,
-    [TaskState.UpdatingValidityProofs]: 0,
+    [TaskState["Submitting Tx"]]: 4000,
+    [TaskState["Finding Opening"]]: 4000,
+    [TaskState["Updating Validity Proofs"]]: 0,
     [TaskState.Completed]: 0,
   },
   [TaskType.Deposit]: {
     [TaskState.Proving]: 22000,
-    [TaskState.SubmittingTx]: 1000,
-    [TaskState.FindingOpening]: 1000,
-    [TaskState.UpdatingValidityProofs]: 48000,
+    [TaskState["Submitting Tx"]]: 1000,
+    [TaskState["Finding Opening"]]: 1000,
+    [TaskState["Updating Validity Proofs"]]: 48000,
     [TaskState.Completed]: 0,
   },
   [TaskType.Withdrawal]: {
     [TaskState.Proving]: 22000,
-    [TaskState.SubmittingTx]: 1000,
-    [TaskState.FindingOpening]: 1000,
-    [TaskState.UpdatingValidityProofs]: 48000,
+    [TaskState["Submitting Tx"]]: 1000,
+    [TaskState["Finding Opening"]]: 1000,
+    [TaskState["Updating Validity Proofs"]]: 48000,
     [TaskState.Completed]: 0,
   },
   [TaskType.PlaceOrder]: {
     [TaskState.Proving]: 22000,
-    [TaskState.SubmittingTx]: 1000,
-    [TaskState.FindingOpening]: 0,
-    [TaskState.UpdatingValidityProofs]: 48000,
+    [TaskState["Submitting Tx"]]: 1000,
+    [TaskState["Finding Opening"]]: 0,
+    [TaskState["Updating Validity Proofs"]]: 48000,
     [TaskState.Completed]: 0,
   },
   [TaskType.ModifyOrder]: {
     [TaskState.Proving]: 22000,
-    [TaskState.SubmittingTx]: 1000,
-    [TaskState.FindingOpening]: 0,
-    [TaskState.UpdatingValidityProofs]: 48000,
+    [TaskState["Submitting Tx"]]: 1000,
+    [TaskState["Finding Opening"]]: 0,
+    [TaskState["Updating Validity Proofs"]]: 48000,
     [TaskState.Completed]: 0,
   },
   [TaskType.CancelOrder]: {
     [TaskState.Proving]: 22000,
-    [TaskState.SubmittingTx]: 1000,
-    [TaskState.FindingOpening]: 0,
-    [TaskState.UpdatingValidityProofs]: 48000,
+    [TaskState["Submitting Tx"]]: 1000,
+    [TaskState["Finding Opening"]]: 0,
+    [TaskState["Updating Validity Proofs"]]: 48000,
     [TaskState.Completed]: 0,
   },
   [TaskType.ApproveFee]: {
     [TaskState.Proving]: 0,
-    [TaskState.SubmittingTx]: 0,
-    [TaskState.FindingOpening]: 0,
-    [TaskState.UpdatingValidityProofs]: 0,
+    [TaskState["Submitting Tx"]]: 0,
+    [TaskState["Finding Opening"]]: 0,
+    [TaskState["Updating Validity Proofs"]]: 0,
     [TaskState.Completed]: 0,
   },
   [TaskType.ModifyFee]: {
     [TaskState.Proving]: 0,
-    [TaskState.SubmittingTx]: 0,
-    [TaskState.FindingOpening]: 0,
-    [TaskState.UpdatingValidityProofs]: 0,
+    [TaskState["Submitting Tx"]]: 0,
+    [TaskState["Finding Opening"]]: 0,
+    [TaskState["Updating Validity Proofs"]]: 0,
     [TaskState.Completed]: 0,
   },
   [TaskType.RevokeFee]: {
     [TaskState.Proving]: 0,
-    [TaskState.SubmittingTx]: 0,
-    [TaskState.FindingOpening]: 0,
-    [TaskState.UpdatingValidityProofs]: 0,
+    [TaskState["Submitting Tx"]]: 0,
+    [TaskState["Finding Opening"]]: 0,
+    [TaskState["Updating Validity Proofs"]]: 0,
     [TaskState.Completed]: 0,
   },
 }
+console.log("🚀 ~ TASK_TO_LATENCY:", TASK_TO_LATENCY)
 
 export const TaskStatus = () => {
   const orders = useOrders()
@@ -127,7 +126,7 @@ export const TaskStatus = () => {
   }
   // If we're updating validity proofs, and there are no orders, this operation will completely immediately.
   if (
-    taskState === TaskState.UpdatingValidityProofs &&
+    taskState === TaskState["Updating Validity Proofs"] &&
     Object.keys(orders).length === 0
   ) {
     progress = 100
@@ -147,10 +146,9 @@ export const TaskStatus = () => {
 
   const displayedTaskState = {
     [TaskState.Proving]: "Generating ZK Proof",
-    [TaskState.SubmittingTx]: "Submitting Transaction",
-    [TaskState.FindingOpening]: "Finding New Merkle Opening",
-    FindingMerkleOpening: "Finding New Merkle Opening",
-    [TaskState.UpdatingValidityProofs]: "Updating Validity Proofs",
+    [TaskState["Submitting Tx"]]: "Submitting Transaction",
+    [TaskState["Finding Opening"]]: "Finding New Merkle Opening",
+    [TaskState["Updating Validity Proofs"]]: "Updating Validity Proofs",
     [TaskState.Completed]: "Completed",
   }[taskState || TaskState.Proving] // If taskState is undefined, we won't use this displayedTaskState anyway.
 

diff --git a/trade.renegade.fi/contexts/Renegade/renegade-context.tsx b/trade.renegade.fi/contexts/Renegade/renegade-context.tsx
@@ -41,6 +41,11 @@ function RenegadeProvider({ children }: React.PropsWithChildren) {
   const [taskId, setTaskId] = React.useState<TaskId>()
   const [taskType, setTaskType] = React.useState<TaskType>()
   const [taskState, setTaskState] = React.useState<TaskState>()
+  console.log("Task: ", {
+    taskId,
+    taskType,
+    taskState,
+  })
 
   // Create network (counterparties) and order book states.
   const [counterparties, setCounterparties] = React.useState<
@@ -54,7 +59,7 @@ function RenegadeProvider({ children }: React.PropsWithChildren) {
     const handleTaskListener = async () => {
       await renegade
         .registerTaskCallback((message: string) => {
-          const taskUpdate = JSON.parse(message).state
+          const taskUpdate = JSON.parse(message).status.state
           setTaskState(taskUpdate as TaskState)
         }, taskId)
         .then((callbackId) => (taskCallbackId.current = callbackId))

diff --git a/trade.renegade.fi/contexts/Renegade/types.ts b/trade.renegade.fi/contexts/Renegade/types.ts
@@ -41,11 +41,11 @@ export interface RenegadeContextType {
 }
 
 export enum TaskState {
-  Completed = "Completed",
-  FindingOpening = "FindingOpening",
+  "Completed" = "Completed",
+  "Finding Opening" = "Finding Opening",
   Proving = "Proving",
-  SubmittingTx = "SubmittingTx",
-  UpdatingValidityProofs = "UpdatingValidityProofs",
+  "Submitting Tx" = "Submitting Tx",
+  "Updating Validity Proofs" = "Updating Validity Proofs",
 }
 
 export enum TaskType {