fix: generalize payment token

taggrx · May 20, 2024 · f97d728 · f97d728
1 parent 766345e
commit f97d728
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/backend/order_book/mod.rs b/src/backend/order_book/mod.rs
@@ -814,7 +814,6 @@ fn adjust_pools(
     // S4: we could infer this from the order.trade_type.
     trade_type: OrderType,
 ) -> Result<(), String> {
-
     // S4: assert that trade_type != order.trade_type.
 
     let (payment_receiver, token_receiver) = if trade_type.buy() {

diff --git a/src/backend/queries.rs b/src/backend/queries.rs
@@ -59,7 +59,7 @@ fn logs() {
 struct BackenData {
     volume_day: u128,
     trades_day: u64,
-    icp_locked: u128,
+    payment_token_locked: u128,
     e8s_per_xdr: u64,
     fee: u128,
     cycle_balance: u64,
@@ -81,7 +81,7 @@ fn data() {
         BackenData {
             volume_day: day_orders.clone().map(|order| order.volume()).sum(),
             trades_day: day_orders.count() as u64,
-            icp_locked: state
+            payment_token_locked: state
                 .funds_under_management()
                 .iter()
                 .find_map(|(id, balance)| (&PAYMENT_TOKEN_ID.to_string() == id).then_some(balance))
@@ -91,7 +91,7 @@ fn data() {
             fee: TX_FEE,
             cycle_balance: canister_balance(),
             heap_size: heap_address().1,
-            // We subtract one, because the list of tokens always contains the ICP token
+            // We subtract one, because the list of tokens always contains the payment token
             tokens_listed: state.tokens.len() - 1,
             active_traders: state.traders(),
         }

diff --git a/src/frontend/src/index.tsx b/src/frontend/src/index.tsx
@@ -8,6 +8,7 @@ import { Token } from "./token";
 import { ApiGenerator, Backend } from "./api";
 import { Principal } from "@dfinity/principal";
 import { Listing } from "./listing";
+import { PAYMENT_TOKEN_ID } from "./common";
 
 const parseHash = (): string[] => {
     const parts = window.location.hash.replace("#", "").split("/");
@@ -20,7 +21,7 @@ type Data = {
     fee: bigint;
     volume_day: bigint;
     trades_day: number;
-    icp_locked: bigint;
+    payment_token_locked: bigint;
     cycle_balance: number;
     heap_size: number;
     tokens_listed: number;
@@ -53,10 +54,7 @@ const App = () => {
         content = <Logs />;
     } else if (param == "list") {
         content = <Listing tokenId={param2} />;
-    } else if (
-        typeof param == "string" &&
-        param != "ryjl3-tyaaa-aaaaa-aaaba-cai"
-    ) {
+    } else if (typeof param == "string" && param != PAYMENT_TOKEN_ID) {
         content = <Token tokenId={param} />;
     }
     if (content)

diff --git a/src/frontend/src/landing.tsx b/src/frontend/src/landing.tsx
@@ -27,7 +27,7 @@ export const Landing = ({}) => {
     }, []);
     const paymentToken = window.tokenData[PAYMENT_TOKEN_ID];
     const {
-        icp_locked,
+        payment_token_locked,
         trades_day,
         volume_day,
         fee,
@@ -68,7 +68,11 @@ export const Landing = ({}) => {
                 <div className="dbcell">
                     <span>{paymentToken.symbol} LOCKED</span>
                     <code>
-                        {token(icp_locked, paymentToken.decimals, false)}{" "}
+                        {token(
+                            payment_token_locked,
+                            paymentToken.decimals,
+                            false,
+                        )}{" "}
                     </code>
                 </div>
                 <div className="dbcell">