From e529d3447fb7c4c663dc08f0616d122f867dd019 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Thu, 28 Apr 2022 13:57:17 -0300
Subject: [PATCH 01/11] feat(): add error logger

---
 examples/dapp.html                            |  44 ++++++-
 package-lock.json                             | 108 +++++++++---------
 packages/beacon-core/src/index.ts             |   4 +-
 .../beacon-core/src/transports/Transport.ts   |   2 +-
 packages/beacon-core/src/utils/Logger.ts      |  73 +++++++++---
 .../P2PCommunicationClient.ts                 |  95 ++++++++++-----
 .../src/matrix-client/MatrixHttpClient.ts     |  11 +-
 7 files changed, 230 insertions(+), 107 deletions(-)

diff --git a/examples/dapp.html b/examples/dapp.html
index 111d55400..da2489d14 100644
--- a/examples/dapp.html
+++ b/examples/dapp.html
@@ -18,13 +18,13 @@
 
     <style>
       /* To test if our UI is affected by global styles */
-      div {
+      /* div {
         background-color: red;
       }
 
       span {
         background-color: orange;
-      }
+      } */
     </style>
   </head>
 
@@ -105,10 +105,50 @@
     ---
     <br /><br />
     <button id="reset">Reset and Refresh</button>
+    <br /><br />
+
+    <div id="logger-output"></div>
+
     <br /><br />
     <p style="margin-top: 1000px">End of page</p>
 
     <script>
+      class MyLogger {
+        constructor() {}
+
+        debug(name, method, ...args) {
+          const el = document.createElement('div')
+          el.innerText = `'debug' ${name} ${method} ${args.join(', ')}`
+          el.setAttribute('style', 'background-color: blue')
+          document.getElementById('logger-output').appendChild(el)
+        }
+
+        log(name, method, ...args) {
+          const el = document.createElement('div')
+          el.innerText = `'log' ${name} ${method} ${args.join(', ')}`
+          el.setAttribute('style', 'background-color: green')
+          document.getElementById('logger-output').appendChild(el)
+        }
+
+        warn(name, method, ...args) {
+          const el = document.createElement('div')
+          el.innerText = `'warn' ${name} ${method} ${args.join(', ')}`
+          el.setAttribute('style', 'background-color: orange')
+          document.getElementById('logger-output').appendChild(el)
+        }
+
+        error(name, method, ...args) {
+          const el = document.createElement('div')
+          el.innerText = `'error' ${name} ${method} ${args.join(', ')}`
+          el.setAttribute('style', 'background-color: red')
+          document.getElementById('logger-output').appendChild(el)
+        }
+      }
+
+      const x = new MyLogger()
+
+      beacon.setLogger(x)
+
       // Initiate DAppClient
       const client = new beacon.DAppClient({
         name: 'Example DApp', // Name of the DApp,
diff --git a/package-lock.json b/package-lock.json
index e11206b28..b52710569 100755
--- a/package-lock.json
+++ b/package-lock.json
@@ -15556,29 +15556,29 @@
     },
     "packages/beacon-blockchain-substrate": {
       "name": "@airgap/beacon-blockchain-substrate",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-ui": "^3.0.0-beta.2"
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-ui": "^3.0.0"
       }
     },
     "packages/beacon-blockchain-tezos": {
       "name": "@airgap/beacon-blockchain-tezos",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-ui": "^3.0.0-beta.2"
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-ui": "^3.0.0"
       }
     },
     "packages/beacon-core": {
       "name": "@airgap/beacon-core",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-utils": "^3.0.0-beta.2",
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-utils": "^3.0.0",
         "@types/libsodium-wrappers": "0.7.9",
         "bs58check": "2.1.2",
         "libsodium-wrappers": "0.7.9"
@@ -15586,41 +15586,41 @@
     },
     "packages/beacon-dapp": {
       "name": "@airgap/beacon-dapp",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-matrix": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-postmessage": "^3.0.0-beta.2",
-        "@airgap/beacon-ui": "^3.0.0-beta.2",
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-transport-matrix": "^3.0.0",
+        "@airgap/beacon-transport-postmessage": "^3.0.0",
+        "@airgap/beacon-ui": "^3.0.0",
         "qrcode-generator": "1.4.4"
       }
     },
     "packages/beacon-transport-matrix": {
       "name": "@airgap/beacon-transport-matrix",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-utils": "^3.0.0-beta.2",
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-utils": "^3.0.0",
         "axios": "0.24.0"
       }
     },
     "packages/beacon-transport-postmessage": {
       "name": "@airgap/beacon-transport-postmessage",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-utils": "^3.0.0-beta.2",
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-utils": "^3.0.0",
         "@types/libsodium-wrappers": "0.7.9",
         "libsodium-wrappers": "0.7.9"
       }
     },
     "packages/beacon-types": {
       "name": "@airgap/beacon-types",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
         "@types/chrome": "0.0.163"
@@ -15628,18 +15628,18 @@
     },
     "packages/beacon-ui": {
       "name": "@airgap/beacon-ui",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-postmessage": "^3.0.0-beta.2",
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-utils": "^3.0.0-beta.2"
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-transport-postmessage": "^3.0.0",
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-utils": "^3.0.0"
       }
     },
     "packages/beacon-utils": {
       "name": "@airgap/beacon-utils",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
         "@types/libsodium-wrappers": "0.7.9",
@@ -15649,12 +15649,12 @@
     },
     "packages/beacon-wallet": {
       "name": "@airgap/beacon-wallet",
-      "version": "3.0.0-beta.2",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-matrix": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-postmessage": "^3.0.0-beta.2"
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-transport-matrix": "^3.0.0",
+        "@airgap/beacon-transport-postmessage": "^3.0.0"
       }
     }
   },
@@ -15662,22 +15662,22 @@
     "@airgap/beacon-blockchain-substrate": {
       "version": "file:packages/beacon-blockchain-substrate",
       "requires": {
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-ui": "^3.0.0-beta.2"
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-ui": "^3.0.0"
       }
     },
     "@airgap/beacon-blockchain-tezos": {
       "version": "file:packages/beacon-blockchain-tezos",
       "requires": {
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-ui": "^3.0.0-beta.2"
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-ui": "^3.0.0"
       }
     },
     "@airgap/beacon-core": {
       "version": "file:packages/beacon-core",
       "requires": {
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-utils": "^3.0.0-beta.2",
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-utils": "^3.0.0",
         "@types/libsodium-wrappers": "0.7.9",
         "bs58check": "2.1.2",
         "libsodium-wrappers": "0.7.9"
@@ -15686,27 +15686,27 @@
     "@airgap/beacon-dapp": {
       "version": "file:packages/beacon-dapp",
       "requires": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-matrix": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-postmessage": "^3.0.0-beta.2",
-        "@airgap/beacon-ui": "^3.0.0-beta.2",
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-transport-matrix": "^3.0.0",
+        "@airgap/beacon-transport-postmessage": "^3.0.0",
+        "@airgap/beacon-ui": "^3.0.0",
         "qrcode-generator": "1.4.4"
       }
     },
     "@airgap/beacon-transport-matrix": {
       "version": "file:packages/beacon-transport-matrix",
       "requires": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-utils": "^3.0.0-beta.2",
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-utils": "^3.0.0",
         "axios": "0.24.0"
       }
     },
     "@airgap/beacon-transport-postmessage": {
       "version": "file:packages/beacon-transport-postmessage",
       "requires": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-utils": "^3.0.0-beta.2",
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-utils": "^3.0.0",
         "@types/libsodium-wrappers": "0.7.9",
         "libsodium-wrappers": "0.7.9"
       }
@@ -15720,10 +15720,10 @@
     "@airgap/beacon-ui": {
       "version": "file:packages/beacon-ui",
       "requires": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-postmessage": "^3.0.0-beta.2",
-        "@airgap/beacon-types": "^3.0.0-beta.2",
-        "@airgap/beacon-utils": "^3.0.0-beta.2"
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-transport-postmessage": "^3.0.0",
+        "@airgap/beacon-types": "^3.0.0",
+        "@airgap/beacon-utils": "^3.0.0"
       }
     },
     "@airgap/beacon-utils": {
@@ -15737,9 +15737,9 @@
     "@airgap/beacon-wallet": {
       "version": "file:packages/beacon-wallet",
       "requires": {
-        "@airgap/beacon-core": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-matrix": "^3.0.0-beta.2",
-        "@airgap/beacon-transport-postmessage": "^3.0.0-beta.2"
+        "@airgap/beacon-core": "^3.0.0",
+        "@airgap/beacon-transport-matrix": "^3.0.0",
+        "@airgap/beacon-transport-postmessage": "^3.0.0"
       }
     },
     "@babel/code-frame": {
diff --git a/packages/beacon-core/src/index.ts b/packages/beacon-core/src/index.ts
index a9fb314d7..54512b3cc 100644
--- a/packages/beacon-core/src/index.ts
+++ b/packages/beacon-core/src/index.ts
@@ -36,7 +36,7 @@ import { setDebugEnabled, getDebugEnabled } from './debug'
 // import { EncryptPayloadResponse } from './types/beacon/messages/EncryptPayloadResponse'
 // import { EncryptionTypeNotSupportedBeaconError } from './errors/EncryptionTypeNotSupportedBeaconError'
 import { SignatureTypeNotSupportedBeaconError } from './errors/SignatureTypeNotSupportedBeaconError'
-import { Logger } from './utils/Logger'
+import { getLogger, Logger, setLogger } from './utils/Logger'
 import { windowRef } from './MockWindow'
 import { CommunicationClient } from './transports/clients/CommunicationClient'
 // import { EncryptionType } from './types/EncryptionType'
@@ -78,7 +78,7 @@ export { SDK_VERSION, BEACON_VERSION }
 export { getSenderId, getAccountIdentifier, windowRef }
 
 // Others
-export { Serializer, Logger }
+export { Serializer, Logger, setLogger, getLogger }
 
 // Debug
 export { setDebugEnabled, getDebugEnabled }
diff --git a/packages/beacon-core/src/transports/Transport.ts b/packages/beacon-core/src/transports/Transport.ts
index 77cb656ce..581f4aa79 100644
--- a/packages/beacon-core/src/transports/Transport.ts
+++ b/packages/beacon-core/src/transports/Transport.ts
@@ -125,7 +125,7 @@ export abstract class Transport<
   public async addListener(
     listener: (message: unknown, connectionInfo: ConnectionContext) => void
   ): Promise<void> {
-    logger.debug('addListener', listener)
+    logger.debug('addListener')
 
     this.listeners.push(listener)
 
diff --git a/packages/beacon-core/src/utils/Logger.ts b/packages/beacon-core/src/utils/Logger.ts
index d3b56f47d..a8e2aee16 100644
--- a/packages/beacon-core/src/utils/Logger.ts
+++ b/packages/beacon-core/src/utils/Logger.ts
@@ -98,38 +98,46 @@ import { getDebugEnabled } from '../debug'
 //   }
 // })()
 
+export interface LoggerInterface {
+  debug(method: string, ...args: any[]): void
+  log(method: string, ...args: any[]): void
+  warn(method: string, ...args: any[]): void
+  error(method: string, ...args: any[]): void
+}
+
 /**
  * The logger that is used internally
  */
-export class Logger {
-  private readonly name: string
+export class InternalLogger {
+  constructor() {}
 
-  constructor(service: string) {
-    this.name = service
+  public debug(name: string, method: string, ...args: any[]): void {
+    this._log('debug', name, method, args)
   }
 
-  public debug(method: string, ...args: any[]): void {
-    this._log('debug', method, args)
+  public log(name: string, method: string, ...args: any[]): void {
+    this._log('log', name, method, args)
   }
 
-  public log(method: string, ...args: any[]): void {
-    this._log('log', method, args)
+  public warn(name: string, method: string, ...args: any[]): void {
+    this._log('warn', name, method, args)
   }
 
-  public warn(method: string, ...args: any[]): void {
-    this._log('warn', method, args)
+  public error(name: string, method: string, ...args: any[]): void {
+    this._log('error', name, method, args)
   }
 
-  public error(method: string, ...args: any[]): void {
-    this._log('error', method, args)
-  }
-
-  private _log(type: 'debug' | 'log' | 'warn' | 'error', method: string, args: any[] = []): void {
+  private _log(
+    type: 'debug' | 'log' | 'warn' | 'error',
+    name: string,
+    method: string,
+    args: any[] = []
+  ): void {
     if (!getDebugEnabled()) {
       return
     }
 
-    let groupText = `[BEACON] ${new Date().toISOString()} [${this.name}](${method})`
+    let groupText = `[BEACON] ${new Date().toISOString()} [${name}](${method})`
     let data = args
     if (args[0] && typeof args[0] === 'string') {
       groupText += ` ${args[0]}`
@@ -161,3 +169,36 @@ export class Logger {
     // echo.groupEnd()
   }
 }
+
+export class Logger implements LoggerInterface {
+  private readonly name: string
+
+  constructor(service: string) {
+    this.name = service
+  }
+
+  public debug(method: string, ...args: any[]): void {
+    logger.debug(this.name, method, args)
+  }
+
+  public log(method: string, ...args: any[]): void {
+    logger.log(this.name, method, args)
+  }
+
+  public warn(method: string, ...args: any[]): void {
+    logger.warn(this.name, method, args)
+  }
+
+  public error(method: string, ...args: any[]): void {
+    logger.error(this.name, method, args)
+  }
+}
+
+const loggerWrapper: LoggerInterface = new Logger('')
+let logger: LoggerInterface = new InternalLogger()
+
+export const setLogger = (newLogger: LoggerInterface): void => {
+  logger = newLogger
+}
+
+export const getLogger = (): LoggerInterface => loggerWrapper
diff --git a/packages/beacon-transport-matrix/src/communication-client/P2PCommunicationClient.ts b/packages/beacon-transport-matrix/src/communication-client/P2PCommunicationClient.ts
index 4b0b9667f..6cc820ddd 100644
--- a/packages/beacon-transport-matrix/src/communication-client/P2PCommunicationClient.ts
+++ b/packages/beacon-transport-matrix/src/communication-client/P2PCommunicationClient.ts
@@ -186,12 +186,6 @@ export class P2PCommunicationClient extends CommunicationClient {
 
     await ready
 
-    const loginRawDigest = crypto_generichash(
-      32,
-      from_string(`login:${Math.floor(Date.now() / 1000 / (5 * 60))}`)
-    )
-    const rawSignature = crypto_sign_detached(loginRawDigest, this.keyPair.privateKey)
-
     logger.log('start', `connecting to server`)
 
     const relayServer = await this.getRelayServer()
@@ -230,7 +224,12 @@ export class P2PCommunicationClient extends CommunicationClient {
       }
     })
 
-    logger.log('start', 'login', await this.getPublicKeyHash(), 'on', relayServer)
+    const loginString = `login:${Math.floor(Date.now() / 1000 / (5 * 60))}`
+
+    logger.log('start', `login ${loginString}, ${await this.getPublicKeyHash()} on ${relayServer}`)
+
+    const loginRawDigest = crypto_generichash(32, from_string(loginString))
+    const rawSignature = crypto_sign_detached(loginRawDigest, this.keyPair.privateKey)
 
     try {
       await client.start({
@@ -239,23 +238,29 @@ export class P2PCommunicationClient extends CommunicationClient {
         deviceId: toHex(this.keyPair.publicKey)
       })
     } catch (error) {
-      console.log('ERROR, RETRYING')
+      logger.error('start', 'Could not log in, retrying')
       await this.reset() // If we can't log in, let's reset
-      console.log('TRYING AGAIN')
       if (this.loginCounter <= this.ENABLED_RELAY_SERVERS.length) {
         this.loginCounter++
         this.start()
         return
       } else {
-        throw new Error('Too many login attempts. Try again later.')
+        logger.error(
+          'start',
+          'Tried to log in to every known beacon node, but no login was successful.'
+        )
+
+        throw new Error('Could not connect to any beacon nodes. Try again later.')
       }
     }
 
-    console.log('client is ready')
+    logger.log('start', 'login successful, client is ready')
     this.client.resolve(client)
   }
 
   public async stop(): Promise<void> {
+    logger.log('stop', 'stopping client')
+
     if (this.client.isResolved()) {
       await (await this.client.promise).stop().catch((error) => logger.error(error))
     }
@@ -263,6 +268,8 @@ export class P2PCommunicationClient extends CommunicationClient {
   }
 
   public async reset(): Promise<void> {
+    logger.log('reset', 'resetting connection')
+
     await this.storage.delete(StorageKey.MATRIX_PEER_ROOM_IDS).catch((error) => logger.log(error))
     await this.storage.delete(StorageKey.MATRIX_PRESERVED_STATE).catch((error) => logger.log(error))
     await this.storage.delete(StorageKey.MATRIX_SELECTED_NODE).catch((error) => logger.log(error))
@@ -280,6 +287,10 @@ export class P2PCommunicationClient extends CommunicationClient {
     if (this.activeListeners.has(senderPublicKey)) {
       return
     }
+    logger.log(
+      'listenForEncryptedMessage',
+      `start listening for encrypted messages from publicKey ${senderPublicKey}`
+    )
 
     const { sharedRx } = await this.createCryptoBoxServer(senderPublicKey, this.keyPair.privateKey)
 
@@ -302,6 +313,12 @@ export class P2PCommunicationClient extends CommunicationClient {
           try {
             const decryptedMessage = await decryptCryptoboxPayload(payload, sharedRx)
 
+            logger.log(
+              'listenForEncryptedMessage',
+              `received a message from ${senderPublicKey}`,
+              decryptedMessage
+            )
+
             // logger.log(
             //   'listenForEncryptedMessage',
             //   'encrypted message received',
@@ -375,34 +392,28 @@ export class P2PCommunicationClient extends CommunicationClient {
 
     const encryptedMessage = await encryptCryptoboxPayload(message, sharedTx)
 
-    // logger.log(
-    //   'sendMessage',
-    //   'sending encrypted message',
-    //   peer.publicKey,
-    //   roomId,
-    //   message,
-    //   await new Serializer().deserialize(message)
-    // )
-
+    logger.log('sendMessage', 'sending encrypted message', peer.publicKey, roomId, message)
     ;(await this.client.promise).sendTextMessage(roomId, encryptedMessage).catch(async (error) => {
       if (error.errcode === 'M_FORBIDDEN') {
         // Room doesn't exist
-        logger.log(`sendMessage`, `M_FORBIDDEN`, error)
+        logger.log(`sendMessage`, `M_FORBIDDEN`, roomId, error)
         await this.deleteRoomIdFromRooms(roomId)
         const newRoomId = await this.getRelevantRoom(recipient)
-
+        logger.log(`sendMessage`, `Old room deleted, new room created`, newRoomId)
         ;(await this.client.promise)
           .sendTextMessage(newRoomId, encryptedMessage)
           .catch(async (error2) => {
-            logger.log(`sendMessage`, `inner error`, error2)
+            logger.log(`sendMessage`, `inner error`, newRoomId, error2)
           })
       } else {
-        logger.log(`sendMessage`, `not forbidden`, error)
+        logger.log(`sendMessage`, `unexpected error`, error)
       }
     })
   }
 
   public async updatePeerRoom(sender: string, roomId: string): Promise<void> {
+    logger.log(`updatePeerRoom`, sender, roomId)
+
     // Sender is in the format "@pubkeyhash:relayserver.tld"
     const split = sender.split(':')
     if (split.length < 2 || !split[0].startsWith('@')) {
@@ -413,8 +424,16 @@ export class P2PCommunicationClient extends CommunicationClient {
 
     const room = roomIds[sender]
 
+    if (room === roomId) {
+      logger.debug(`updatePeerRoom`, `rooms are the same, not updating`)
+    }
+
+    logger.debug(`updatePeerRoom`, `current room`, room, 'new room', roomId)
+
     if (room && room[1]) {
       // If we have a room already, let's ignore it. We need to do this, otherwise it will be loaded from the matrix cache.
+      logger.log(`updatePeerRoom`, `adding room "${room[1]}" to ignored array`)
+
       this.ignoredRooms.push(room[1])
     }
 
@@ -447,9 +466,14 @@ export class P2PCommunicationClient extends CommunicationClient {
   public async listenForChannelOpening(
     messageCallback: (pairingResponse: ExtendedP2PPairingResponse) => void
   ): Promise<void> {
+    logger.debug(`listenForChannelOpening`)
     ;(await this.client.promise).subscribe(MatrixClientEventType.MESSAGE, async (event) => {
       if (this.isTextMessage(event.content) && (await this.isChannelOpenMessage(event.content))) {
-        logger.log(`listenForChannelOpening`, `channel opening`, JSON.stringify(event))
+        logger.log(
+          `listenForChannelOpening`,
+          `channel opening received, trying to decrypt`,
+          JSON.stringify(event)
+        )
 
         await this.updateRelayServer(event.content.message.sender)
         await this.updatePeerRoom(event.content.message.sender, event.content.roomId)
@@ -463,6 +487,12 @@ export class P2PCommunicationClient extends CommunicationClient {
               await openCryptobox(payload, this.keyPair.publicKey, this.keyPair.privateKey)
             )
 
+            logger.log(
+              `listenForChannelOpening`,
+              `channel opening received and decrypted`,
+              JSON.stringify(pairingResponse)
+            )
+
             messageCallback({
               ...pairingResponse,
               senderId: await getSenderId(pairingResponse.publicKey)
@@ -506,18 +536,23 @@ export class P2PCommunicationClient extends CommunicationClient {
 
     // We force room creation here because if we "re-pair", we need to make sure that we don't send it to an old room.
     const roomId = await (await this.client.promise).createTrustedPrivateRoom(recipient)
+    logger.debug(`sendPairingResponse`, `Connecting to room "${roomId}"`)
 
     await this.updatePeerRoom(recipient, roomId)
 
     // Before we send the message, we have to wait for the join to be accepted.
     await this.waitForJoin(roomId) // TODO: This can probably be removed because we are now waiting inside the get room method
 
+    logger.debug(`sendPairingResponse`, `Successfully joined room.`)
+
     // TODO: remove v1 backwards-compatibility
     const message: string =
       typeof pairingRequest.version === 'undefined'
         ? await this.getPublicKey() // v1
         : JSON.stringify(await this.getPairingResponseInfo(pairingRequest)) // v2
 
+    logger.debug(`sendPairingResponse`, `Sending pairing response`, message)
+
     const encryptedMessage: string = await this.encryptMessageAsymmetric(
       pairingRequest.publicKey,
       message
@@ -527,15 +562,15 @@ export class P2PCommunicationClient extends CommunicationClient {
     ;(await this.client.promise).sendTextMessage(roomId, msg).catch(async (error) => {
       if (error.errcode === 'M_FORBIDDEN') {
         // Room doesn't exist
-        logger.log(`sendMessage`, `M_FORBIDDEN`, error)
+        logger.log(`sendPairingResponse`, `M_FORBIDDEN`, roomId, error)
         await this.deleteRoomIdFromRooms(roomId)
         const newRoomId = await this.getRelevantRoom(recipient)
-
+        logger.log(`sendPairingResponse`, `Old room deleted, new room created`, newRoomId)
         ;(await this.client.promise).sendTextMessage(newRoomId, msg).catch(async (error2) => {
-          logger.log(`sendMessage`, `inner error`, error2)
+          logger.log(`sendPairingResponse`, `inner error`, newRoomId, error2)
         })
       } else {
-        logger.log(`sendMessage`, `not forbidden`, error)
+        logger.log(`sendPairingResponse`, `unexpected error`, error)
       }
     })
   }
@@ -547,6 +582,8 @@ export class P2PCommunicationClient extends CommunicationClient {
   }
 
   public async updateRelayServer(sender: string) {
+    logger.log(`updateRelayServer`, sender)
+
     // Sender is in the format "@pubkeyhash:relayserver.tld"
     const split = sender.split(':')
     if (split.length < 2 || !split[0].startsWith('@')) {
diff --git a/packages/beacon-transport-matrix/src/matrix-client/MatrixHttpClient.ts b/packages/beacon-transport-matrix/src/matrix-client/MatrixHttpClient.ts
index 7b28a52fc..2186d8b79 100644
--- a/packages/beacon-transport-matrix/src/matrix-client/MatrixHttpClient.ts
+++ b/packages/beacon-transport-matrix/src/matrix-client/MatrixHttpClient.ts
@@ -1,7 +1,10 @@
-import axios, { AxiosResponse, CancelTokenSource, Method as HttpMethod } from 'axios'
+import axios, { AxiosError, AxiosResponse, CancelTokenSource, Method as HttpMethod } from 'axios'
 
 import { keys } from '@airgap/beacon-utils'
 import { MatrixRequest, MatrixRequestParams } from './models/api/MatrixRequest'
+import { Logger } from '@airgap/beacon-core'
+
+const logger = new Logger('MatrixHttpClient')
 
 interface HttpOptions {
   accessToken?: string
@@ -101,8 +104,10 @@ export class MatrixHttpClient {
         params,
         cancelToken: this.cancelTokenSource.token
       })
-    } catch (axiosError) {
-      throw (axiosError as any).response.data
+    } catch (error) {
+      const axiosError: AxiosError = error as any
+      logger.error('send', axiosError.code, axiosError.message, (axiosError as any).response.data)
+      throw (error as any).response.data
     }
 
     return response.data

From f25d27b580733fa97f0a98aa7a3c028661b26e33 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Fri, 3 Jun 2022 08:14:16 -0300
Subject: [PATCH 02/11] fix(): add event emitter and remove node dependency

---
 .../src/matrix-client/EventEmitter.ts         | 58 +++++++++++++++++++
 .../src/matrix-client/MatrixClient.ts         |  2 +-
 .../matrix-client/MatrixClientEventEmitter.ts |  2 +-
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 packages/beacon-transport-matrix/src/matrix-client/EventEmitter.ts

diff --git a/packages/beacon-transport-matrix/src/matrix-client/EventEmitter.ts b/packages/beacon-transport-matrix/src/matrix-client/EventEmitter.ts
new file mode 100644
index 000000000..f45e8698a
--- /dev/null
+++ b/packages/beacon-transport-matrix/src/matrix-client/EventEmitter.ts
@@ -0,0 +1,58 @@
+// https://gist.github.com/mudge/5830382?permalink_comment_id=2658721#gistcomment-2658721
+
+type Listener = (...args: any[]) => void
+interface IEvents {
+  [event: string]: Listener[]
+}
+
+export class EventEmitter {
+  private readonly events: IEvents = {}
+
+  public on(event: string, listener: Listener): () => void {
+    if (typeof this.events[event] !== 'object') {
+      this.events[event] = []
+    }
+
+    this.events[event].push(listener)
+    return () => this.removeListener(event, listener)
+  }
+
+  public removeListener(event: string, listener?: Listener): void {
+    if (typeof this.events[event] !== 'object') {
+      return
+    }
+
+    if (!listener) {
+      this.events[event] = []
+      return
+    }
+
+    const idx: number = this.events[event].indexOf(listener)
+    if (idx > -1) {
+      this.events[event].splice(idx, 1)
+    }
+  }
+
+  public removeAllListeners(): void {
+    Object.keys(this.events).forEach((event: string) =>
+      this.events[event].splice(0, this.events[event].length)
+    )
+  }
+
+  public emit(event: string, ...args: any[]): void {
+    if (typeof this.events[event] !== 'object') {
+      return
+    }
+
+    ;[...this.events[event]].forEach((listener) => listener.apply(this, args))
+  }
+
+  public once(event: string, listener: Listener): () => void {
+    const remove: () => void = this.on(event, (...args: any[]) => {
+      remove()
+      listener.apply(this, args)
+    })
+
+    return remove
+  }
+}
diff --git a/packages/beacon-transport-matrix/src/matrix-client/MatrixClient.ts b/packages/beacon-transport-matrix/src/matrix-client/MatrixClient.ts
index 1da649fd5..1ae4e0219 100644
--- a/packages/beacon-transport-matrix/src/matrix-client/MatrixClient.ts
+++ b/packages/beacon-transport-matrix/src/matrix-client/MatrixClient.ts
@@ -215,7 +215,7 @@ export class MatrixClient {
    * @param listener
    */
   public unsubscribeAll(event: MatrixClientEventType): void {
-    this.eventEmitter.removeAllListeners(event)
+    this.eventEmitter.removeListener(event)
   }
 
   public async getRoomById(id: string): Promise<MatrixRoom> {
diff --git a/packages/beacon-transport-matrix/src/matrix-client/MatrixClientEventEmitter.ts b/packages/beacon-transport-matrix/src/matrix-client/MatrixClientEventEmitter.ts
index b43e441ff..912a3f6b3 100644
--- a/packages/beacon-transport-matrix/src/matrix-client/MatrixClientEventEmitter.ts
+++ b/packages/beacon-transport-matrix/src/matrix-client/MatrixClientEventEmitter.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events'
+import { EventEmitter } from './EventEmitter'
 import { keys } from '@airgap/beacon-utils'
 import { MatrixStateStore, MatrixStateUpdate } from './MatrixClientStore'
 import { MatrixRoomStatus } from './models/MatrixRoom'

From 16908c0abbc3dab207a6bfc8ab3dee8f16696a79 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Tue, 7 Jun 2022 12:14:06 -0300
Subject: [PATCH 03/11] feat(): add tests

---
 .../beacon-protocol-substrate.spec.ts         |  47 +++-
 .../beacon-protocol-tezos-sapling.spec.ts     |  51 +++-
 .../src/blockchain.ts                         |   2 +-
 .../__tests__/beacon-protocol-tezos.spec.ts   |  40 ++-
 .../beacon-core/__tests__/beacon-core.spec.ts |   7 -
 .../{ => util}/get-account-identifier.spec.ts |   2 +-
 .../__tests__/{ => util}/migrate.spec.ts      |   8 +-
 .../__tests__/{ => util}/serializer.spec.ts   |   2 +-
 .../beacon-dapp/__tests__/beacon-dapp.spec.ts |   7 -
 .../beacon-sdk/__tests__/beacon-sdk.spec.ts   |   8 +-
 .../__tests__/beacon-transport-matrix.spec.ts |   7 -
 .../beacon-transport-postmessage.spec.ts      |   8 +-
 .../__tests__/beacon-types.spec.ts            |   8 +-
 .../__tests__/_helpers/_setup.spec.ts         | 248 ++++++++++++++++++
 .../beacon-ui/__tests__/beacon-ui.spec.ts     |   7 -
 .../__tests__/tests/beacon-ui.spec.ts         |  17 ++
 .../__tests__/beacon-wallet.spec.ts           |   7 -
 17 files changed, 404 insertions(+), 72 deletions(-)
 delete mode 100644 packages/beacon-core/__tests__/beacon-core.spec.ts
 rename packages/beacon-core/__tests__/{ => util}/get-account-identifier.spec.ts (97%)
 rename packages/beacon-core/__tests__/{ => util}/migrate.spec.ts (91%)
 rename packages/beacon-core/__tests__/{ => util}/serializer.spec.ts (98%)
 delete mode 100644 packages/beacon-dapp/__tests__/beacon-dapp.spec.ts
 delete mode 100644 packages/beacon-transport-matrix/__tests__/beacon-transport-matrix.spec.ts
 create mode 100644 packages/beacon-ui/__tests__/_helpers/_setup.spec.ts
 delete mode 100644 packages/beacon-ui/__tests__/beacon-ui.spec.ts
 create mode 100644 packages/beacon-ui/__tests__/tests/beacon-ui.spec.ts
 delete mode 100644 packages/beacon-wallet/__tests__/beacon-wallet.spec.ts

diff --git a/packages/beacon-blockchain-substrate/__tests__/beacon-protocol-substrate.spec.ts b/packages/beacon-blockchain-substrate/__tests__/beacon-protocol-substrate.spec.ts
index 112fc5f12..d4b0c39f6 100644
--- a/packages/beacon-blockchain-substrate/__tests__/beacon-protocol-substrate.spec.ts
+++ b/packages/beacon-blockchain-substrate/__tests__/beacon-protocol-substrate.spec.ts
@@ -1,7 +1,48 @@
-'use strict'
+import { BeaconMessageType } from '@airgap/beacon-types'
+import * as chai from 'chai'
+import * as chaiAsPromised from 'chai-as-promised'
+import 'mocha'
 
-const beaconProtocolSubstrate = require('..')
+// use chai-as-promised plugin
+chai.use(chaiAsPromised)
+const expect = chai.expect
+
+import { SubstrateBlockchain, SubstratePermissionScope } from '../src'
 
 describe('@airgap/beacon-blockchain-substrate', () => {
-  it('needs tests')
+  it('should have wallets', async () => {
+    const blockchain = new SubstrateBlockchain()
+
+    const wallets = await blockchain.getWalletLists()
+
+    expect(Array.isArray(wallets.desktopList)).to.be.true
+    expect(Array.isArray(wallets.extensionList)).to.be.true
+    expect(Array.isArray(wallets.iOSList)).to.be.true
+    expect(Array.isArray(wallets.webList)).to.be.true
+  })
+
+  it('should handle a permission response', async () => {
+    const blockchain = new SubstrateBlockchain()
+
+    const accountInfos = await blockchain.getAccountInfosFromPermissionResponse({
+      blockchainIdentifier: 'substrate',
+      type: BeaconMessageType.PermissionResponse,
+      blockchainData: {
+        appMetadata: { senderId: 'sender', name: 'name' },
+        scopes: [SubstratePermissionScope.transfer],
+        accounts: [
+          {
+            accountId: 'account',
+            publicKey: 'pubKey',
+            address: 'address'
+          }
+        ]
+      }
+    })
+
+    expect(accountInfos.length).to.equal(1)
+    expect(accountInfos[0].accountId).to.equal('account')
+    expect(accountInfos[0].publicKey).to.equal('pubKey')
+    expect(accountInfos[0].address).to.equal('address')
+  })
 })
diff --git a/packages/beacon-blockchain-tezos-sapling/__tests__/beacon-protocol-tezos-sapling.spec.ts b/packages/beacon-blockchain-tezos-sapling/__tests__/beacon-protocol-tezos-sapling.spec.ts
index 41d6e9607..d4a101510 100644
--- a/packages/beacon-blockchain-tezos-sapling/__tests__/beacon-protocol-tezos-sapling.spec.ts
+++ b/packages/beacon-blockchain-tezos-sapling/__tests__/beacon-protocol-tezos-sapling.spec.ts
@@ -1,7 +1,52 @@
-'use strict'
+import { BeaconMessageType, NetworkType } from '@airgap/beacon-types'
+import * as chai from 'chai'
+import * as chaiAsPromised from 'chai-as-promised'
+import 'mocha'
 
-const beaconProtocoTezosSapling = require('..')
+// use chai-as-promised plugin
+chai.use(chaiAsPromised)
+const expect = chai.expect
+
+import { TezosSaplingBlockchain, TezosSaplingPermissionScope } from '../src'
 
 describe('@airgap/beacon-blockchain-tezos-sapling', () => {
-  it('needs tests')
+  it('should have wallets', async () => {
+    const blockchain = new TezosSaplingBlockchain()
+
+    const wallets = await blockchain.getWalletLists()
+
+    expect(Array.isArray(wallets.desktopList)).to.be.true
+    expect(Array.isArray(wallets.extensionList)).to.be.true
+    expect(Array.isArray(wallets.iOSList)).to.be.true
+    expect(Array.isArray(wallets.webList)).to.be.true
+  })
+
+  it('should handle a permission response', async () => {
+    const blockchain = new TezosSaplingBlockchain()
+
+    const accountInfos = await blockchain.getAccountInfosFromPermissionResponse({
+      blockchainIdentifier: 'tezos-sapling',
+      type: BeaconMessageType.PermissionResponse,
+      blockchainData: {
+        appMetadata: { senderId: 'sender', name: 'name' },
+        scopes: [TezosSaplingPermissionScope.transfer],
+        accounts: [
+          {
+            accountId: 'account',
+            address: 'zet1...',
+            viewingKey: 'viewingKey...',
+            network: {
+              contract: 'KT1...',
+              type: NetworkType.MAINNET
+            }
+          }
+        ]
+      }
+    })
+
+    expect(accountInfos.length).to.equal(1)
+    expect(accountInfos[0].accountId).to.equal('account')
+    expect(accountInfos[0].publicKey).to.equal('viewingKey...')
+    expect(accountInfos[0].address).to.equal('zet1...')
+  })
 })
diff --git a/packages/beacon-blockchain-tezos-sapling/src/blockchain.ts b/packages/beacon-blockchain-tezos-sapling/src/blockchain.ts
index 4d53bfeda..9aa3c3620 100644
--- a/packages/beacon-blockchain-tezos-sapling/src/blockchain.ts
+++ b/packages/beacon-blockchain-tezos-sapling/src/blockchain.ts
@@ -41,7 +41,7 @@ export class TezosSaplingBlockchain implements Blockchain {
     return permissionResponse.blockchainData.accounts.map((account) => ({
       accountId: account.accountId,
       address: account.address,
-      publicKey: '' // Public key or viewing key is not shared in permission request for privacy reasons
+      publicKey: account.viewingKey ?? '' // Public key or viewing key is not shared in permission request for privacy reasons
     }))
   }
 }
diff --git a/packages/beacon-blockchain-tezos/__tests__/beacon-protocol-tezos.spec.ts b/packages/beacon-blockchain-tezos/__tests__/beacon-protocol-tezos.spec.ts
index 57ab6a19e..c2c217613 100644
--- a/packages/beacon-blockchain-tezos/__tests__/beacon-protocol-tezos.spec.ts
+++ b/packages/beacon-blockchain-tezos/__tests__/beacon-protocol-tezos.spec.ts
@@ -1,7 +1,41 @@
-'use strict'
+import { BeaconMessageType } from '@airgap/beacon-types'
+import * as chai from 'chai'
+import * as chaiAsPromised from 'chai-as-promised'
+import 'mocha'
 
-const beaconProtocolTezos = require('..')
+// use chai-as-promised plugin
+chai.use(chaiAsPromised)
+const expect = chai.expect
+
+import { TezosBlockchain } from '../src'
 
 describe('@airgap/beacon-blockchain-tezos', () => {
-  it('needs tests')
+  it('should have wallets', async () => {
+    const blockchain = new TezosBlockchain()
+
+    const wallets = await blockchain.getWalletLists()
+
+    expect(Array.isArray(wallets.desktopList)).to.be.true
+    expect(Array.isArray(wallets.extensionList)).to.be.true
+    expect(Array.isArray(wallets.iOSList)).to.be.true
+    expect(Array.isArray(wallets.webList)).to.be.true
+  })
+
+  it('should handle a permission response', async () => {
+    const blockchain = new TezosBlockchain()
+
+    const accountInfos = await blockchain.getAccountInfosFromPermissionResponse({
+      blockchainIdentifier: 'tezos',
+      type: BeaconMessageType.PermissionResponse,
+      blockchainData: {
+        appMetadata: { senderId: 'sender', name: 'name' },
+        scopes: ['test']
+      }
+    })
+
+    expect(accountInfos.length).to.equal(1)
+    expect(accountInfos[0].accountId).to.equal('')
+    expect(accountInfos[0].publicKey).to.equal('')
+    expect(accountInfos[0].address).to.equal('')
+  })
 })
diff --git a/packages/beacon-core/__tests__/beacon-core.spec.ts b/packages/beacon-core/__tests__/beacon-core.spec.ts
deleted file mode 100644
index f4db21039..000000000
--- a/packages/beacon-core/__tests__/beacon-core.spec.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-import { SDK_VERSION } from '../src/index'
-
-describe('@airgap/beacon-core', () => {
-  it('needs tests' + SDK_VERSION)
-})
diff --git a/packages/beacon-core/__tests__/get-account-identifier.spec.ts b/packages/beacon-core/__tests__/util/get-account-identifier.spec.ts
similarity index 97%
rename from packages/beacon-core/__tests__/get-account-identifier.spec.ts
rename to packages/beacon-core/__tests__/util/get-account-identifier.spec.ts
index abb318aaf..1af03caf0 100644
--- a/packages/beacon-core/__tests__/get-account-identifier.spec.ts
+++ b/packages/beacon-core/__tests__/util/get-account-identifier.spec.ts
@@ -1,7 +1,7 @@
 import * as chai from 'chai'
 import * as chaiAsPromised from 'chai-as-promised'
 import 'mocha'
-import { getAccountIdentifier } from '../src/utils/get-account-identifier'
+import { getAccountIdentifier } from '../../src/utils/get-account-identifier'
 import { Network, NetworkType } from '@airgap/beacon-types'
 
 // use chai-as-promised plugin
diff --git a/packages/beacon-core/__tests__/migrate.spec.ts b/packages/beacon-core/__tests__/util/migrate.spec.ts
similarity index 91%
rename from packages/beacon-core/__tests__/migrate.spec.ts
rename to packages/beacon-core/__tests__/util/migrate.spec.ts
index 932e79eb1..7e7761cc8 100644
--- a/packages/beacon-core/__tests__/migrate.spec.ts
+++ b/packages/beacon-core/__tests__/util/migrate.spec.ts
@@ -2,11 +2,11 @@ import * as chai from 'chai'
 import * as chaiAsPromised from 'chai-as-promised'
 import 'mocha'
 
-import { FileStorage, writeLocalFile } from '../../../test/test-utils/FileStorage'
+import { FileStorage, writeLocalFile } from '../../../../test/test-utils/FileStorage'
 import { NetworkType, Origin, Storage, StorageKey } from '@airgap/beacon-types'
-import { migrate } from '../src/migrations/migrations'
-import { AccountInfoOld, P2PPairingRequestOld } from '../src/migrations/migrate-0.7.0'
-import { SDK_VERSION } from '../src'
+import { migrate } from '../../src/migrations/migrations'
+import { AccountInfoOld, P2PPairingRequestOld } from '../../src/migrations/migrate-0.7.0'
+import { SDK_VERSION } from '../../src'
 
 // use chai-as-promised plugin
 chai.use(chaiAsPromised)
diff --git a/packages/beacon-core/__tests__/serializer.spec.ts b/packages/beacon-core/__tests__/util/serializer.spec.ts
similarity index 98%
rename from packages/beacon-core/__tests__/serializer.spec.ts
rename to packages/beacon-core/__tests__/util/serializer.spec.ts
index e1b30b226..30bdbf060 100644
--- a/packages/beacon-core/__tests__/serializer.spec.ts
+++ b/packages/beacon-core/__tests__/util/serializer.spec.ts
@@ -2,7 +2,7 @@ import * as chai from 'chai'
 import * as chaiAsPromised from 'chai-as-promised'
 import 'mocha'
 
-import { Serializer } from '../src/Serializer'
+import { Serializer } from '../../src/Serializer'
 
 // use chai-as-promised plugin
 chai.use(chaiAsPromised)
diff --git a/packages/beacon-dapp/__tests__/beacon-dapp.spec.ts b/packages/beacon-dapp/__tests__/beacon-dapp.spec.ts
deleted file mode 100644
index 6a4b2a681..000000000
--- a/packages/beacon-dapp/__tests__/beacon-dapp.spec.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-const beaconDapp = require('..')
-
-describe('@airgap/beacon-dapp', () => {
-  it('needs tests')
-})
diff --git a/packages/beacon-sdk/__tests__/beacon-sdk.spec.ts b/packages/beacon-sdk/__tests__/beacon-sdk.spec.ts
index 67271e502..49a76f52e 100644
--- a/packages/beacon-sdk/__tests__/beacon-sdk.spec.ts
+++ b/packages/beacon-sdk/__tests__/beacon-sdk.spec.ts
@@ -1,7 +1 @@
-'use strict'
-
-const beaconSdk = require('..')
-
-describe('@airgap/beacon-sdk', () => {
-  it('needs tests')
-})
+// Tests are located in the other packages, this package simply combines some of the other packages without adding any logic.
diff --git a/packages/beacon-transport-matrix/__tests__/beacon-transport-matrix.spec.ts b/packages/beacon-transport-matrix/__tests__/beacon-transport-matrix.spec.ts
deleted file mode 100644
index f835ee631..000000000
--- a/packages/beacon-transport-matrix/__tests__/beacon-transport-matrix.spec.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-const beaconTransportMatrix = require('..')
-
-describe('@airgap/beacon-transport-matrix', () => {
-  it('needs tests')
-})
diff --git a/packages/beacon-transport-postmessage/__tests__/beacon-transport-postmessage.spec.ts b/packages/beacon-transport-postmessage/__tests__/beacon-transport-postmessage.spec.ts
index 2e4b8f45c..2fb9c2389 100644
--- a/packages/beacon-transport-postmessage/__tests__/beacon-transport-postmessage.spec.ts
+++ b/packages/beacon-transport-postmessage/__tests__/beacon-transport-postmessage.spec.ts
@@ -1,7 +1 @@
-'use strict'
-
-const beaconTransportPostmessage = require('..')
-
-describe('@airgap/beacon-transport-postmessage', () => {
-  it('needs tests')
-})
+// Tests are located in the @airgap/beacon-dapp package
diff --git a/packages/beacon-types/__tests__/beacon-types.spec.ts b/packages/beacon-types/__tests__/beacon-types.spec.ts
index d0d656b98..f2887d944 100644
--- a/packages/beacon-types/__tests__/beacon-types.spec.ts
+++ b/packages/beacon-types/__tests__/beacon-types.spec.ts
@@ -1,7 +1 @@
-'use strict'
-
-const beaconTypes = require('..')
-
-describe('@airgap/beacon-types', () => {
-  it('needs tests')
-})
+// This package only includes types
diff --git a/packages/beacon-ui/__tests__/_helpers/_setup.spec.ts b/packages/beacon-ui/__tests__/_helpers/_setup.spec.ts
new file mode 100644
index 000000000..bf1cd2c04
--- /dev/null
+++ b/packages/beacon-ui/__tests__/_helpers/_setup.spec.ts
@@ -0,0 +1,248 @@
+import { MockLocalStorage } from '../../../../test/test-utils/MockLocalStorage'
+;(global as any).localStorage = new MockLocalStorage()
+
+import Axios from 'axios'
+const MockAdapter = require('axios-mock-adapter')
+
+beforeEach(() => {
+  ;(global as any).localStorage.clear()
+})
+
+/**
+ * Create a JSDOM instance to support localStorage and other DOM methods
+ */
+const { JSDOM } = require('jsdom')
+const dom = new JSDOM('<!doctype html><html><body></body></html>', {
+  url: 'http://localhost/'
+})
+
+;(global as any).window = dom.window
+;(global as any).document = dom.window.document
+
+// This sets the mock adapter on the default instance
+const mock = new MockAdapter(Axios)
+
+const getVersionReply = () => {
+  return {
+    versions: ['r0.0.1', 'r0.1.0', 'r0.2.0', 'r0.3.0', 'r0.4.0', 'r0.5.0'],
+    unstable_features: {
+      'm.lazy_load_members': true,
+      'm.id_access_token': true,
+      'm.require_identity_server': false,
+      'm.separate_add_and_bind': true
+    }
+  }
+}
+
+const getLogin = (hostname: string) => {
+  console.log('GET LOGIN')
+  return {
+    user_id: `@xxx:${hostname}`,
+    access_token: 'ACCESS_TOKEN',
+    home_server: hostname,
+    device_id: 'xxx'
+  }
+}
+
+const getSync = () => {
+  return {
+    account_data: {
+      events: [
+        {
+          type: 'm.push_rules',
+          content: {
+            global: {
+              underride: [
+                {
+                  conditions: [{ kind: 'event_match', key: 'type', pattern: 'm.call.invite' }],
+                  actions: [
+                    'notify',
+                    { set_tweak: 'sound', value: 'ring' },
+                    { set_tweak: 'highlight', value: false }
+                  ],
+                  rule_id: '.m.rule.call',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [
+                    { kind: 'room_member_count', is: '2' },
+                    { kind: 'event_match', key: 'type', pattern: 'm.room.message' }
+                  ],
+                  actions: [
+                    'notify',
+                    { set_tweak: 'sound', value: 'default' },
+                    { set_tweak: 'highlight', value: false }
+                  ],
+                  rule_id: '.m.rule.room_one_to_one',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [
+                    { kind: 'room_member_count', is: '2' },
+                    { kind: 'event_match', key: 'type', pattern: 'm.room.encrypted' }
+                  ],
+                  actions: [
+                    'notify',
+                    { set_tweak: 'sound', value: 'default' },
+                    { set_tweak: 'highlight', value: false }
+                  ],
+                  rule_id: '.m.rule.encrypted_room_one_to_one',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [{ kind: 'event_match', key: 'type', pattern: 'm.room.message' }],
+                  actions: ['notify', { set_tweak: 'highlight', value: false }],
+                  rule_id: '.m.rule.message',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [{ kind: 'event_match', key: 'type', pattern: 'm.room.encrypted' }],
+                  actions: ['notify', { set_tweak: 'highlight', value: false }],
+                  rule_id: '.m.rule.encrypted',
+                  default: true,
+                  enabled: true
+                }
+              ],
+              sender: [],
+              room: [],
+              content: [
+                {
+                  actions: [
+                    'notify',
+                    { set_tweak: 'sound', value: 'default' },
+                    { set_tweak: 'highlight' }
+                  ],
+                  pattern: '632392b258880b3a108035a4c847127544112102c5a0ffb07d459788f6f4be0e',
+                  rule_id: '.m.rule.contains_user_name',
+                  default: true,
+                  enabled: true
+                }
+              ],
+              override: [
+                {
+                  conditions: [],
+                  actions: ['dont_notify'],
+                  rule_id: '.m.rule.master',
+                  default: true,
+                  enabled: false
+                },
+                {
+                  conditions: [
+                    { kind: 'event_match', key: 'content.msgtype', pattern: 'm.notice' }
+                  ],
+                  actions: ['dont_notify'],
+                  rule_id: '.m.rule.suppress_notices',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [
+                    { kind: 'event_match', key: 'type', pattern: 'm.room.member' },
+                    { kind: 'event_match', key: 'content.membership', pattern: 'invite' },
+                    {
+                      kind: 'event_match',
+                      key: 'state_key',
+                      pattern:
+                        '@632392b258880b3a108035a4c847127544112102c5a0ffb07d459788f6f4be0e:beacon-node-0.papers.tech:8448'
+                    }
+                  ],
+                  actions: [
+                    'notify',
+                    { set_tweak: 'sound', value: 'default' },
+                    { set_tweak: 'highlight', value: false }
+                  ],
+                  rule_id: '.m.rule.invite_for_me',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [{ kind: 'event_match', key: 'type', pattern: 'm.room.member' }],
+                  actions: ['dont_notify'],
+                  rule_id: '.m.rule.member_event',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [{ kind: 'contains_display_name' }],
+                  actions: [
+                    'notify',
+                    { set_tweak: 'sound', value: 'default' },
+                    { set_tweak: 'highlight' }
+                  ],
+                  rule_id: '.m.rule.contains_display_name',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [
+                    { kind: 'event_match', key: 'content.body', pattern: '@room' },
+                    { kind: 'sender_notification_permission', key: 'room' }
+                  ],
+                  actions: ['notify', { set_tweak: 'highlight', value: true }],
+                  rule_id: '.m.rule.roomnotif',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [
+                    { kind: 'event_match', key: 'type', pattern: 'm.room.tombstone' },
+                    { kind: 'event_match', key: 'state_key', pattern: '' }
+                  ],
+                  actions: ['notify', { set_tweak: 'highlight', value: true }],
+                  rule_id: '.m.rule.tombstone',
+                  default: true,
+                  enabled: true
+                },
+                {
+                  conditions: [{ kind: 'event_match', key: 'type', pattern: 'm.reaction' }],
+                  actions: ['dont_notify'],
+                  rule_id: '.m.rule.reaction',
+                  default: true,
+                  enabled: true
+                }
+              ]
+            },
+            device: {}
+          }
+        }
+      ]
+    },
+    to_device: { events: [] },
+    device_lists: { changed: [], left: [] },
+    presence: { events: [] },
+    rooms: { join: {}, invite: {}, leave: {} },
+    groups: { join: {}, invite: {}, leave: {} },
+    device_one_time_keys_count: {},
+    next_batch: 's949223_5360456_0_1_1_1_1_68957_1'
+  }
+}
+
+mock
+  .onGet('https://beacon-node-1.sky.papers.tech/_matrix/client/versions')
+  .reply(200, getVersionReply())
+  .onGet('https://beacon-node-2.sky.papers.tech/_matrix/client/versions')
+  .reply(200, getVersionReply())
+  .onGet('https://beacon-node-0.papers.tech:8448/_matrix/client/versions')
+  .reply(200, getVersionReply())
+  .onPost('https://beacon-node-1.sky.papers.tech/_matrix/client/r0/login')
+  .reply(200, getLogin('beacon-node-1.sky.papers.tech'))
+  .onPost('https://beacon-node-2.sky.papers.tech/_matrix/client/r0/login')
+  .reply(200, getLogin('beacon-node-2.sky.papers.tech'))
+  .onPost('https://beacon-node-0.papers.tech:8448/_matrix/client/r0/login')
+  .reply(200, getLogin('beacon-node-0.papers.tech:8448'))
+  .onGet('https://beacon-node-1.sky.papers.tech/_matrix/client/r0/sync')
+  .reply(200, getSync())
+  .onGet('https://beacon-node-2.sky.papers.tech/_matrix/client/r0/sync')
+  .reply(200, getSync())
+  .onGet('https://beacon-node-0.papers.tech:8448/_matrix/client/r0/sync')
+  .reply(200, getSync())
+  .onAny()
+  .reply((config: any) => {
+    console.log('UNMOCKED URL, RETURNING ERROR 500', `${config.baseURL}${config.url}`)
+
+    return [500, {}]
+  })
diff --git a/packages/beacon-ui/__tests__/beacon-ui.spec.ts b/packages/beacon-ui/__tests__/beacon-ui.spec.ts
deleted file mode 100644
index 28d3fa9fb..000000000
--- a/packages/beacon-ui/__tests__/beacon-ui.spec.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-const beaconUi = require('..')
-
-describe('@airgap/beacon-ui', () => {
-  it('needs tests')
-})
diff --git a/packages/beacon-ui/__tests__/tests/beacon-ui.spec.ts b/packages/beacon-ui/__tests__/tests/beacon-ui.spec.ts
new file mode 100644
index 000000000..1c4793dd8
--- /dev/null
+++ b/packages/beacon-ui/__tests__/tests/beacon-ui.spec.ts
@@ -0,0 +1,17 @@
+import { getTzip10Link } from '../../src/utils/get-tzip10-link'
+
+import * as chai from 'chai'
+import * as chaiAsPromised from 'chai-as-promised'
+import 'mocha'
+
+// use chai-as-promised plugin
+chai.use(chaiAsPromised)
+const expect = chai.expect
+
+describe('@airgap/beacon-ui', () => {
+  it('should create a tzip 10 URI', () => {
+    const link = getTzip10Link('airgap-wallet://', 'PAYLOAD')
+
+    expect(link).to.equal('airgap-wallet://?type=tzip10&data=PAYLOAD')
+  })
+})
diff --git a/packages/beacon-wallet/__tests__/beacon-wallet.spec.ts b/packages/beacon-wallet/__tests__/beacon-wallet.spec.ts
deleted file mode 100644
index 5a5a4e468..000000000
--- a/packages/beacon-wallet/__tests__/beacon-wallet.spec.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict'
-
-const beaconWallet = require('..')
-
-describe('@airgap/beacon-wallet', () => {
-  it('needs tests')
-})

From 1c2ab34fe53f3dc8722a7187826809c797ffd9e9 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Tue, 7 Jun 2022 12:17:01 -0300
Subject: [PATCH 04/11] fix(): activate tests

---
 .../__tests__/{ => tests}/matrix-client.spec.ts           | 8 ++++----
 .../__tests__/{ => tests}/p2p-client.spec.ts              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/beacon-transport-matrix/__tests__/{ => tests}/matrix-client.spec.ts (97%)
 rename packages/beacon-transport-matrix/__tests__/{ => tests}/p2p-client.spec.ts (93%)

diff --git a/packages/beacon-transport-matrix/__tests__/matrix-client.spec.ts b/packages/beacon-transport-matrix/__tests__/tests/matrix-client.spec.ts
similarity index 97%
rename from packages/beacon-transport-matrix/__tests__/matrix-client.spec.ts
rename to packages/beacon-transport-matrix/__tests__/tests/matrix-client.spec.ts
index 8b3b00d7f..4cbbf8103 100644
--- a/packages/beacon-transport-matrix/__tests__/matrix-client.spec.ts
+++ b/packages/beacon-transport-matrix/__tests__/tests/matrix-client.spec.ts
@@ -2,11 +2,11 @@ import * as chai from 'chai'
 import * as chaiAsPromised from 'chai-as-promised'
 import 'mocha'
 import { LocalStorage } from '@airgap/beacon-core'
-import { MatrixClient } from '../src/matrix-client/MatrixClient'
+import { MatrixClient } from '../../src/matrix-client/MatrixClient'
 import * as sinon from 'sinon'
-import { MatrixRoomStatus } from '../src/matrix-client/models/MatrixRoom'
-import { MatrixHttpClient } from '../src/matrix-client/MatrixHttpClient'
-import { MatrixClientEventType } from '../src/matrix-client/models/MatrixClientEvent'
+import { MatrixRoomStatus } from '../../src/matrix-client/models/MatrixRoom'
+import { MatrixHttpClient } from '../../src/matrix-client/MatrixHttpClient'
+import { MatrixClientEventType } from '../../src/matrix-client/models/MatrixClientEvent'
 
 MatrixClient
 // use chai-as-promised plugin
diff --git a/packages/beacon-transport-matrix/__tests__/p2p-client.spec.ts b/packages/beacon-transport-matrix/__tests__/tests/p2p-client.spec.ts
similarity index 93%
rename from packages/beacon-transport-matrix/__tests__/p2p-client.spec.ts
rename to packages/beacon-transport-matrix/__tests__/tests/p2p-client.spec.ts
index 9cee1a471..b14ed2283 100644
--- a/packages/beacon-transport-matrix/__tests__/p2p-client.spec.ts
+++ b/packages/beacon-transport-matrix/__tests__/tests/p2p-client.spec.ts
@@ -3,7 +3,7 @@ import * as chaiAsPromised from 'chai-as-promised'
 import 'mocha'
 import * as sinon from 'sinon'
 
-import { P2PCommunicationClient } from '../src'
+import { P2PCommunicationClient } from '../../src'
 import { getKeypairFromSeed } from '@airgap/beacon-utils'
 import { LocalStorage } from '@airgap/beacon-core'
 

From 5e066c2a558de1ec1e582830ca003dae6fceb3e7 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Tue, 7 Jun 2022 18:07:32 -0300
Subject: [PATCH 05/11] fix(test): failing test because of renamed method

---
 .../__tests__/tests/matrix-client.spec.ts                  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/beacon-transport-matrix/__tests__/tests/matrix-client.spec.ts b/packages/beacon-transport-matrix/__tests__/tests/matrix-client.spec.ts
index 4cbbf8103..0ada0fa78 100644
--- a/packages/beacon-transport-matrix/__tests__/tests/matrix-client.spec.ts
+++ b/packages/beacon-transport-matrix/__tests__/tests/matrix-client.spec.ts
@@ -163,13 +163,12 @@ describe(`MatrixClient`, () => {
 
   it(`should unsubscribe all events`, async () => {
     const removeStub = sinon.stub((<any>client).eventEmitter, 'removeListener').resolves()
-    const removeAllStub = sinon.stub((<any>client).eventEmitter, 'removeAllListeners').resolves()
 
     client.unsubscribeAll(MatrixClientEventType.MESSAGE)
 
-    expect(removeStub.callCount).to.equal(0)
-    expect(removeAllStub.callCount).to.equal(1)
-    expect(removeAllStub.firstCall.args[0]).to.equal(MatrixClientEventType.MESSAGE)
+    expect(removeStub.callCount).to.equal(1)
+    expect(removeStub.firstCall.args[0]).to.equal(MatrixClientEventType.MESSAGE)
+    expect(removeStub.firstCall.args[1]).to.equal(undefined)
   })
 
   it(`should get a room by id`, async () => {

From 8d42ff3fd5a2a03b133e312a90cfa165b36f22b9 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Wed, 8 Jun 2022 14:21:02 -0300
Subject: [PATCH 06/11] feat(): add comments

---
 .../src/types/message-type.ts                               | 5 ++++-
 .../src/types/permission-scope.ts                           | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/beacon-blockchain-tezos-sapling/src/types/message-type.ts b/packages/beacon-blockchain-tezos-sapling/src/types/message-type.ts
index 519e95c61..3468bac12 100644
--- a/packages/beacon-blockchain-tezos-sapling/src/types/message-type.ts
+++ b/packages/beacon-blockchain-tezos-sapling/src/types/message-type.ts
@@ -1,4 +1,7 @@
 export enum TezosSaplingMessageType {
+  /**
+   * This message type is used for transfers from one sapling address to another.
+   */
   'transfer_request' = 'transfer_request'
-  // shield, transfer, unshield?
+  // In a later version, support for shield and unshield operations will most likely be added.
 }
diff --git a/packages/beacon-blockchain-tezos-sapling/src/types/permission-scope.ts b/packages/beacon-blockchain-tezos-sapling/src/types/permission-scope.ts
index 734db8c95..d00812dfd 100644
--- a/packages/beacon-blockchain-tezos-sapling/src/types/permission-scope.ts
+++ b/packages/beacon-blockchain-tezos-sapling/src/types/permission-scope.ts
@@ -1,4 +1,10 @@
 export enum TezosSaplingPermissionScope {
+  /**
+   * The "viewing_key" permission is used to signal to the wallet that a dApp requests access to the viewing key. Sharing the viewing key will give up ALL privacy advantages of sapling, so this permission should only be granted in very specific cases.
+   */
   'viewing_key' = 'viewing_key',
+  /**
+   * This permission allows wallets to do normal transfers from one sapling account to another.
+   */
   'transfer' = 'transfer'
 }

From 9f81b1e02696871606f5e1c8e44ef56fff7940e9 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Thu, 9 Jun 2022 13:53:27 -0300
Subject: [PATCH 07/11] feat(): open link for disabled wallets

---
 assets/alert/alert-pair.css                | 9 +++++----
 packages/beacon-ui/src/ui/alert/Pairing.ts | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/assets/alert/alert-pair.css b/assets/alert/alert-pair.css
index 69d178158..17a0814c7 100644
--- a/assets/alert/alert-pair.css
+++ b/assets/alert/alert-pair.css
@@ -76,24 +76,25 @@
 .disabled {
   cursor: initial;
 }
-.disabled span,
+/* .disabled span,
 .disabled img {
   opacity: 0.48;
-}
+} */
 .disabled p {
   text-align: left;
   margin: 0;
   font-size: 10px;
   font-weight: 300;
+  opacity: 0.48;
 }
-.disabled img {
+/* .disabled img {
   -webkit-filter: grayscale(100%);
   -moz-filter: grayscale(100%);
   -ms-filter: grayscale(100%);
   -o-filter: grayscale(100%);
   filter: grayscale(100%);
   filter: gray;
-}
+} */
 
 #beacon--disclaimer {
   text-align: left;
diff --git a/packages/beacon-ui/src/ui/alert/Pairing.ts b/packages/beacon-ui/src/ui/alert/Pairing.ts
index fddca7f31..d6d004ec7 100644
--- a/packages/beacon-ui/src/ui/alert/Pairing.ts
+++ b/packages/beacon-ui/src/ui/alert/Pairing.ts
@@ -216,7 +216,8 @@ export class Pairing {
               logo: app.logo,
               enabled: false,
               clickHandler: (): void => {
-                // Don't do anything
+                // Open wallet page
+                window.open(app.link, '_blank')
               }
             }))
         ].sort((a, b) => a.key.localeCompare(b.key))

From 1c0139d8451f51d2965895410bb25c53757bcbf2 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Thu, 9 Jun 2022 15:37:29 -0300
Subject: [PATCH 08/11] feat(): remove unused css

---
 assets/alert/alert-pair.css | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/assets/alert/alert-pair.css b/assets/alert/alert-pair.css
index 17a0814c7..04a296dc5 100644
--- a/assets/alert/alert-pair.css
+++ b/assets/alert/alert-pair.css
@@ -73,13 +73,7 @@
 #beacon--qr__container:hover #beacon--qr__copy {
   display: block;
 }
-.disabled {
-  cursor: initial;
-}
-/* .disabled span,
-.disabled img {
-  opacity: 0.48;
-} */
+
 .disabled p {
   text-align: left;
   margin: 0;
@@ -87,14 +81,6 @@
   font-weight: 300;
   opacity: 0.48;
 }
-/* .disabled img {
-  -webkit-filter: grayscale(100%);
-  -moz-filter: grayscale(100%);
-  -ms-filter: grayscale(100%);
-  -o-filter: grayscale(100%);
-  filter: grayscale(100%);
-  filter: gray;
-} */
 
 #beacon--disclaimer {
   text-align: left;

From 69d28c0e906f5842c07701a90ae803b84250467f Mon Sep 17 00:00:00 2001
From: acharl <amadeo.charle108@gmail.com>
Date: Fri, 17 Jun 2022 17:08:00 +0200
Subject: [PATCH 09/11] feat(UI): position QR copy alert centered and outside
 of QR

---
 assets/alert/alert-pair.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/alert/alert-pair.css b/assets/alert/alert-pair.css
index 04a296dc5..6aca2a1f6 100644
--- a/assets/alert/alert-pair.css
+++ b/assets/alert/alert-pair.css
@@ -62,9 +62,9 @@
 #beacon--qr__copy {
   display: none;
   position: relative;
-  top: -190px;
-  left: 138px;
-  margin: 0;
+  margin-top: auto;
+  margin-left: auto;
+  margin-right: auto;
 }
 #beacon--qr__container {
   margin-left: auto;

From 9d807b34e2943b688b7755dac568e2b29e4061a9 Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Wed, 29 Jun 2022 16:16:52 -0300
Subject: [PATCH 10/11] feat(): add ghostnet

---
 packages/beacon-dapp/src/utils/tezblock-blockexplorer.ts | 3 +++
 packages/beacon-types/src/types/beacon/NetworkType.ts    | 3 +++
 packages/beacon-types/src/types/ui.ts                    | 3 +++
 scripts/blockchains/tezos-sapling.ts                     | 3 +++
 scripts/blockchains/tezos.ts                             | 6 ++++++
 5 files changed, 18 insertions(+)

diff --git a/packages/beacon-dapp/src/utils/tezblock-blockexplorer.ts b/packages/beacon-dapp/src/utils/tezblock-blockexplorer.ts
index 7826d0cfe..96cd9d629 100644
--- a/packages/beacon-dapp/src/utils/tezblock-blockexplorer.ts
+++ b/packages/beacon-dapp/src/utils/tezblock-blockexplorer.ts
@@ -5,6 +5,9 @@ export class TezblockBlockExplorer extends BlockExplorer {
   constructor(
     public readonly rpcUrls: { [key in NetworkType]: string } = {
       [NetworkType.MAINNET]: 'https://tezblock.io',
+      [NetworkType.GHOSTNET]: 'https://ghostnet.tezblock.io',
+      [NetworkType.MONDAYNET]: 'https://mondaynet.tezblock.io',
+      [NetworkType.DAILYNET]: 'https://dailynet.tezblock.io',
       [NetworkType.DELPHINET]: 'https://delphinet.tezblock.io',
       [NetworkType.EDONET]: 'https://edonet.tezblock.io',
       [NetworkType.FLORENCENET]: 'https://florencenet.tezblock.io',
diff --git a/packages/beacon-types/src/types/beacon/NetworkType.ts b/packages/beacon-types/src/types/beacon/NetworkType.ts
index a63f3e9bd..cef03a808 100644
--- a/packages/beacon-types/src/types/beacon/NetworkType.ts
+++ b/packages/beacon-types/src/types/beacon/NetworkType.ts
@@ -1,5 +1,8 @@
 export enum NetworkType {
   MAINNET = 'mainnet',
+  GHOSTNET = 'ghostnet', // Long running testnet
+  MONDAYNET = 'mondaynet', // Testnet, resets every monday
+  DAILYNET = 'mondaynet', // Testnet, resets every day
   DELPHINET = 'delphinet',
   EDONET = 'edonet',
   FLORENCENET = 'florencenet',
diff --git a/packages/beacon-types/src/types/ui.ts b/packages/beacon-types/src/types/ui.ts
index 27d6df37b..442e28d24 100644
--- a/packages/beacon-types/src/types/ui.ts
+++ b/packages/beacon-types/src/types/ui.ts
@@ -16,6 +16,9 @@ export interface ExtensionApp extends AppBase {
 export interface WebApp extends AppBase {
   links: {
     [NetworkType.MAINNET]: string
+    [NetworkType.GHOSTNET]?: string
+    [NetworkType.MONDAYNET]?: string
+    [NetworkType.DAILYNET]?: string
     [NetworkType.DELPHINET]?: string
     [NetworkType.EDONET]?: string
     [NetworkType.FLORENCENET]?: string
diff --git a/scripts/blockchains/tezos-sapling.ts b/scripts/blockchains/tezos-sapling.ts
index db31ee4d3..b38748f03 100644
--- a/scripts/blockchains/tezos-sapling.ts
+++ b/scripts/blockchains/tezos-sapling.ts
@@ -3,6 +3,9 @@ import { App, DesktopApp, ExtensionApp, WebApp } from 'packages/beacon-types/src
 // TODO: Temporary build fix
 export enum NetworkType {
   MAINNET = 'mainnet',
+  GHOSTNET = 'ghostnet', // Long running testnet
+  MONDAYNET = 'mondaynet', // Testnet, resets every monday
+  DAILYNET = 'mondaynet', // Testnet, resets every day
   DELPHINET = 'delphinet',
   EDONET = 'edonet',
   FLORENCENET = 'florencenet',
diff --git a/scripts/blockchains/tezos.ts b/scripts/blockchains/tezos.ts
index 6674cf825..4eb6953c6 100644
--- a/scripts/blockchains/tezos.ts
+++ b/scripts/blockchains/tezos.ts
@@ -3,6 +3,9 @@ import { App, DesktopApp, ExtensionApp, WebApp } from 'packages/beacon-types/src
 // TODO: Temporary build fix
 export enum NetworkType {
   MAINNET = 'mainnet',
+  GHOSTNET = 'ghostnet', // Long running testnet
+  MONDAYNET = 'mondaynet', // Testnet, resets every monday
+  DAILYNET = 'mondaynet', // Testnet, resets every day
   DELPHINET = 'delphinet',
   EDONET = 'edonet',
   FLORENCENET = 'florencenet',
@@ -43,6 +46,9 @@ export const tezosWebList: WebApp[] = [
     logo: 'web-kukai.png',
     links: {
       [NetworkType.MAINNET]: 'https://wallet.kukai.app',
+      [NetworkType.GHOSTNET]: 'https://ghostnet.kukai.app',
+      [NetworkType.MONDAYNET]: 'https://mondaynet.kukai.app',
+      [NetworkType.DAILYNET]: 'https://dailynet.kukai.app',
       [NetworkType.DELPHINET]: 'https://testnet.kukai.app',
       [NetworkType.EDONET]: 'https://edonet.kukai.app',
       [NetworkType.FLORENCENET]: 'https://florencenet.kukai.app',

From cabfe879c1e96d573a5380bdeefc05c3bbd1b1af Mon Sep 17 00:00:00 2001
From: Andreas Gassmann <andreas@andreasgassmann.ch>
Date: Thu, 30 Jun 2022 16:00:48 -0300
Subject: [PATCH 11/11] chore(release): v3.1.2

---
 lerna.json                                    |  2 +-
 .../beacon-blockchain-substrate/package.json  |  6 ++---
 .../package.json                              |  6 ++---
 packages/beacon-blockchain-tezos/package.json |  6 ++---
 packages/beacon-core/package.json             |  6 ++---
 packages/beacon-core/src/constants.ts         |  2 +-
 packages/beacon-dapp/package.json             | 10 ++++-----
 packages/beacon-sdk/package.json              | 22 +++++++++----------
 packages/beacon-transport-matrix/package.json |  6 ++---
 .../beacon-transport-postmessage/package.json |  8 +++----
 packages/beacon-types/package.json            |  2 +-
 packages/beacon-ui/package.json               | 10 ++++-----
 packages/beacon-utils/package.json            |  2 +-
 packages/beacon-wallet/package.json           |  8 +++----
 14 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/lerna.json b/lerna.json
index 38e889639..ba38fc6bf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,4 @@
 {
   "packages": ["packages/*"],
-  "version": "3.1.1"
+  "version": "3.1.2"
 }
diff --git a/packages/beacon-blockchain-substrate/package.json b/packages/beacon-blockchain-substrate/package.json
index 13bae442a..e51bcc428 100644
--- a/packages/beacon-blockchain-substrate/package.json
+++ b/packages/beacon-blockchain-substrate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-blockchain-substrate",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -34,7 +34,7 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-types": "^3.1.1",
-    "@airgap/beacon-ui": "^3.1.1"
+    "@airgap/beacon-types": "^3.1.2",
+    "@airgap/beacon-ui": "^3.1.2"
   }
 }
diff --git a/packages/beacon-blockchain-tezos-sapling/package.json b/packages/beacon-blockchain-tezos-sapling/package.json
index 8adbc6d31..9a11ea83b 100644
--- a/packages/beacon-blockchain-tezos-sapling/package.json
+++ b/packages/beacon-blockchain-tezos-sapling/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-blockchain-tezos-sapling",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -34,7 +34,7 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-types": "^3.1.1",
-    "@airgap/beacon-ui": "^3.1.1"
+    "@airgap/beacon-types": "^3.1.2",
+    "@airgap/beacon-ui": "^3.1.2"
   }
 }
diff --git a/packages/beacon-blockchain-tezos/package.json b/packages/beacon-blockchain-tezos/package.json
index 01c5f9f5b..964d0d93a 100644
--- a/packages/beacon-blockchain-tezos/package.json
+++ b/packages/beacon-blockchain-tezos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-blockchain-tezos",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -34,7 +34,7 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-types": "^3.1.1",
-    "@airgap/beacon-ui": "^3.1.1"
+    "@airgap/beacon-types": "^3.1.2",
+    "@airgap/beacon-ui": "^3.1.2"
   }
 }
diff --git a/packages/beacon-core/package.json b/packages/beacon-core/package.json
index 7236b0425..3fa5c6b46 100644
--- a/packages/beacon-core/package.json
+++ b/packages/beacon-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-core",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -34,8 +34,8 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-types": "^3.1.1",
-    "@airgap/beacon-utils": "^3.1.1",
+    "@airgap/beacon-types": "^3.1.2",
+    "@airgap/beacon-utils": "^3.1.2",
     "@types/libsodium-wrappers": "0.7.9",
     "bs58check": "2.1.2",
     "libsodium-wrappers": "0.7.9"
diff --git a/packages/beacon-core/src/constants.ts b/packages/beacon-core/src/constants.ts
index ab9e85363..ed76d92fd 100644
--- a/packages/beacon-core/src/constants.ts
+++ b/packages/beacon-core/src/constants.ts
@@ -1,2 +1,2 @@
-export const SDK_VERSION: string = '3.1.1'
+export const SDK_VERSION: string = '3.1.2'
 export const BEACON_VERSION: string = '3'
diff --git a/packages/beacon-dapp/package.json b/packages/beacon-dapp/package.json
index 372dd8707..92c5d2ddd 100644
--- a/packages/beacon-dapp/package.json
+++ b/packages/beacon-dapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-dapp",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -35,10 +35,10 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "^3.1.1",
-    "@airgap/beacon-transport-matrix": "^3.1.1",
-    "@airgap/beacon-transport-postmessage": "^3.1.1",
-    "@airgap/beacon-ui": "^3.1.1",
+    "@airgap/beacon-core": "^3.1.2",
+    "@airgap/beacon-transport-matrix": "^3.1.2",
+    "@airgap/beacon-transport-postmessage": "^3.1.2",
+    "@airgap/beacon-ui": "^3.1.2",
     "qrcode-generator": "1.4.4"
   }
 }
diff --git a/packages/beacon-sdk/package.json b/packages/beacon-sdk/package.json
index 713bbb1d8..6664d5420 100644
--- a/packages/beacon-sdk/package.json
+++ b/packages/beacon-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-sdk",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -35,15 +35,15 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-blockchain-substrate": "^3.1.1",
-    "@airgap/beacon-blockchain-tezos": "^3.1.1",
-    "@airgap/beacon-core": "^3.1.1",
-    "@airgap/beacon-dapp": "^3.1.1",
-    "@airgap/beacon-transport-matrix": "^3.1.1",
-    "@airgap/beacon-transport-postmessage": "^3.1.1",
-    "@airgap/beacon-types": "^3.1.1",
-    "@airgap/beacon-ui": "^3.1.1",
-    "@airgap/beacon-utils": "^3.1.1",
-    "@airgap/beacon-wallet": "^3.1.1"
+    "@airgap/beacon-blockchain-substrate": "^3.1.2",
+    "@airgap/beacon-blockchain-tezos": "^3.1.2",
+    "@airgap/beacon-core": "^3.1.2",
+    "@airgap/beacon-dapp": "^3.1.2",
+    "@airgap/beacon-transport-matrix": "^3.1.2",
+    "@airgap/beacon-transport-postmessage": "^3.1.2",
+    "@airgap/beacon-types": "^3.1.2",
+    "@airgap/beacon-ui": "^3.1.2",
+    "@airgap/beacon-utils": "^3.1.2",
+    "@airgap/beacon-wallet": "^3.1.2"
   }
 }
diff --git a/packages/beacon-transport-matrix/package.json b/packages/beacon-transport-matrix/package.json
index 09871740f..98ddc896e 100644
--- a/packages/beacon-transport-matrix/package.json
+++ b/packages/beacon-transport-matrix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-transport-matrix",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -34,8 +34,8 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "^3.1.1",
-    "@airgap/beacon-utils": "^3.1.1",
+    "@airgap/beacon-core": "^3.1.2",
+    "@airgap/beacon-utils": "^3.1.2",
     "axios": "0.24.0"
   }
 }
diff --git a/packages/beacon-transport-postmessage/package.json b/packages/beacon-transport-postmessage/package.json
index dd5c68d65..e1a78144c 100644
--- a/packages/beacon-transport-postmessage/package.json
+++ b/packages/beacon-transport-postmessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-transport-postmessage",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -34,9 +34,9 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "^3.1.1",
-    "@airgap/beacon-types": "^3.1.1",
-    "@airgap/beacon-utils": "^3.1.1",
+    "@airgap/beacon-core": "^3.1.2",
+    "@airgap/beacon-types": "^3.1.2",
+    "@airgap/beacon-utils": "^3.1.2",
     "@types/libsodium-wrappers": "0.7.9",
     "libsodium-wrappers": "0.7.9"
   }
diff --git a/packages/beacon-types/package.json b/packages/beacon-types/package.json
index c66c2ab60..af15c4fad 100644
--- a/packages/beacon-types/package.json
+++ b/packages/beacon-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-types",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
diff --git a/packages/beacon-ui/package.json b/packages/beacon-ui/package.json
index e82c81e0a..b30ecd1b5 100644
--- a/packages/beacon-ui/package.json
+++ b/packages/beacon-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-ui",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -34,9 +34,9 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "^3.1.1",
-    "@airgap/beacon-transport-postmessage": "^3.1.1",
-    "@airgap/beacon-types": "^3.1.1",
-    "@airgap/beacon-utils": "^3.1.1"
+    "@airgap/beacon-core": "^3.1.2",
+    "@airgap/beacon-transport-postmessage": "^3.1.2",
+    "@airgap/beacon-types": "^3.1.2",
+    "@airgap/beacon-utils": "^3.1.2"
   }
 }
diff --git a/packages/beacon-utils/package.json b/packages/beacon-utils/package.json
index bcf6e426c..d456db670 100644
--- a/packages/beacon-utils/package.json
+++ b/packages/beacon-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-utils",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
diff --git a/packages/beacon-wallet/package.json b/packages/beacon-wallet/package.json
index 37ea7775c..7dda9ae44 100644
--- a/packages/beacon-wallet/package.json
+++ b/packages/beacon-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-wallet",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -35,8 +35,8 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "^3.1.1",
-    "@airgap/beacon-transport-matrix": "^3.1.1",
-    "@airgap/beacon-transport-postmessage": "^3.1.1"
+    "@airgap/beacon-core": "^3.1.2",
+    "@airgap/beacon-transport-matrix": "^3.1.2",
+    "@airgap/beacon-transport-postmessage": "^3.1.2"
   }
 }