@portal-hq/web 1.0.3 → 2.0.0

package/src/provider/index.ts

@@ -113,19 +113,27 @@ class Provider {
    * @param args The arguments of the request being made
    * @returns Promise<any>
    */
-  public async request({ method, params }: RequestArguments): Promise<any> {
+  public async request({
+    chainId,
+    method,
+    params,
+  }: RequestArguments): Promise<any> {
     if (method === 'eth_chainId') {
-      return this.portal.chainId
+      return chainId ? parseInt(chainId.split(':')[1]) : this.portal.chainId
     }
 
     const isSignerMethod = signerMethods.includes(method)
 
-    let result: any
     if (!isSignerMethod && !method.startsWith('wallet_')) {
       // Send to Gateway for RPC calls
-      const response = await this.handleGatewayRequest({ method, params })
+      const response = await this.handleGatewayRequest({
+        chainId,
+        method,
+        params,
+      })
 
       this.emit('portal_signatureReceived', {
+        chainId,
         method,
         params,
         signature: response,
@@ -135,22 +143,24 @@ class Provider {
         throw new ProviderRpcError(response.error as RpcErrorOptions)
       }
 
-      result = response.result
+      return response.result
     } else if (isSignerMethod) {
       // Handle signing
       const transactionHash = await this.handleSigningRequest({
+        chainId,
         method,
         params,
       })
 
       if (transactionHash) {
         this.emit('portal_signatureReceived', {
+          chainId,
           method,
           params,
           signature: transactionHash,
         })
 
-        result = transactionHash
+        return transactionHash
       }
     } else {
       // Unsupported method
@@ -162,8 +172,6 @@ class Provider {
         },
       })
     }
-
-    return result
   }
 
   /************************
@@ -252,6 +260,7 @@ class Provider {
    * @returns Promise<any>
    */
   private async handleGatewayRequest({
+    chainId,
     method,
     params,
   }: RequestArguments): Promise<any> {
@@ -259,7 +268,7 @@ class Provider {
     const result = await fetch(this.portal.getRpcUrl(), {
       body: JSON.stringify({
         jsonrpc: '2.0',
-        id: this.portal.chainId,
+        id: chainId ? parseInt(chainId.split(':')[1]) : this.portal.chainId,
         method,
         params,
       }),
@@ -276,6 +285,7 @@ class Provider {
    * @returns Promise<any>
    */
   private async handleSigningRequest({
+    chainId,
     method,
     params,
   }: RequestArguments): Promise<any> {
@@ -303,7 +313,9 @@ class Provider {
       case 'eth_signTypedData_v4':
       case 'personal_sign': {
         const result = await this.portal.mpc.sign({
-          chainId: this.portal.chainId.toString(),
+          chainId: chainId
+            ? chainId.split(':')[1]
+            : this.portal.chainId.toString(),
           method,
           params: this.buildParams(method, params),
           rpcUrl: this.portal.getRpcUrl(),

package/types.d.ts

@@ -62,8 +62,8 @@ export interface BackupData {
 }
 
 export interface BackupResult {
-  error: PortalError
-  data: BackupData
+  backupIds: string[]
+  cipherText: string
 }
 
 export interface Bk {
@@ -77,20 +77,53 @@ export interface Address {
   value: string
 }
 
+export interface BackupResponse {
+  cipherText: string
+  storageCallback: () => Promise<void>
+}
+
 export interface Balance {
   contractAddress: string
   balance: string
 }
 
-export interface ClientWithCustodianData {
+export interface ClientResponse {
   id: string
   address: string
   backupStatus?: string | null
-  custodian: {
-    id: string
-    name: string
-  }
-  signingStatus?: string | null
+  custodian: ClientResponseCustodian
+  ejectedAt: string | null
+  isAccountAbstracted: boolean
+  metadata: ClientResponseMetadata
+  wallets: ClientResponseWallet[]
+}
+
+interface ClientResponseCustodian {
+  id: string
+  name: string
+}
+interface ClientResponseMetadata {
+  namespaces: ClientNamespaceMetadata
+}
+
+interface ClientResponseNamespaceMetadata {
+  [key: Namespace]: NamespaceMetadataItem
+}
+
+interface ClientResponseSharePair {
+  id: string
+  createdAt: string
+  status: SharePairStatus
+}
+
+export interface ClientResponseWallet {
+  id: string
+  createdAt: string
+
+  backupSharePairs: ClientResponseSharePair[]
+  curve: WalletCurve
+  publicKey: string
+  signingSharePairs: ClientResponseShairPair[]
 }
 
 export interface DappOnNetwork {
@@ -392,6 +425,7 @@ export interface RegisteredEventHandler {
 }
 
 export interface RequestArguments {
+  chainId?: string
   method: string
   params?: unknown[] | SigningRequestParams
 }