bugfix

Author: tuphan-dn

src/components/balance.tsx

@@ -3,6 +3,7 @@ import { PublicKey } from '@solana/web3.js'
 import { useAccount } from 'hooks/useAccount'
 import { hashmap } from 'helper/hashmap'
 import { useMemo } from 'react'
+import { numeric } from 'helper/utils'
 
 export type BalanceProps = { publicKey?: PublicKey }
 
@@ -16,7 +17,7 @@ const Balance = ({ publicKey }: BalanceProps) => {
     return hashmap(commitment) || 0
   }, [account])
 
-  return <span>{balance}</span>
+  return <span>{numeric(balance).format('0,0.[00]')}</span>
 }
 
 export default Balance

src/configs/sol.config.ts

@@ -3,23 +3,35 @@ import { Env } from 'configs'
 /**
  * Contructor
  */
-type Conf = {}
+type Conf = {
+  supply: bigint
+  reserve: bigint
+}
 
 const conf: Record<Env, Conf> = {
   /**
    * Development configurations
    */
-  development: {},
+  development: {
+    supply: BigInt(10 ** 6),
+    reserve: BigInt(9 * 10 ** 5),
+  },
 
   /**
    * Staging configurations
    */
-  staging: {},
+  staging: {
+    supply: BigInt(10 ** 6),
+    reserve: BigInt(9 * 10 ** 5),
+  },
 
   /**
    * Production configurations
    */
-  production: {},
+  production: {
+    supply: BigInt(10 ** 6),
+    reserve: BigInt(9 * 10 ** 5),
+  },
 }
 
 /**

src/helper/hashmap.ts

@@ -1,5 +1,5 @@
 const LOOP = 2 ** 16
-const COUNTER = 2 ** 0
+const COUNTER = 2 ** 4
 
 export const hashmap = (hash: string) => {
   for (let i = 0; i < COUNTER; i++) {

src/helper/utils.ts

@@ -56,5 +56,5 @@ export const numeric = (
   value?: number | string | BigInt,
 ): ReturnType<typeof numbro> => {
   if (!value) return numbro('0')
-  return numbro(value)
+  return numbro(Number(value))
 }

src/view/app/index.tsx

@@ -20,8 +20,11 @@ import { TwistedElGamal } from 'helper/twistedElGamal'
 import { Point } from 'helper/point'
 import { randScalar } from 'helper/utils'
 import { setLPWallet, Wallet } from 'store/wallet.reducer'
+import configs from 'configs'
 
-const SUPPLY = BigInt(10 ** 3)
+const {
+  sol: { supply },
+} = configs
 
 const App = () => {
   const dispatch = useDispatch<AppDispatch>()
@@ -47,9 +50,9 @@ const App = () => {
       // Mint supply to the account
       await dispatch(
         mintTo({
-          srcAmount: new TwistedElGamal(SUPPLY, mint.s),
+          srcAmount: new TwistedElGamal(supply, mint.s),
           dstAmount: TwistedElGamal.build(
-            Point.G.multiply(SUPPLY).add(Point.H.multiply(z)),
+            Point.G.multiply(supply).add(Point.H.multiply(z)),
             account.amount.P.multiply(z),
             account.amount.P,
           ),

src/view/approval/index.tsx

@@ -15,8 +15,11 @@ import {
   mintTo,
   transfer,
 } from 'store/ledger.reducer'
+import configs from 'configs'
 
-const DEPOSIT = BigInt(10 ** 2)
+const {
+  sol: { reserve },
+} = configs
 
 const Approval = () => {
   const {
@@ -50,8 +53,8 @@ const Approval = () => {
     ).unwrap()) as Record<string, Account>
     // Create deposit proof
     const depositProof = Deposit.prove(
-      DEPOSIT,
-      DEPOSIT,
+      reserve,
+      reserve,
       srcA,
       srcB,
       dstLP,
@@ -69,7 +72,7 @@ const Approval = () => {
         transfer: (args: any) => dispatch(transfer(args)),
         mintTo: (args: any) => dispatch(mintTo(args)),
       }),
-    )
+    ).unwrap()
   }, [
     dispatch,
     srcA,

src/view/header/debug/oracleMonitor/index.tsx

@@ -4,6 +4,7 @@ import { Card, Col, Divider, Row, Space, Typography } from 'antd'
 
 import { AppState } from 'store'
 import { usePrice } from 'hooks/usePrice'
+import { numeric } from 'helper/utils'
 
 const OracleMonitor = () => {
   const {
@@ -22,17 +23,21 @@ const OracleMonitor = () => {
           <Space direction="vertical">
             <Space>
               <Typography.Text type="secondary">Price:</Typography.Text>
-              <Typography.Text>{p.toString()}</Typography.Text>
+              <Typography.Text>{numeric(p).format('0,0.[00]')}</Typography.Text>
               <Typography.Text type="secondary">
                 (PRECISION = 10^9)
               </Typography.Text>
             </Space>
             <Space>
               <Typography.Text type="secondary">Reserve A:</Typography.Text>
-              <Typography.Text>{ra.toString()}</Typography.Text>
+              <Typography.Text>
+                {numeric(ra).format('0,0.[00]')}
+              </Typography.Text>
               <Divider type="vertical" />
               <Typography.Text type="secondary">Reserve B:</Typography.Text>
-              <Typography.Text>{rb.toString()}</Typography.Text>
+              <Typography.Text>
+                {numeric(rb).format('0,0.[00]')}
+              </Typography.Text>
             </Space>
           </Space>
         </Col>

src/view/header/debug/walletMonitor/index.tsx

@@ -2,17 +2,13 @@ import { Card, Col, Row, Space, Typography } from 'antd'
 import TokenAvatar from 'components/tokenAvatar'
 import Transfer from './transfer'
 
-import { useBalance } from 'hooks/useBalance'
-import { useAccount } from 'hooks/useAccount'
 import { shortenAddress } from 'helper/utils'
 import { Wallet } from 'store/wallet.reducer'
+import Balance from 'components/balance'
 
 export type WalletMonitorProps = { wallet: Wallet }
 
 const WalletMonitor = ({ wallet }: WalletMonitorProps) => {
-  const account = useAccount(wallet.publicKey)
-  const balance = useBalance(wallet.publicKey)
-
   return (
     <Card bodyStyle={{ padding: 16 }}>
       <Row gutter={[24, 24]}>
@@ -24,13 +20,15 @@ const WalletMonitor = ({ wallet }: WalletMonitorProps) => {
             <Space>
               <Typography.Text type="secondary">Address:</Typography.Text>
               <Typography.Text copyable>
-                {shortenAddress(account?.publicKey.toBase58() || '')}
+                {shortenAddress(wallet.publicKey.toBase58() || '')}
               </Typography.Text>
             </Space>
             <Space>
               <Typography.Text type="secondary">Balance:</Typography.Text>
-              <Typography.Text>{balance.toString()}</Typography.Text>
-              <TokenAvatar publicKey={account?.mint} />
+              <Typography.Text>
+                <Balance publicKey={wallet.publicKey} />
+              </Typography.Text>
+              <TokenAvatar publicKey={wallet.mint} />
             </Space>
           </Space>
         </Col>

src/view/swap/swapPrice/index.tsx

@@ -51,7 +51,7 @@ const SwapPrice = () => {
   const dst = useAccount(ask.publicKey)
   const { gamma, reverted } = computeGamma(
     p,
-    BigInt(Number(price) * Number(PRECISION) || 0),
+    BigInt(Math.round(Number(price) * Number(PRECISION)) || 0),
   )
   const productConstantProof = useOracle(gamma, src?.amount.P, dst?.amount.P)