Merge pull request #1 from ava-labs/feat/replace-set-usages

Replace set usage with unique function

Author: atn4z7

packages/core/src/controllers/pairing.ts

@@ -25,6 +25,7 @@ import {
   isExpired,
   parseExpirerTarget,
   TYPE_1,
+  unique,
 } from "@walletconnect/utils";
 import {
   formatJsonRpcRequest,
@@ -90,7 +91,7 @@ export class Pairing implements IPairing {
 
   public register: IPairing["register"] = ({ methods }) => {
     this.isInitialized();
-    this.registeredMethods = [...new Set([...this.registeredMethods, ...methods])];
+    this.registeredMethods = [...unique([...this.registeredMethods, ...methods])];
   };
 
   public create: IPairing["create"] = async (params) => {

packages/sign-client/src/controllers/engine.ts

@@ -109,6 +109,7 @@ import {
   getNamespacesChains,
   getNamespacesMethods,
   getNamespacesEvents,
+  unique,
 } from "@walletconnect/utils";
 import EventEmmiter from "events";
 import {
@@ -1015,7 +1016,7 @@ export class Engine extends IEngine {
       eip155: {
         chains,
         // request `personal_sign` method by default to allow for fallback siwe
-        methods: [...new Set(["personal_sign", ...methods])],
+        methods: [...unique(["personal_sign", ...methods])],
         events: ["chainChanged", "accountsChanged"],
       },
     };
@@ -1128,8 +1129,8 @@ export class Engine extends IEngine {
           relay: { protocol: "irn" },
           pairingTopic,
           namespaces: buildNamespacesFromAuth(
-            [...new Set(approvedMethods)],
-            [...new Set(approvedAccounts)],
+            [...unique(approvedMethods)],
+            [...unique(approvedAccounts)],
           ),
           transportType,
         };
@@ -1337,8 +1338,8 @@ export class Engine extends IEngine {
         relay: { protocol: "irn" },
         pairingTopic: pendingRequest.pairingTopic,
         namespaces: buildNamespacesFromAuth(
-          [...new Set(approvedMethods)],
-          [...new Set(approvedAccounts)],
+          [...unique(approvedMethods)],
+          [...unique(approvedAccounts)],
         ),
         transportType,
       };
@@ -3184,7 +3185,7 @@ export class Engine extends IEngine {
     }
 
     // ----- reject multi namespaces ----- //
-    const uniqueNamespaces = [...new Set(chains.map((chain) => parseChainId(chain).namespace))];
+    const uniqueNamespaces = [...unique(chains.map((chain) => parseChainId(chain).namespace))];
     if (uniqueNamespaces.length > 1) {
       throw new Error(
         "Multi-namespace requests are not supported. Please request single namespace only.",

packages/utils/src/cacao.ts

@@ -1,5 +1,5 @@
 import { AuthTypes } from "@walletconnect/types";
-import { getCommonValuesInArrays } from "./misc.js";
+import { getCommonValuesInArrays, unique } from "./misc.js";
 import { verifySignature } from "./signatures.js";
 const didPrefix = "did:pkh:";
 const NAMESPACE_DISPLAY_NAMES = {
@@ -408,7 +408,7 @@ export function getChainsFromRecap(recap: string) {
       }
     });
   });
-  return [...new Set(chains.flat())];
+  return [...unique(chains.flat())];
 }
 
 export function buildRecapStatement(statement: string, recap: unknown) {

packages/utils/src/misc.ts

@@ -417,7 +417,22 @@ export function engineEvent(event: EngineTypes.Event, id?: number | string | und
 }
 
 export function mergeArrays<T>(a: T[] = [], b: T[] = []): T[] {
-  return [...new Set([...a, ...b])];
+  return [...unique([...a, ...b])];
+}
+
+export function unique<T>(arr: T[] = []) {
+  const seen = Object.create(null);
+  const out: T[] = [];
+  for (let i = 0, len = arr.length; i < len; i++) {
+    const val = arr[i];
+    // key must be string — handles numbers, strings, booleans fine
+    const key = typeof val + val;
+    if (seen[key] === undefined) {
+      seen[key] = true;
+      out.push(val);
+    }
+  }
+  return out;
 }
 
 export async function handleDeeplinkRedirect({

packages/utils/src/namespaces.ts

@@ -1,5 +1,5 @@
 import { ProposalTypes, SessionTypes } from "@walletconnect/types";
-import { mergeArrays } from "./misc.js";
+import { mergeArrays, unique } from "./misc.js";
 import { isConformingNamespaces, isValidNamespaces, isValidObject } from "./validators.js";
 
 export function getAccountsChains(accounts: SessionTypes.Namespace["accounts"]) {
@@ -18,23 +18,23 @@ export function getNamespacesChains(namespaces: SessionTypes.Namespaces) {
     chains.push(...getAccountsChains(namespace.accounts));
   });
 
-  return [...new Set(chains)];
+  return [...unique(chains)];
 }
 
 export function getNamespacesMethods(namespaces: SessionTypes.Namespaces) {
   const methods: SessionTypes.Namespace["methods"] = [];
   Object.values(namespaces).forEach((namespace) => {
     methods.push(...namespace.methods);
   });
-  return [...new Set(methods)];
+  return [...unique(methods)];
 }
 
 export function getNamespacesEvents(namespaces: SessionTypes.Namespaces) {
   const events: SessionTypes.Namespace["events"] = [];
   Object.values(namespaces).forEach((namespace) => {
     events.push(...namespace.events);
   });
-  return [...new Set(events)];
+  return [...unique(events)];
 }
 
 export function getNamespacesMethodsForChainId(

packages/utils/src/validators.ts

@@ -7,7 +7,7 @@ import {
   getAccountsChains,
 } from "./namespaces.js";
 import { getSdkError, getInternalError } from "./errors.js";
-import { fromBase64, hasOverlap } from "./misc.js";
+import { fromBase64, hasOverlap, unique } from "./misc.js";
 import { getChainsFromNamespace } from "./caip.js";
 
 export type ErrorObject = { message: string; code: number } | null;
@@ -469,7 +469,7 @@ function parseNamespaces(namespaces: ProposalTypes.RequiredNamespaces) {
 
 function filterDuplicateNamespaces(namespaces: string[]) {
   return [
-    ...new Set(
+    ...unique(
       namespaces.map((namespace) =>
         namespace.includes(":") ? namespace.split(":")[0] : namespace,
       ),

providers/ethereum-provider/src/EthereumProvider.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "events";
-import { getAccountsFromNamespaces, getSdkError, isValidArray } from "@walletconnect/utils";
+import { getAccountsFromNamespaces, getSdkError, isValidArray, unique } from "@walletconnect/utils";
 import { KeyValueStorageOptions } from "@walletconnect/keyvaluestorage";
 import {
   IEthereumProvider as IProvider,
@@ -165,17 +165,17 @@ export function buildNamespaces(params: NamespacesParams): {
 
   const optional: Namespace = {
     chains: [
-      ...new Set(
+      ...unique(
         shouldIncludeRequiredChains ? required.chains.concat(optionalChains || []) : optionalChains,
       ),
     ],
     methods: [
-      ...new Set(
+      ...unique(
         required.methods.concat(optionalMethods?.length ? optionalMethods : OPTIONAL_METHODS),
       ),
     ],
     events: [
-      ...new Set(required.events.concat(optionalEvents?.length ? optionalEvents : OPTIONAL_EVENTS)),
+      ...unique(required.events.concat(optionalEvents?.length ? optionalEvents : OPTIONAL_EVENTS)),
     ],
     rpcMap,
   };
@@ -607,7 +607,7 @@ export class EthereumProvider implements IEthereumProvider {
         const { convertWCMToAppKitOptions } = await import("./wcmToAppKit.js");
         const options = convertWCMToAppKitOptions({
           ...this.rpc.qrModalOptions,
-          chains: [...new Set([...this.rpc.chains, ...this.rpc.optionalChains])],
+          chains: [...unique([...this.rpc.chains, ...this.rpc.optionalChains])],
           metadata: this.rpc.metadata,
           projectId: this.rpc.projectId,
         });

providers/universal-provider/src/UniversalProvider.ts

@@ -1,7 +1,13 @@
 import { SignClient } from "@walletconnect/sign-client";
 import { SessionTypes } from "@walletconnect/types";
 import { JsonRpcResult } from "@walletconnect/jsonrpc-types";
-import { createLogger, getSdkError, isValidArray, parseNamespaceKey } from "@walletconnect/utils";
+import {
+  createLogger,
+  getSdkError,
+  isValidArray,
+  parseNamespaceKey,
+  unique,
+} from "@walletconnect/utils";
 import { Logger } from "@walletconnect/logger";
 
 import {
@@ -313,7 +319,7 @@ export class UniversalProvider implements IUniversalProvider {
     }
 
     const providersToCreate = [
-      ...new Set(
+      ...unique(
         Object.keys(this.session.namespaces).map((namespace) => parseNamespaceKey(namespace)),
       ),
     ];

providers/universal-provider/src/providers/eip155.ts

@@ -25,6 +25,7 @@ import {
 } from "../utils/index.js";
 import EventEmitter from "events";
 import { BUNDLER_URL, PROVIDER_EVENTS } from "../constants/index.js";
+import { unique } from "@walletconnect/utils";
 
 class Eip155Provider implements IProvider {
   public name = "eip155";
@@ -139,7 +140,7 @@ class Eip155Provider implements IProvider {
       return [];
     }
     return [
-      ...new Set(
+      ...unique(
         accounts
           // get the accounts from the active chain
           .filter((account) => account.split(":")[1] === this.chainId.toString())

providers/universal-provider/src/providers/generic.ts

@@ -12,7 +12,7 @@ import {
   SubProviderOpts,
 } from "../types/index.js";
 import { getGlobal, getRpcUrl } from "../utils/index.js";
-import { parseChainId } from "@walletconnect/utils";
+import { parseChainId, unique } from "@walletconnect/utils";
 
 class GenericProvider implements IProvider {
   public name = GENERIC_SUBPROVIDER_NAME;
@@ -33,16 +33,16 @@ class GenericProvider implements IProvider {
 
   public updateNamespace(namespace: SessionTypes.Namespace) {
     this.namespace.chains = [
-      ...new Set((this.namespace.chains || []).concat(namespace.chains || [])),
+      ...unique((this.namespace.chains || []).concat(namespace.chains || [])),
     ];
     this.namespace.accounts = [
-      ...new Set((this.namespace.accounts || []).concat(namespace.accounts || [])),
+      ...unique((this.namespace.accounts || []).concat(namespace.accounts || [])),
     ];
     this.namespace.methods = [
-      ...new Set((this.namespace.methods || []).concat(namespace.methods || [])),
+      ...unique((this.namespace.methods || []).concat(namespace.methods || [])),
     ];
     this.namespace.events = [
-      ...new Set((this.namespace.events || []).concat(namespace.events || [])),
+      ...unique((this.namespace.events || []).concat(namespace.events || [])),
     ];
     this.httpProviders = this.createHttpProviders();
   }
@@ -97,7 +97,7 @@ class GenericProvider implements IProvider {
     }
 
     return [
-      ...new Set(
+      ...unique(
         accounts
           // get the accounts from the active chain
           .filter((account) => account.split(":")[1] === this.chainId.toString())