Merge pull request #211 from airgap-it/develop

Develop

assets/toast/toast.css

@@ -152,6 +152,7 @@ hr {
 
 .beacon-toast__action__item {
   font-size: 14px;
+  max-width: 40ch;
 }
 
 .beacon-toast__action__item p {

example-dapp.html

@@ -86,6 +86,7 @@
     <br /><br />
     <button id="contractCall">Contract Call</button>
     <br /><br />
+    <textarea id="beacon-textbox"></textarea>
     <button id="deserializeData">Deserialize Data</button>
     <br /><br />
     ---
@@ -97,9 +98,11 @@
     <script>
       // Initiate DAppClient
       const client = new beacon.DAppClient({
-        name: 'Example DApp', // Name of the DApp,
+        name: 'Example DApp' // Name of the DApp,
         // preferredNetwork: beacon.NetworkType.DELPHINET
-        matrixNodes: ['matrix.papers.tech']
+        // matrixNodes: ['test.papers.tech', 'test2.papers.tech', 'matrix.papers.tech']
+        // matrixNodes: ['beacon-node-0.papers.tech:8448']
+        // matrixNodes: ['matrix.papers.tech']
         // matrixNodes: ['beacon.tztip.me']
       })
 
@@ -355,7 +358,9 @@
 
       // Add event listener to the button
       document.getElementById('deserializeData').addEventListener('click', () => {
-        new beacon.Serializer().deserialize('').then(console.log).catch(console.error)
+        const value = document.getElementById('beacon-textbox').value
+        console.log('Deserializing:', value)
+        new beacon.Serializer().deserialize(value).then(console.log).catch(console.error)
       })
     </script>
   </body>

example-wallet.html

@@ -33,8 +33,9 @@
     <script>
       // Initiate DAppClient
       const client = new beacon.WalletClient({
-        name: 'Example Wallet', // Name of the DApp
-        matrixNodes: ['matrix.papers.tech']
+        name: 'Example Wallet' // Name of the DApp
+        // matrixNodes: ['matrix.papers.tech']
+        // matrixNodes: ['beacon-node-0.papers.tech:8448']
         // matrixNodes: ['beacon.tztip.me']
       })
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-sdk",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "The beacon-sdk allows you to easily connect DApps with Wallets through P2P communication or a chrome extension.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

scripts/generate-wallet-list.ts

@@ -32,7 +32,8 @@ export const webList: WebApp[] = [
       [NetworkType.MAINNET]: 'https://wallet.kukai.app',
       [NetworkType.DELPHINET]: 'https://testnet.kukai.app',
       [NetworkType.EDONET]: 'https://edonet.kukai.app',
-      [NetworkType.FLORENCENET]: 'https://florencenet.kukai.app'
+      [NetworkType.FLORENCENET]: 'https://florencenet.kukai.app',
+      [NetworkType.GRANADANET]: 'https://granadanet.kukai.app'
     }
   }
 ]

src/clients/dapp-client/DAppClient.ts

@@ -1064,7 +1064,7 @@ export class DAppClient extends Client {
         },
         extraInfo: {
           resetCallback: async () => {
-            await this.clearActiveAccount()
+            await Promise.all([this.clearActiveAccount(), (await this.transport).disconnect()])
           }
         }
       })

src/constants.ts

@@ -1,2 +1,2 @@
-export const SDK_VERSION: string = '2.2.6'
+export const SDK_VERSION: string = '2.2.7'
 export const BEACON_VERSION: string = '2'

src/matrix-client/MatrixClientEventEmitter.ts

@@ -93,10 +93,11 @@ export class MatrixClientEventEmitter extends EventEmitter {
   ): void {
     stateChange.rooms
       .filter((room) => room.status === MatrixRoomStatus.INVITED)
-      .map((room) => room.id)
-      .forEach((id) => {
+      .map((room) => [room.id, room.members] as [string, string[]])
+      .forEach(([id, members]) => {
         this.emitClientEvent(eventType, {
-          roomId: id
+          roomId: id,
+          members: members
         })
       })
   }

src/matrix-client/models/MatrixClientEvent.ts

@@ -13,6 +13,7 @@ export type MatrixClientEventContent<T> = T extends MatrixClientEventType.INVITE
 
 export interface MatrixClientEventInviteContent {
   roomId: string
+  members: string[]
 }
 
 export interface MatrixClientEventMessageContent<T> {

src/transports/Transport.ts

@@ -1,6 +1,13 @@
 import { Logger } from '../utils/Logger'
 import { ConnectionContext } from '../types/ConnectionContext'
-import { TransportType, TransportStatus, PeerInfo, StorageKey, StorageKeyReturnType } from '..'
+import {
+  TransportType,
+  TransportStatus,
+  PeerInfo,
+  StorageKey,
+  StorageKeyReturnType,
+  P2PPairingRequest
+} from '..'
 import { PeerManager } from '../managers/PeerManager'
 import { ArrayElem } from '../managers/StorageManager'
 import { CommunicationClient } from './clients/CommunicationClient'
@@ -146,10 +153,18 @@ export abstract class Transport<
   }
 
   public async addPeer(newPeer: T): Promise<void> {
-    if (!(await this.peerManager.hasPeer(newPeer.publicKey))) {
+    const peer = await this.peerManager.getPeer(newPeer.publicKey)
+    if (!peer) {
       logger.log('addPeer', 'adding peer', newPeer)
       await this.peerManager.addPeer(newPeer as ArrayElem<StorageKeyReturnType[K]>) // TODO: Fix type
       await this.listen(newPeer.publicKey) // TODO: Prevent channels from being opened multiple times
+    } else if (
+      ((peer as any) as P2PPairingRequest).relayServer !==
+      ((newPeer as any) as P2PPairingRequest).relayServer
+    ) {
+      logger.log('addPeer', 'updating peer', newPeer)
+      await this.peerManager.addPeer(newPeer as ArrayElem<StorageKeyReturnType[K]>) // TODO: Fix type
+      await this.listen(newPeer.publicKey) // TODO: Prevent channels from being opened multiple times
     } else {
       logger.log('addPeer', 'peer already added, skipping', newPeer)
     }