@portal-hq/connect 3.0.6 → 4.1.0-beta

package/lib/commonjs/index.js

@@ -15,14 +15,11 @@ class PortalConnect {
     get address() {
         return this.provider.address;
     }
-    get chainId() {
-        return this.provider.chainId;
-    }
     get connected() {
         return (this.connectionState === ConnectionStates.CONNECTED ||
             this.connectionState === ConnectionStates.CONNECTING);
     }
-    constructor({ apiKey, chainId, keychain, gatewayConfig, 
+    constructor({ apiKey, keychain, gatewayConfig, chainId, 
     // Optional
     isSimulator = false, autoApprove = false, version = 'v6', apiHost = 'api.portalhq.io', mpcHost = 'mpc.portalhq.io', webSocketServer = 'connect.portalhq.io', }) {
         this.connectionState = ConnectionStates.DISCONNECTED;
@@ -42,9 +39,9 @@ class PortalConnect {
         this.events = {};
         this.websocketServer = webSocketServer;
         this.gatewayConfig = gatewayConfig;
+        this.chainId = chainId;
         this.provider = new provider_1.Provider({
             apiKey,
-            chainId,
             gatewayConfig,
             keychain,
             isSimulator,
@@ -105,7 +102,7 @@ class PortalConnect {
      */
     setChainId(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.provider.setChainId(chainId, this);
+            yield this.provider.setChainId(`eip155:${chainId}`, this);
         });
     }
     /**
@@ -189,11 +186,12 @@ class PortalConnect {
      * @returns session proposal with chains from gateway config added
      */
     addChainsToProposal(proposal) {
+        var _a;
         if (!('params' in proposal) || !('requiredNamespaces' in proposal.params)) {
             throw new Error('Invalid proposal structure.');
         }
         // Ensure eip155 is present in requiredNamespaces
-        if (!proposal.params.requiredNamespaces.eip155) {
+        if (!((_a = proposal.params.requiredNamespaces) === null || _a === void 0 ? void 0 : _a.eip155)) {
             proposal.params.requiredNamespaces.eip155 = {
                 chains: [],
                 methods: [],
@@ -204,7 +202,16 @@ class PortalConnect {
         // Get chains from gatewayConfig with 'eip155:' prefix, but only if they're not already in the proposal
         const existingChains = proposal.params.requiredNamespaces.eip155.chains;
         const newChains = Object.keys(this.gatewayConfig)
-            .map((chain) => `eip155:${chain}`)
+            .filter((chain) => !chain.includes('solana:')) // Remove chains that include 'solana:'
+            .reduce((acc, chain) => {
+            if (chain.includes('eip155')) {
+                acc.push(chain);
+            }
+            else {
+                acc.push(`eip155:${chain}`);
+            }
+            return acc;
+        }, [])
             .filter((chain) => !existingChains.includes(chain));
         // Append new chains to the existing chains
         proposal.params.requiredNamespaces.eip155.chains = [
@@ -228,13 +235,12 @@ class PortalConnect {
         socket.onopen = () => __awaiter(this, void 0, void 0, function* () {
             this.connectionState = ConnectionStates.CONNECTING;
             const address = yield this.address;
-            const { chainId } = this.provider;
             // Tell the proxy server where to connect to downstream
             socket.send(JSON.stringify({
                 event: 'connect',
                 data: {
                     address,
-                    chainId,
+                    chainId: this.chainId,
                     uri,
                 },
             }));
@@ -327,19 +333,34 @@ class PortalConnect {
                 }
             });
             // Pass the request along to the provider
-            yield this.provider.request({ method, params, chainId, connect: this });
+            yield this.provider.request({
+                method,
+                params,
+                chainId: `eip155:${chainId}`,
+                connect: this,
+            });
         });
     }
     handleSessionApproved(data, request) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const address = yield this.address;
+            let chainId;
+            if (((_a = request.params.params.requiredNamespaces) === null || _a === void 0 ? void 0 : _a.eip155) &&
+                request.params.params.requiredNamespaces
+                    .eip155.chains.length !== 0) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+                chainId = (_b = request.params.params.requiredNamespaces) === null || _b === void 0 ? void 0 : _b.eip155.chains[0].split(':')[1];
+            }
+            else {
+                chainId = this.chainId;
+            }
             // Notify the proxy server that the session request was approved
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+            (_c = this.socket) === null || _c === void 0 ? void 0 : _c.send(JSON.stringify({
                 event: 'portal_dappSessionApproved',
                 data: {
                     address,
-                    chainId: this.chainId,
+                    chainId,
                     topic: request.topic,
                     id: request.id,
                     params: data,
@@ -348,15 +369,25 @@ class PortalConnect {
         });
     }
     handleSessionRejected(data, request) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const address = yield this.address;
+            let chainId;
+            if (((_a = request.params.params.requiredNamespaces) === null || _a === void 0 ? void 0 : _a.eip155) &&
+                request.params.params.requiredNamespaces
+                    .eip155.chains.length !== 0) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+                chainId = (_b = request.params.params.requiredNamespaces) === null || _b === void 0 ? void 0 : _b.eip155.chains[0].split(':')[1];
+            }
+            else {
+                chainId = this.chainId;
+            }
             // Notify the proxy server that the session request was rejected
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+            (_c = this.socket) === null || _c === void 0 ? void 0 : _c.send(JSON.stringify({
                 event: 'portal_dappSessionRejected',
                 data: {
                     address,
-                    chainId: this.chainId,
+                    chainId,
                     topic: request.topic,
                     id: request.id,
                     params: data,

package/lib/esm/index.js

@@ -12,14 +12,11 @@ class PortalConnect {
     get address() {
         return this.provider.address;
     }
-    get chainId() {
-        return this.provider.chainId;
-    }
     get connected() {
         return (this.connectionState === ConnectionStates.CONNECTED ||
             this.connectionState === ConnectionStates.CONNECTING);
     }
-    constructor({ apiKey, chainId, keychain, gatewayConfig, 
+    constructor({ apiKey, keychain, gatewayConfig, chainId, 
     // Optional
     isSimulator = false, autoApprove = false, version = 'v6', apiHost = 'api.portalhq.io', mpcHost = 'mpc.portalhq.io', webSocketServer = 'connect.portalhq.io', }) {
         this.connectionState = ConnectionStates.DISCONNECTED;
@@ -39,9 +36,9 @@ class PortalConnect {
         this.events = {};
         this.websocketServer = webSocketServer;
         this.gatewayConfig = gatewayConfig;
+        this.chainId = chainId;
         this.provider = new Provider({
             apiKey,
-            chainId,
             gatewayConfig,
             keychain,
             isSimulator,
@@ -102,7 +99,7 @@ class PortalConnect {
      */
     setChainId(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.provider.setChainId(chainId, this);
+            yield this.provider.setChainId(`eip155:${chainId}`, this);
         });
     }
     /**
@@ -186,11 +183,12 @@ class PortalConnect {
      * @returns session proposal with chains from gateway config added
      */
     addChainsToProposal(proposal) {
+        var _a;
         if (!('params' in proposal) || !('requiredNamespaces' in proposal.params)) {
             throw new Error('Invalid proposal structure.');
         }
         // Ensure eip155 is present in requiredNamespaces
-        if (!proposal.params.requiredNamespaces.eip155) {
+        if (!((_a = proposal.params.requiredNamespaces) === null || _a === void 0 ? void 0 : _a.eip155)) {
             proposal.params.requiredNamespaces.eip155 = {
                 chains: [],
                 methods: [],
@@ -201,7 +199,16 @@ class PortalConnect {
         // Get chains from gatewayConfig with 'eip155:' prefix, but only if they're not already in the proposal
         const existingChains = proposal.params.requiredNamespaces.eip155.chains;
         const newChains = Object.keys(this.gatewayConfig)
-            .map((chain) => `eip155:${chain}`)
+            .filter((chain) => !chain.includes('solana:')) // Remove chains that include 'solana:'
+            .reduce((acc, chain) => {
+            if (chain.includes('eip155')) {
+                acc.push(chain);
+            }
+            else {
+                acc.push(`eip155:${chain}`);
+            }
+            return acc;
+        }, [])
             .filter((chain) => !existingChains.includes(chain));
         // Append new chains to the existing chains
         proposal.params.requiredNamespaces.eip155.chains = [
@@ -225,13 +232,12 @@ class PortalConnect {
         socket.onopen = () => __awaiter(this, void 0, void 0, function* () {
             this.connectionState = ConnectionStates.CONNECTING;
             const address = yield this.address;
-            const { chainId } = this.provider;
             // Tell the proxy server where to connect to downstream
             socket.send(JSON.stringify({
                 event: 'connect',
                 data: {
                     address,
-                    chainId,
+                    chainId: this.chainId,
                     uri,
                 },
             }));
@@ -324,19 +330,34 @@ class PortalConnect {
                 }
             });
             // Pass the request along to the provider
-            yield this.provider.request({ method, params, chainId, connect: this });
+            yield this.provider.request({
+                method,
+                params,
+                chainId: `eip155:${chainId}`,
+                connect: this,
+            });
         });
     }
     handleSessionApproved(data, request) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const address = yield this.address;
+            let chainId;
+            if (((_a = request.params.params.requiredNamespaces) === null || _a === void 0 ? void 0 : _a.eip155) &&
+                request.params.params.requiredNamespaces
+                    .eip155.chains.length !== 0) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+                chainId = (_b = request.params.params.requiredNamespaces) === null || _b === void 0 ? void 0 : _b.eip155.chains[0].split(':')[1];
+            }
+            else {
+                chainId = this.chainId;
+            }
             // Notify the proxy server that the session request was approved
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+            (_c = this.socket) === null || _c === void 0 ? void 0 : _c.send(JSON.stringify({
                 event: 'portal_dappSessionApproved',
                 data: {
                     address,
-                    chainId: this.chainId,
+                    chainId,
                     topic: request.topic,
                     id: request.id,
                     params: data,
@@ -345,15 +366,25 @@ class PortalConnect {
         });
     }
     handleSessionRejected(data, request) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const address = yield this.address;
+            let chainId;
+            if (((_a = request.params.params.requiredNamespaces) === null || _a === void 0 ? void 0 : _a.eip155) &&
+                request.params.params.requiredNamespaces
+                    .eip155.chains.length !== 0) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+                chainId = (_b = request.params.params.requiredNamespaces) === null || _b === void 0 ? void 0 : _b.eip155.chains[0].split(':')[1];
+            }
+            else {
+                chainId = this.chainId;
+            }
             // Notify the proxy server that the session request was rejected
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
+            (_c = this.socket) === null || _c === void 0 ? void 0 : _c.send(JSON.stringify({
                 event: 'portal_dappSessionRejected',
                 data: {
                     address,
-                    chainId: this.chainId,
+                    chainId,
                     topic: request.topic,
                     id: request.id,
                     params: data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/connect",
-  "version": "3.0.6",
+  "version": "4.1.0-beta",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
   "source": "src/index",
@@ -32,5 +32,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "884d505870ff81f79fde92abdcea508619eaf86e"
+  "gitHead": "87317816c3fb6475dc655746b2023fa84e0417d7"
 }

package/src/index.ts

@@ -17,6 +17,7 @@ import type {
 } from '../types.d'
 
 class PortalConnect {
+  public chainId: number
   private apiKey: string
   private connectionState: ConnectionStates = ConnectionStates.DISCONNECTED
   private provider: IPortalProvider
@@ -25,17 +26,12 @@ class PortalConnect {
   private topic?: string
   private uri?: string
   private websocketServer: string
-
   private events: Record<string, RegisteredEventHandler[]>
 
   private get address(): Promise<string | undefined> {
     return this.provider.address
   }
 
-  private get chainId(): number {
-    return this.provider.chainId
-  }
-
   public get connected(): boolean {
     return (
       this.connectionState === ConnectionStates.CONNECTED ||
@@ -45,9 +41,9 @@ class PortalConnect {
 
   constructor({
     apiKey,
-    chainId,
     keychain,
     gatewayConfig,
+    chainId,
 
     // Optional
     isSimulator = false,
@@ -61,9 +57,10 @@ class PortalConnect {
     this.events = {}
     this.websocketServer = webSocketServer
     this.gatewayConfig = gatewayConfig
+    this.chainId = chainId
+
     this.provider = new Provider({
       apiKey,
-      chainId,
       gatewayConfig,
       keychain,
       isSimulator,
@@ -135,7 +132,7 @@ class PortalConnect {
    * @param chainId The number of the chainId to switch to
    */
   public async setChainId(chainId: number): Promise<void> {
-    await this.provider.setChainId(chainId, this)
+    await this.provider.setChainId(`eip155:${chainId}`, this)
   }
 
   /**
@@ -243,7 +240,7 @@ class PortalConnect {
     }
 
     // Ensure eip155 is present in requiredNamespaces
-    if (!proposal.params.requiredNamespaces.eip155) {
+    if (!proposal.params.requiredNamespaces?.eip155) {
       proposal.params.requiredNamespaces.eip155 = {
         chains: [],
         methods: [],
@@ -255,7 +252,15 @@ class PortalConnect {
     // Get chains from gatewayConfig with 'eip155:' prefix, but only if they're not already in the proposal
     const existingChains = proposal.params.requiredNamespaces.eip155.chains
     const newChains = Object.keys(this.gatewayConfig)
-      .map((chain) => `eip155:${chain}`)
+      .filter((chain) => !chain.includes('solana:')) // Remove chains that include 'solana:'
+      .reduce<string[]>((acc, chain) => {
+        if (chain.includes('eip155')) {
+          acc.push(chain)
+        } else {
+          acc.push(`eip155:${chain}`)
+        }
+        return acc
+      }, [])
       .filter((chain) => !existingChains.includes(chain))
 
     // Append new chains to the existing chains
@@ -282,7 +287,6 @@ class PortalConnect {
     socket.onopen = async () => {
       this.connectionState = ConnectionStates.CONNECTING
       const address = await this.address
-      const { chainId } = this.provider
 
       // Tell the proxy server where to connect to downstream
       socket.send(
@@ -290,7 +294,7 @@ class PortalConnect {
           event: 'connect',
           data: {
             address,
-            chainId,
+            chainId: this.chainId,
             uri,
           },
         }),
@@ -413,7 +417,12 @@ class PortalConnect {
     )
 
     // Pass the request along to the provider
-    await this.provider.request({ method, params, chainId, connect: this })
+    await this.provider.request({
+      method,
+      params,
+      chainId: `eip155:${chainId}`,
+      connect: this,
+    })
   }
 
   private async handleSessionApproved(
@@ -421,6 +430,20 @@ class PortalConnect {
     request: SessionRequest,
   ): Promise<void> {
     const address = await this.address
+    let chainId
+    if (
+      (request.params as SessionProposalOrMetadata).params.requiredNamespaces
+        ?.eip155 &&
+      (request.params as SessionProposalOrMetadata).params.requiredNamespaces
+        .eip155.chains.length !== 0
+    ) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+      chainId = (
+        request.params as SessionProposalOrMetadata
+      ).params.requiredNamespaces?.eip155.chains[0].split(':')[1]
+    } else {
+      chainId = this.chainId
+    }
 
     // Notify the proxy server that the session request was approved
     this.socket?.send(
@@ -428,7 +451,7 @@ class PortalConnect {
         event: 'portal_dappSessionApproved',
         data: {
           address,
-          chainId: this.chainId,
+          chainId,
           topic: request.topic,
           id: request.id,
           params: data,
@@ -442,14 +465,27 @@ class PortalConnect {
     request: SessionRequest,
   ): Promise<void> {
     const address = await this.address
-
+    let chainId
+    if (
+      (request.params as SessionProposalOrMetadata).params.requiredNamespaces
+        ?.eip155 &&
+      (request.params as SessionProposalOrMetadata).params.requiredNamespaces
+        .eip155.chains.length !== 0
+    ) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+      chainId = (
+        request.params as SessionProposalOrMetadata
+      ).params.requiredNamespaces?.eip155.chains[0].split(':')[1]
+    } else {
+      chainId = this.chainId
+    }
     // Notify the proxy server that the session request was rejected
     this.socket?.send(
       JSON.stringify({
         event: 'portal_dappSessionRejected',
         data: {
           address,
-          chainId: this.chainId,
+          chainId,
           topic: request.topic,
           id: request.id,
           params: data,

package/types.d.ts

@@ -4,7 +4,7 @@ import { KeychainAdapter } from '@portal-hq/utils'
 import { ConnectError } from 'src'
 
 export type EventHandler = (data: any) => void
-export type SessionProposalOrMetadata = SessionProposal | PeerMetadata
+export type SessionProposalOrMetadata = SessionProposal
 
 export interface ConnectRequest {
   id: string
@@ -51,9 +51,9 @@ export interface PeerMetadata {
 
 export interface PortalConnectOptions {
   apiKey: string
-  chainId: number
   keychain: KeychainAdapter
   gatewayConfig: GatewayLike
+  chainId: number
 
   // Optional
   isSimulator?: boolean