Merge pull request #77 from WalletConnect/beta.6

beta.6
WalletConnect · Mar 3, 2019 · 3f73853 · 3f73853
2 parents f8c1e6f + a4ca4a1
commit 3f73853
Show file tree

Hide file tree

Showing 19 changed files with 1,001 additions and 910 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "packages": [
     "packages/*"
   ]

diff --git a/packages/browser/package-lock.json b/packages/browser/package-lock.json
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@walletconnect/browser",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "description": "Browser SDK for WalletConnect",
   "scripts": {
     "clean": "rm -rf lib",
@@ -54,9 +54,9 @@
     "webpack-cli": "^3.2.1"
   },
   "dependencies": {
-    "@walletconnect/core": "^1.0.0-beta.5",
-    "@walletconnect/types": "^1.0.0-beta.5",
-    "@walletconnect/utils": "^1.0.0-beta.5"
+    "@walletconnect/core": "^1.0.0-beta.6",
+    "@walletconnect/types": "^1.0.0-beta.6",
+    "@walletconnect/utils": "^1.0.0-beta.6"
   },
   "gitHead": "165f7993c2acc907c653c02847fb02721052c6e7"
 }
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@walletconnect/core",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "description": "Core Library for WalletConnect",
   "scripts": {
     "clean": "rm -rf lib",
@@ -53,8 +53,8 @@
     "webpack-cli": "^3.2.1"
   },
   "dependencies": {
-    "@walletconnect/types": "^1.0.0-beta.5",
-    "@walletconnect/utils": "^1.0.0-beta.5"
+    "@walletconnect/types": "^1.0.0-beta.6",
+    "@walletconnect/utils": "^1.0.0-beta.6"
   },
   "gitHead": "165f7993c2acc907c653c02847fb02721052c6e7"
 }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -25,7 +25,9 @@ import {
   payloadId,
   uuid,
   formatRpcError,
-  parseWalletConnectUri
+  parseWalletConnectUri,
+  isHexStrict,
+  convertUtf8ToHex
 } from '@walletconnect/utils'
 
 // -- typeChecks ----------------------------------------------------------- //
@@ -121,6 +123,14 @@ class Connector {
     this._browser = browser
     this._pingInterval = null
 
+    if (
+      browser &&
+      window.location.protocol !== 'https:' &&
+      window.location.hostname !== 'localhost'
+    ) {
+      throw new Error('HTTPS is required for non-localhost origins')
+    }
+
     if (clientMeta) {
       this.clientMeta = clientMeta
     }
@@ -363,7 +373,7 @@ class Connector {
     this._eventEmitters.push(eventEmitter)
   }
 
-  public async createSession (): Promise<void> {
+  public async createSession (opts?: { chainId: number }): Promise<void> {
     if (this._connected) {
       throw new Error('Session currently connected')
     }
@@ -379,7 +389,8 @@ class Connector {
       params: [
         {
           peerId: this.clientId,
-          peerMeta: this.clientMeta
+          peerMeta: this.clientMeta,
+          chainId: opts && opts.chainId ? opts.chainId : null
         }
       ]
     })
@@ -392,7 +403,6 @@ class Connector {
       'Session update rejected',
       this.handshakeTopic
     )
-    this._setStorageSession()
   }
 
   public approveSession (sessionStatus: ISessionStatus) {
@@ -429,7 +439,11 @@ class Connector {
         }
       ]
     })
-    this._setStorageSession()
+    if (this._connected) {
+      this._setStorageSession()
+    } else {
+      this._removeStorageSession()
+    }
   }
 
   public rejectSession (sessionError?: ISessionError) {
@@ -487,7 +501,11 @@ class Connector {
         }
       ]
     })
-    this._setStorageSession()
+    if (this._connected) {
+      this._setStorageSession()
+    } else {
+      this._removeStorageSession()
+    }
   }
 
   public killSession (sessionError?: ISessionError) {
@@ -545,6 +563,28 @@ class Connector {
     }
   }
 
+  public async signPersonalMessage (params: any[]) {
+    if (!this._connected) {
+      throw new Error('Session currently disconnected')
+    }
+
+    if (!isHexStrict(params[1])) {
+      params[1] = convertUtf8ToHex(params[1])
+    }
+
+    const request = this._formatRequest({
+      method: 'personal_sign',
+      params
+    })
+
+    try {
+      const result = await this._sendCallRequest(request)
+      return result
+    } catch (error) {
+      throw error
+    }
+  }
+
   public async signTypedData (params: any[]) {
     if (!this._connected) {
       throw new Error('Session currently disconnected')
@@ -748,7 +788,11 @@ class Connector {
             ]
           })
         }
-        this._setStorageSession()
+        if (this._connected) {
+          this._setStorageSession()
+        } else {
+          this._removeStorageSession()
+        }
       } else {
         this._handleSessionDisconnect(errorMsg)
       }
@@ -908,7 +952,11 @@ class Connector {
   private _swapKey () {
     this._key = this._nextKey
     this._nextKey = null
-    this._setStorageSession()
+    if (this._connected) {
+      this._setStorageSession()
+    } else {
+      this._removeStorageSession()
+    }
   }
 
   // -- websocket ------------------------------------------------------- //