Merge branch 'main' into patch/intercom-fallback-appid

Author: svemat01

e2e/specs/stateless/ownership.spec.ts

@@ -1175,7 +1175,8 @@ test.describe('Extend name', () => {
       await extendNamesModal.getExtendButton.click()
       await transactionModal.autoComplete()
       const newTimestamp = await ownershipPage.getExpiryTimestamp()
-      expect(newTimestamp).toEqual(timestamp + 31536000000)
+      // Allow 1 day tolerance for leap year differences
+      expect(Math.abs(newTimestamp - timestamp - 31536000000)).toBeLessThanOrEqual(86400000)
     })
   })
 })

package.json

@@ -58,7 +58,7 @@
     "@ensdomains/content-hash": "^3.0.0-beta.5",
     "@ensdomains/ens-contracts": "1.6.0",
     "@ensdomains/ens-test-env": "1.0.1",
-    "@ensdomains/ensjs": "https://pkg.pr.new/ensdomains/ensjs/@ensdomains/ensjs@deab43b",
+    "@ensdomains/ensjs": "^4.2.2",
     "@ensdomains/thorin": "1.0.0-beta.28",
     "@getpara/rainbowkit": "1.4.0",
     "@getpara/rainbowkit-wallet": "1.4.0",

pnpm-lock.yaml

@@ -10,7 +10,7 @@ import {
   type TransactionType,
   type Transport,
 } from 'viem'
-import { createConfig, createStorage, fallback, http } from 'wagmi'
+import { createConfig, createStorage, fallback, http, webSocket } from 'wagmi'
 import { localhost, mainnet, sepolia } from 'wagmi/chains'
 
 import { ccipRequest } from '@ensdomains/ensjs/utils'
@@ -53,17 +53,17 @@ export const drpcUrl = (chainName: string) =>
     chainName === 'mainnet' ? 'ethereum' : chainName
   }&dkey=${drpcKey}`
 
-type SupportedUrlFunc = typeof drpcUrl | typeof tenderlyUrl
-
-const initialiseTransports = <const UrlFuncArray extends SupportedUrlFunc[]>(
-  chainName: string,
-  urlFuncArray: UrlFuncArray,
-) => {
-  const transportArray: HttpTransport[] = []
-
-  for (const urlFunc of urlFuncArray) transportArray.push(http(urlFunc(chainName)))
+export const drpcWsUrl = (chainName: string) =>
+  `wss://lb.drpc.org/ogws?network=${
+    chainName === 'mainnet' ? 'ethereum' : chainName
+  }&dkey=${drpcKey}`
 
-  return fallback(transportArray)
+const initialiseTransports = (chainName: string) => {
+  return fallback([
+    webSocket(drpcWsUrl(chainName)), // Primary: instant block updates via subscription
+    http(drpcUrl(chainName)), // Fallback 1: DRPC HTTP
+    http(tenderlyUrl(chainName)), // Fallback 2: Tenderly HTTP
+  ])
 }
 
 export const prefix = 'wagmi'
@@ -109,8 +109,8 @@ export const transports = {
         // this is a hack to make the types happy, dont remove pls
         [localhost.id]: HttpTransport
       })),
-  [mainnet.id]: initialiseTransports('mainnet', [drpcUrl, tenderlyUrl]),
-  [sepolia.id]: initialiseTransports('sepolia', [drpcUrl, tenderlyUrl]),
+  [mainnet.id]: initialiseTransports('mainnet'),
+  [sepolia.id]: initialiseTransports('sepolia'),
 } as const
 
 // This is a workaround to fix MetaMask defaulting to the wrong transaction type