@mezo-org/passport 0.15.1-dev.6 → 0.16.0-dev.0

package/src/hooks/useBorrowData.ts

@@ -9,7 +9,7 @@ import {
 import { usePassportContext } from "./usePassportContext"
 import { CHAIN_ID } from "../constants"
 import { bigIntMax, normalizePrecision } from "../utils/numbers"
-import { useWalletAccount } from "./useWalletAccount"
+import useWalletAccount from "./useWalletAccount"
 import { getAsset } from "../utils/assets"
 import { convertToUsd } from "../utils/currency"
 import { useCollateralPrice } from "./useCollateralPrice"

package/src/hooks/useCollateralPrice.ts

@@ -6,7 +6,7 @@ import {
 } from "../lib/contracts"
 import { usePassportContext } from "./usePassportContext"
 import { CHAIN_ID } from "../constants"
-import { useWalletAccount } from "./useWalletAccount"
+import useWalletAccount from "./useWalletAccount"
 
 // Wagmi handles typesafety with ABI const assertions. TypeScript doesn't
 // support importing JSON as const yet so types cannot be inferred from the

package/src/hooks/useCreateAccount.ts

@@ -7,7 +7,7 @@ import {
 import { useAuthApiClient } from "./useAuthApiClient"
 import { QUERY_KEYS } from "./constants"
 import type { CreateAccountRequest, CreateAccountResponse } from "../api"
-import { useWalletAccount } from "./useWalletAccount"
+import useWalletAccount from "./useWalletAccount"
 import { getBitcoinPublicKeyFromConnector } from "../utils/wagmi"
 
 export function useCreateAccount(

package/src/hooks/useLinkAccount.ts

@@ -7,7 +7,7 @@ import {
 import { useAuthApiClient } from "./useAuthApiClient"
 import type { LinkAccountResponse, SignatureData } from "../api"
 import { QUERY_KEYS } from "./constants"
-import { useWalletAccount } from "./useWalletAccount"
+import useWalletAccount from "./useWalletAccount"
 import { getBitcoinPublicKeyFromConnector } from "../utils/wagmi"
 
 type LinkAccountMutationFnParameters =

package/src/hooks/useTokensBalances.ts

@@ -13,11 +13,12 @@ import {
   MezoChainToken,
   testnetTokenContracts,
 } from "../lib/contracts"
-import { useWalletAccount } from "./useWalletAccount"
+import useWalletAccount from "./useWalletAccount"
 import {
   getAsset,
   isBitcoinLikeCryptoAsset,
   isTTokenCryptoAsset,
+  isMezoCryptoAsset,
 } from "../utils/assets"
 import { convertToUsd } from "../utils/currency"
 import { CHAIN_ID, mezoMainnet, mezoTestnet } from "../constants"
@@ -65,6 +66,7 @@ const BALANCE_TOKENS: MezoChainToken[] = [
   "mUSDT",
   "mxSolvBTC",
   "MUSD",
+  "MEZO",
 ]
 
 type UseMezoChainTokensBalancesOptions<T extends MezoChainToken[]> = {
@@ -219,6 +221,13 @@ export function useTokensBalances<T extends MezoChainToken[]>(
             conversion.decimals,
           )
         }
+        // TODO: Provide MEZO oracle to get accurate token price
+        if (isMezoCryptoAsset(tokenBalance.symbol)) {
+          usd = {
+            value: 0n,
+            formatted: "0",
+          }
+        }
 
         return { ...tokenBalance, usd }
       })

package/src/hooks/useWalletAccount.ts

@@ -13,14 +13,10 @@ type UseWalletAccountReturn = {
   chainId?: number
 }
 
-export function useWalletAccount(): UseWalletAccountReturn {
-  const {
-    address: evmAddress,
-    connector,
-    chainId,
-    isConnected,
-    ...rest
-  } = useAccount()
+// TODO: Invesitgate race conditions and refactor
+
+export default function useWalletAccount(): UseWalletAccountReturn {
+  const { address: evmAddress, connector, chainId } = useAccount()
 
   const networkFamily = useMemo(
     () => (connector?.type !== "orangekit" ? "evm" : "bitcoin"),
@@ -42,7 +38,6 @@ export function useWalletAccount(): UseWalletAccountReturn {
         balance,
       }
     },
-    enabled: networkFamily === "bitcoin" && !!connector,
   })
 
   const { address: btcAddress } = btcData || {}
@@ -50,12 +45,9 @@ export function useWalletAccount(): UseWalletAccountReturn {
   return {
     accountAddress: evmAddress,
     walletAddress: btcAddress ?? evmAddress,
-    isConnected:
-      isConnected &&
-      (networkFamily === "bitcoin" ? !!btcAddress : !!evmAddress),
+    isConnected: networkFamily === "bitcoin" ? !!btcAddress : !!evmAddress,
     networkFamily,
     connector,
     chainId,
-    ...rest,
   }
 }

package/src/hooks/useWatchTransferEvents.ts

@@ -69,6 +69,7 @@ function useWatchTransferEventsForAllTokens() {
   useWatchTransferEvents("mUSDT")
   useWatchTransferEvents("mxSolvBTC")
   useWatchTransferEvents("MUSD")
+  useWatchTransferEvents("MEZO")
 }
 
 export { useWatchTransferEvents, useWatchTransferEventsForAllTokens }

package/src/lib/contracts/artifacts/MEZO.json

@@ -0,0 +1,428 @@
+{
+  "address": "0x7B7c000000000000000000000000000000000001",
+  "abi": [
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Approval",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "Minted",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "minter",
+          "type": "address"
+        }
+      ],
+      "name": "MinterSet",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Transfer",
+      "type": "event"
+    },
+    {
+      "inputs": [],
+      "name": "DOMAIN_SEPARATOR",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "PERMIT_TYPEHASH",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        }
+      ],
+      "name": "allowance",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "approve",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "balanceOf",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "decimals",
+      "outputs": [
+        {
+          "internalType": "uint8",
+          "name": "",
+          "type": "uint8"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getMinter",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "mint",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "name",
+      "outputs": [
+        {
+          "internalType": "string",
+          "name": "",
+          "type": "string"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        }
+      ],
+      "name": "nonce",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        }
+      ],
+      "name": "nonces",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "deadline",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint8",
+          "name": "v",
+          "type": "uint8"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "r",
+          "type": "bytes32"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "s",
+          "type": "bytes32"
+        }
+      ],
+      "name": "permit",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "minter",
+          "type": "address"
+        }
+      ],
+      "name": "setMinter",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "symbol",
+      "outputs": [
+        {
+          "internalType": "string",
+          "name": "",
+          "type": "string"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "totalSupply",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transfer",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transferFrom",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ]
+}

package/src/lib/contracts/index.ts

@@ -29,6 +29,7 @@ import priceFeed from "@mezo-org/musd-contracts/deployments/mainnet/PriceFeed.js
 import priceFeedTestnet from "@mezo-org/musd-contracts/deployments/matsnet/PriceFeed.json"
 
 import { Abi, Address } from "viem"
+import mezoArtifact from "./artifacts/MEZO.json"
 
 export type MezoChainToken =
   | "mcbBTC"
@@ -42,6 +43,7 @@ export type MezoChainToken =
   | "mUSDT"
   | "mxSolvBTC"
   | "MUSD"
+  | "MEZO"
 
 export type MezoBorrowContract =
   | "TroveManager"
@@ -68,6 +70,7 @@ export const testnetTokenContracts = {
   mUSDT: usdtTestnet,
   mxSolvBTC: xsolvbtcTestnet,
   MUSD: musdTestnet,
+  MEZO: mezoArtifact,
 } as unknown as ContractsMap<MezoChainToken>
 
 export const mainnetTokenContracts = {
@@ -82,6 +85,7 @@ export const mainnetTokenContracts = {
   mUSDT: usdtMainnet,
   mxSolvBTC: xsolvbtcMainnet,
   MUSD: musdMainnet,
+  MEZO: mezoArtifact,
 } as unknown as ContractsMap<MezoChainToken>
 
 export const mainnetBorrowContracts = {

package/src/utils/assets.ts

@@ -64,6 +64,11 @@ const ASSETS = {
     symbol: "mxSolvBTC",
     decimals: 18,
   },
+  MEZO: {
+    name: "MEZO",
+    symbol: "MEZO",
+    decimals: 18,
+  },
 }
 
 /**
@@ -101,3 +106,12 @@ export function isUsdLikeCryptoAsset(key: string) {
 export function isTTokenCryptoAsset(key: string) {
   return /^(mt|t)$/i.test(key)
 }
+
+/**
+ * Checks if given crypto asset is MEZO token
+ * @param key The key of crypto asset
+ * @returns True if crypto asset is MEZO token
+ */
+export function isMezoCryptoAsset(key: string) {
+  return /^mezo$/i.test(key)
+}