update handlers to strip unexpected chain IDs but emit a warning for the same

Author: ultraviolet10

apps/iframe/src/components/requests/WalletSwitchEthereumChain.tsx

@@ -19,7 +19,7 @@ export const WalletSwitchEthereumChain = ({
     if (import.meta.env.PROD)
         return <RequestDisabled
                 headline={headline}
-                description="The Happy Wallet is an HappyChain exclusive 🤠"
+                description="The Happy Wallet is a HappyChain exclusive 🤠"
                 reject={reject}
             />
 

apps/iframe/src/requests/handlers/injected.ts

@@ -224,13 +224,23 @@ export async function dispatchInjectedRequest(request: ProviderMsgsFromApp[Msgs.
 
         case "wallet_getCapabilities": {
             checkAuthenticated()
-            if (!request.payload?.params?.[0]) {
-                throw new EIP1474InvalidInput("Missing payload")
+            if (!request.payload?.params?.[0] || !request.payload?.params?.[1]) {
+                throw new EIP1474InvalidInput("Missing payload parameters")
             }
-
             checkAndChecksumAddress(request.payload.params[0])
 
             const currentChainId = getCurrentChain().chainId
+            if (request.payload.params[1].length > 1) {
+                const requestedChainIds = request.payload.params[1]
+                for (const chainId of requestedChainIds) {
+                    if (chainId !== currentChainId) {
+                        console.warn(
+                            `Unsupported chain ID requested: ${chainId}. The Happy Wallet is a HappyChain exclusive 🤠!`,
+                        )
+                    }
+                }
+            }
+
             const capabilities: Capabilities = {
                 [currentChainId]: Object.fromEntries(
                     Object.values(HappyWalletCapability).map((capability) => [capability, { supported: true }]),

apps/iframe/src/requests/handlers/permissionless.ts

@@ -102,13 +102,23 @@ export async function dispatchedPermissionlessRequest(request: ProviderMsgsFromA
 
         case "wallet_getCapabilities": {
             checkAuthenticated()
-            if (!request.payload?.params?.[0]) {
-                throw new EIP1474InvalidInput("Missing payload")
+            if (!request.payload?.params?.[0] || !request.payload?.params?.[1]) {
+                throw new EIP1474InvalidInput("Missing payload parameters")
             }
-
             checkAndChecksumAddress(request.payload.params[0])
 
             const currentChainId = getCurrentChain().chainId
+            if (request.payload.params[1].length > 1) {
+                const requestedChainIds = request.payload.params[1]
+                for (const chainId of requestedChainIds) {
+                    if (chainId !== currentChainId) {
+                        console.warn(
+                            `Unsupported chain ID requested: ${chainId}. The Happy Wallet is a HappyChain exclusive 🤠!`,
+                        )
+                    }
+                }
+            }
+
             const capabilities: Capabilities = {
                 [currentChainId]: Object.fromEntries(
                     Object.values(HappyWalletCapability).map((capability) => [capability, { supported: true }]),

apps/submitter/bin/benchmarkLatency.ts

@@ -1,11 +1,4 @@
-import {
-    BoopClient,
-    CreateAccount,
-    type ExecuteSuccess,
-    GetNonce,
-    Onchain,
-    computeBoopHash,
-} from "@happy.tech/boop-sdk"
+import { BoopClient, CreateAccount, computeBoopHash } from "@happy.tech/boop-sdk"
 import { delayed, stringify } from "@happy.tech/common"
 import { type PrivateKeyAccount, generatePrivateKey, privateKeyToAccount } from "viem/accounts"
 import { createAndSignMintBoop } from "#lib/utils/test/helpers"