Find and replace web socket names

apps/web/src/composables/breakdownMetrics.ts

@@ -10,7 +10,7 @@ import useUser from "@/composables/user"
 import { CasimirManager } from "@casimir/ethereum/build/@types"
 
 const { getBaseManager, getEigenManager, contractsAreInitialized } = useContracts()
-const { batchProvider, provider, webSocketProvider } = useEnvironment()
+const { batchProvider, provider, wsProvider } = useEnvironment()
 const { formatEthersCasimir } = useFormat()
 const { getCurrentPrice } = usePrice()
 const { awaitingStakeOrWithdrawConfirmation } = useStaking()
@@ -34,7 +34,7 @@ export default function useBreakdownMetrics() {
         if (import.meta.env.MODE === "development") console.log("blockNumber :>> ", blockNumber)
 
         const addresses = (user.value as UserWithAccountsAndOperators).accounts.map((account: Account) => account.address) as string[]
-        const availableProvider = webSocketProvider || provider
+        const availableProvider = wsProvider || provider
         const block = await availableProvider.getBlockWithTransactions(blockNumber)
 
         const txs = block.transactions.map(async (tx: any) => {
@@ -77,7 +77,7 @@ export default function useBreakdownMetrics() {
 
         try {
             loadingInitializeBreakdownMetrics.value = true
-            const availableProvider = webSocketProvider || provider
+            const availableProvider = wsProvider || provider
             availableProvider.removeAllListeners("block")
             availableProvider.on("block", blockListener as ethers.providers.Listener)
             listenForRebalancedEvents()
@@ -92,7 +92,7 @@ export default function useBreakdownMetrics() {
     }
 
     async function uninitializeBreakdownMetricsComposable() {
-        const availableProvider = webSocketProvider || provider
+        const availableProvider = wsProvider || provider
         availableProvider.removeAllListeners("block")
         stopListeningForContractEvents()
         breakdownMetricsComposableInitialized.value = false

apps/web/src/composables/contracts.ts

@@ -6,7 +6,7 @@ import ICasimirManagerAbi from "@casimir/ethereum/build/abi/ICasimirManager.json
 import ICasimirRegistryAbi from "@casimir/ethereum/build/abi/ICasimirRegistry.json"
 import ICasimirViewsAbi from "@casimir/ethereum/build/abi/ICasimirViews.json"
 
-const { webSocketProvider, provider, factory } = useEnvironment()
+const { wsProvider, provider, factory } = useEnvironment()
 const contractsAreInitialized = ref(false)
 
 let baseManager: CasimirManager
@@ -28,7 +28,7 @@ export default function useContracts() {
             return await factory.getManagerConfig(id)
         }))
 
-        const availableProvider = webSocketProvider || provider
+        const availableProvider = wsProvider || provider
 
         baseManager = new ethers.Contract(baseManagerConfig.managerAddress, ICasimirManagerAbi, availableProvider) as CasimirManager
         baseRegistry = new ethers.Contract(baseManagerConfig.registryAddress, ICasimirRegistryAbi, availableProvider) as CasimirRegistry

apps/web/src/composables/environment.ts

@@ -8,10 +8,10 @@ const origin = window.location.origin
 
 /* Ethereum environment */
 const ethereumUrl = import.meta.env.PUBLIC_ETHEREUM_RPC_URL || "http://127.0.0.1:8545"
-const ethereumWebSocketUrl = import.meta.env.PUBLIC_ETHEREUM_WEBSOCKET_URL
+const ethereumWsUrl = import.meta.env.PUBLIC_ETHEREUM_WS_URL
 const provider = new ethers.providers.JsonRpcProvider(ethereumUrl)
 const batchProvider: ethers.providers.JsonRpcBatchProvider = new ethers.providers.JsonRpcBatchProvider(ethereumUrl)
-const webSocketProvider: ethers.providers.WebSocketProvider | null = ethereumWebSocketUrl !== "undefined" ? new ethers.providers.WebSocketProvider(ethereumWebSocketUrl) : null
+const wsProvider: ethers.providers.wsProvider | null = ethereumWsUrl !== "undefined" ? new ethers.providers.wsProvider(ethereumWsUrl) : null
 
 /* Casimir environment */
 const docsUrl = import.meta.env.PUBLIC_DOCS_URL || "https://docs.dev.casimir.co"
@@ -52,6 +52,6 @@ export default function useEnvironment() {
         docsUrl,
         usersUrl,
         walletConnectProjectId,
-        webSocketProvider,
+        wsProvider,
     }
 }

apps/web/src/composables/format.ts

@@ -49,10 +49,13 @@ export default function useFormat() {
     function formatEthersCasimirStaking(inputFloat: number) {
         // Ensure the number has 18 decimal places
         const formattedNumber = inputFloat.toFixed(18)
+
         // Split the number into integer and decimal parts
         const parts = formattedNumber.split(".")
+
         // Add commas to the integer part
         parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ",")
+
         // Rejoin the integer and decimal parts
         return parts.join(".")
     }

apps/web/src/composables/operators.ts

@@ -29,7 +29,7 @@ const {
     getEigenRegistry,
     getEigenViews
 } = useContracts()
-const { ethereumUrl, ssvNetworkAddress, ssvViewsAddress, usersUrl, batchProvider, provider, webSocketProvider } = useEnvironment()
+const { ethereumUrl, ssvNetworkAddress, ssvViewsAddress, usersUrl, batchProvider, provider, wsProvider } = useEnvironment()
 const { browserProvidersList, getEthersBrowserSigner } = useEthers()
 const { getEthersLedgerSigner } = useLedger()
 const { getEthersTrezorSigner } = useTrezor()
@@ -80,7 +80,7 @@ export default function useOperators() {
     async function getUserOperators(): Promise<void> {
         const userAddresses = user.value?.accounts.map((account: Account) => account.address) as string[]
 
-        const availableProvider = webSocketProvider || batchProvider || provider 
+        const availableProvider = wsProvider || batchProvider || provider 
 
         const scanner = new Scanner({ 
             ethereumUrl,

common/env/src/index.ts

@@ -39,7 +39,7 @@ enum ETHEREUM_RPC_URL {
     TESTNET = "https://goerli.infura.io/v3/46a379ac6895489f812f33beb726b03b" // 'https://nodes.casimir.co/eth/goerli/limited'
 }
 
-enum ETHEREUM_WEBSOCKET_URL {
+enum ETHEREUM_WS_URL {
     TESTNET = "wss://goerli.infura.io/ws/v3/46a379ac6895489f812f33beb726b03b"
 }
 
@@ -61,7 +61,7 @@ export {
     ETHEREUM_CONTRACTS,
     ETHEREUM_NETWORK_NAME,
     ETHEREUM_RPC_URL,
-    ETHEREUM_WEBSOCKET_URL,
+    ETHEREUM_WS_URL,
     ETHEREUM_SIGNERS,
     HARDHAT_NETWORK_KEY
 }

scripts/cdk/deploy.ts

@@ -1,5 +1,5 @@
 import { getSecret, loadCredentials } from "@casimir/aws"
-import { ETHEREUM_CONTRACTS, ETHEREUM_RPC_URL, ETHEREUM_WEBSOCKET_URL } from "@casimir/env"
+import { ETHEREUM_CONTRACTS, ETHEREUM_RPC_URL, ETHEREUM_WS_URL } from "@casimir/env"
 import { run } from "@casimir/shell"
 
 /**
@@ -23,7 +23,7 @@ void async function () {
 
     const networkKey = process.env.NETWORK?.toUpperCase() || process.env.FORK?.toUpperCase() || "TESTNET"
     process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[networkKey]
-    process.env.ETHEREUM_WEBSOCKET_URL = ETHEREUM_WEBSOCKET_URL[networkKey]
+    process.env.ETHEREUM_WS_URL = ETHEREUM_WS_URL[networkKey]
     process.env.FACTORY_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.FACTORY_ADDRESS
     process.env.SSV_NETWORK_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_NETWORK_ADDRESS
     process.env.SSV_VIEWS_ADDRESS = ETHEREUM_CONTRACTS[networkKey]?.SSV_VIEWS_ADDRESS
@@ -35,7 +35,7 @@ void async function () {
     process.env.PUBLIC_WEBSITE_URL = process.env.WEBSITE_URL
     process.env.PUBLIC_CRYPTO_COMPARE_API_KEY = process.env.CRYPTO_COMPARE_API_KEY
     process.env.PUBLIC_ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL
-    process.env.PUBLIC_ETHEREUM_WEBSOCKET_URL = process.env.ETHEREUM_WEBSOCKET_URL
+    process.env.PUBLIC_ETHEREUM_WS_URL = process.env.ETHEREUM_WS_URL
     process.env.PUBLIC_FACTORY_ADDRESS = process.env.FACTORY_ADDRESS
     process.env.PUBLIC_SSV_NETWORK_ADDRESS = process.env.SSV_NETWORK_ADDRESS
     process.env.PUBLIC_SSV_VIEWS_ADDRESS = process.env.SSV_VIEWS_ADDRESS

scripts/root/dev.ts

@@ -1,6 +1,6 @@
 import { ethers } from "ethers"
 import { loadCredentials, getSecret } from "@casimir/aws"
-import { ETHEREUM_CONTRACTS, ETHEREUM_NETWORK_NAME, ETHEREUM_RPC_URL, ETHEREUM_WEBSOCKET_URL } from "@casimir/env"
+import { ETHEREUM_CONTRACTS, ETHEREUM_NETWORK_NAME, ETHEREUM_RPC_URL, ETHEREUM_WS_URL } from "@casimir/env"
 import { run, runSync } from "@casimir/shell"
 
 /**
@@ -97,7 +97,7 @@ async function root() {
         if (process.env.NETWORK) {
             const networkName = ETHEREUM_NETWORK_NAME[networkKey]
             process.env.ETHEREUM_RPC_URL = ETHEREUM_RPC_URL[networkKey]
-            process.env.ETHEREUM_WEBSOCKET_URL = ETHEREUM_WEBSOCKET_URL[networkKey]
+            process.env.ETHEREUM_WS_URL = ETHEREUM_WS_URL[networkKey]
             console.log(`Connecting to ${networkName} network at ${process.env.ETHEREUM_RPC_URL}`)
         } else {
             const networkName = ETHEREUM_NETWORK_NAME[networkKey]
@@ -122,7 +122,7 @@ async function root() {
     process.env.PUBLIC_BLOG_URL = process.env.BLOG_URL
     process.env.PUBLIC_USERS_URL = process.env.USERS_URL
     process.env.PUBLIC_ETHEREUM_RPC_URL = process.env.ETHEREUM_RPC_URL
-    process.env.PUBLIC_ETHEREUM_WEBSOCKET_URL = process.env.ETHEREUM_WEBSOCKET_URL
+    process.env.PUBLIC_ETHEREUM_WS_URL = process.env.ETHEREUM_WS_URL
     process.env.PUBLIC_FACTORY_ADDRESS = process.env.FACTORY_ADDRESS
     process.env.PUBLIC_SSV_NETWORK_ADDRESS = process.env.SSV_NETWORK_ADDRESS
     process.env.PUBLIC_SSV_VIEWS_ADDRESS = process.env.SSV_VIEWS_ADDRESS