@0xsequence/provider 1.10.15 → 2.0.0

package/src/transports/base-provider-transport.ts

@@ -17,10 +17,10 @@ import {
   TypedEventEmitter
 } from '../types'
 
-import { NetworkConfig, JsonRpcRequest, JsonRpcResponseCallback } from '@0xsequence/network'
+import { NetworkConfig } from '@0xsequence/network'
 import { logger } from '@0xsequence/utils'
 import { ethers } from 'ethers'
-import { commons } from '@0xsequence/core'
+import { VERSION, commons } from '@0xsequence/core'
 
 export const PROVIDER_OPEN_TIMEOUT = 30000 // in ms
 
@@ -89,9 +89,7 @@ export abstract class BaseProviderTransport implements ProviderTransport {
     )
   }
 
-  sendAsync = async (request: JsonRpcRequest, callback: JsonRpcResponseCallback, chainId?: number) => {
-    // here, we receive the message from the dapp provider call
-
+  async request(request: { method: string; params?: any[]; chainId?: number }): Promise<any> {
     if (this.state === OpenState.CLOSED) {
       // flag the wallet to auto-close once user submits input. ie.
       // prompting to sign a message or transaction
@@ -104,24 +102,21 @@ export abstract class BaseProviderTransport implements ProviderTransport {
     // NOTE: if we're not signed in, then the provider will fail, users must first connect+sign in.
     //
     // TODO: how does this behave with a session has expired?
-    this.openWallet(undefined, { type: 'jsonRpcRequest', method: request.method }, chainId)
+    this.openWallet(undefined, { type: 'jsonRpcRequest', method: request.method }, request.chainId)
 
-    // send message request, await, and then execute callback after receiving the response
-    try {
-      if (!this.isOpened()) {
-        await this.waitUntilOpened() // will throw on timeout
-      }
-
-      const response = await this.sendMessageRequest({
-        idx: nextMessageIdx(),
-        type: EventType.MESSAGE,
-        data: request,
-        chainId: chainId
-      })
-      callback(undefined, response.data)
-    } catch (err) {
-      callback(err)
+    if (!this.isOpened()) {
+      await this.waitUntilOpened() // will throw on timeout
     }
+
+    const response = await this.sendMessageRequest({
+      idx: nextMessageIdx(),
+      type: EventType.MESSAGE,
+      data: request,
+      chainId: request.chainId,
+      clientVersion: VERSION
+    })
+
+    return response.data
   }
 
   // handleMessage will handle message received from the remote wallet
@@ -142,7 +137,8 @@ export abstract class BaseProviderTransport implements ProviderTransport {
         data: {
           sessionId: this._sessionId,
           nonce: nonce
-        }
+        },
+        clientVersion: VERSION
       })
     }
 
@@ -228,7 +224,7 @@ export abstract class BaseProviderTransport implements ProviderTransport {
       this.accountsChangedPayload = { accounts: [] }
       if (message.data && message.data.length > 0) {
         this.accountsChangedPayload = {
-          accounts: [ethers.utils.getAddress(message.data[0])],
+          accounts: [ethers.getAddress(message.data[0])],
           origin: message.origin
         }
         this.events.emit('accountsChanged', this.accountsChangedPayload.accounts, this.accountsChangedPayload.origin)

package/src/transports/base-wallet-transport.ts

@@ -14,13 +14,13 @@ import {
 
 import { WalletRequestHandler } from './wallet-request-handler'
 
-import { NetworkConfig, JsonRpcRequest, JsonRpcResponseCallback, findSupportedNetwork } from '@0xsequence/network'
+import { NetworkConfig, findSupportedNetwork } from '@0xsequence/network'
 import { logger, sanitizeAlphanumeric, sanitizeHost, sanitizeNumberString } from '@0xsequence/utils'
 import { AuthorizationOptions } from '@0xsequence/auth'
 
 import { PROVIDER_OPEN_TIMEOUT } from './base-provider-transport'
 import { isBrowserExtension, useBestStore } from '../utils'
-import { commons } from '@0xsequence/core'
+import { VERSION, commons } from '@0xsequence/core'
 
 const TRANSPORT_SESSION_LS_KEY = '@sequence.transportSession'
 
@@ -65,7 +65,7 @@ export abstract class BaseWalletTransport implements WalletTransport {
       if (!networks || networks.length === 0) {
         this.notifyChainChanged('0x0')
       } else {
-        this.notifyChainChanged(ethers.utils.hexValue(networks.find(network => network.isDefaultChain)!.chainId))
+        this.notifyChainChanged(ethers.toQuantity(networks.find(network => network.isDefaultChain)!.chainId))
       }
     })
 
@@ -96,7 +96,7 @@ export abstract class BaseWalletTransport implements WalletTransport {
     throw new Error('abstract method')
   }
 
-  sendAsync = async (request: JsonRpcRequest, callback: JsonRpcResponseCallback, chainId?: number) => {
+  request(request: { method: string; params?: any[]; chainId?: number }): Promise<any> {
     throw new Error('abstract method')
   }
 
@@ -181,7 +181,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
         sessionId,
         session,
         error
-      }
+      },
+      clientVersion: VERSION
     })
   }
 
@@ -189,7 +190,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
     this.sendMessage({
       idx: -1,
       type: EventType.CLOSE,
-      data: error ? { error } : null
+      data: error ? { error } : null,
+      clientVersion: VERSION
     })
   }
 
@@ -197,7 +199,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
     this.sendMessage({
       idx: -1,
       type: EventType.CONNECT,
-      data: connectDetails
+      data: connectDetails,
+      clientVersion: VERSION
     })
   }
 
@@ -206,7 +209,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
       idx: -1,
       type: EventType.DISCONNECT,
       data: error ? { error } : null,
-      origin
+      origin,
+      clientVersion: VERSION
     })
   }
 
@@ -215,7 +219,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
       idx: -1,
       type: EventType.ACCOUNTS_CHANGED,
       data: accounts,
-      origin
+      origin,
+      clientVersion: VERSION
     })
   }
 
@@ -224,7 +229,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
       idx: -1,
       type: EventType.CHAIN_CHANGED,
       data: chainIdHex,
-      origin
+      origin,
+      clientVersion: VERSION
     })
   }
 
@@ -232,7 +238,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
     this.sendMessage({
       idx: -1,
       type: EventType.NETWORKS,
-      data: networks
+      data: networks,
+      clientVersion: VERSION
     })
   }
 
@@ -240,7 +247,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
     this.sendMessage({
       idx: -1,
       type: EventType.WALLET_CONTEXT,
-      data: walletContext
+      data: walletContext,
+      clientVersion: VERSION
     })
   }
 
@@ -309,7 +317,8 @@ export abstract class BaseWalletTransport implements WalletTransport {
       this.sendMessage({
         idx: -1,
         type: EventType.INIT,
-        data: { nonce: this._initNonce }
+        data: { nonce: this._initNonce },
+        clientVersion: VERSION
       })
       this._init = InitState.SENT_NONCE
 

package/src/transports/mux-transport/mux-message-provider.ts

@@ -9,12 +9,12 @@ import {
   ConnectDetails
 } from '../../types'
 
-import { JsonRpcRequest, JsonRpcResponseCallback } from '@0xsequence/network'
 import { ProxyMessageChannelPort, ProxyMessageProvider } from '../proxy-transport'
 import { Runtime } from 'webextension-polyfill'
 import { UnrealMessageProvider } from '../unreal-transport'
 import { ExtensionMessageProvider } from '../extension-transport'
 import { WindowMessageProvider } from '../window-transport'
+import { JsonRpcResponse } from '@0xsequence/network'
 
 export type MuxTransportTemplate = {
   walletAppURL?: string
@@ -198,12 +198,11 @@ export class MuxMessageProvider implements ProviderTransport {
     return true
   }
 
-  sendAsync = async (request: JsonRpcRequest, callback: JsonRpcResponseCallback, chainId?: number) => {
-    if (this.provider) {
-      this.provider.sendAsync(request, callback, chainId)
-      return
+  request(request: { method: string; params?: any[]; chainId?: number }): Promise<any> {
+    if (!this.provider) {
+      throw new Error('impossible state, wallet must be opened first')
     }
-    throw new Error('impossible state, wallet must be opened first')
+    return this.provider.request(request)
   }
 
   sendMessage(message: ProviderMessage<any>) {

package/src/transports/proxy-transport/proxy-message-provider.ts

@@ -3,6 +3,7 @@ import { BaseProviderTransport } from '../base-provider-transport'
 import { ProviderMessage, OpenState, OpenWalletIntent, EventType, InitState } from '../../types'
 
 import { ProxyMessageChannelPort, ProxyEventTypes } from './proxy-message-channel'
+import { VERSION } from '@0xsequence/core'
 
 export class ProxyMessageProvider extends BaseProviderTransport {
   private port: ProxyMessageChannelPort
@@ -62,7 +63,8 @@ export class ProxyMessageProvider extends BaseProviderTransport {
           intent,
           networkId,
           sessionId
-        }
+        },
+        clientVersion: VERSION
       })
     }
   }
@@ -71,7 +73,8 @@ export class ProxyMessageProvider extends BaseProviderTransport {
     this.sendMessage({
       idx: -1,
       type: EventType.CLOSE,
-      data: null
+      data: null,
+      clientVersion: VERSION
     })
     this.close()
   }