Merge pull request #754 from airgap-it/develop

Develop

lerna.json

@@ -1,4 +1,4 @@
 {
-  "version": "4.2.0",
+  "version": "4.2.1",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

packages/beacon-blockchain-substrate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-blockchain-substrate",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "This package adds support for `substrate` based blockchains. It can be used in combination with the `@airgap/beacon-dapp` or `@airgap/beacon-wallet` packages.",
   "author": "Andreas Gassmann <[email protected]>",
   "homepage": "https://walletbeacon.io",
@@ -34,7 +34,7 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-types": "4.2.0",
-    "@airgap/beacon-ui": "4.2.0"
+    "@airgap/beacon-types": "4.2.1",
+    "@airgap/beacon-ui": "4.2.1"
   }
 }

packages/beacon-blockchain-tezos-sapling/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-blockchain-tezos-sapling",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "This package adds support for `tezos-sapling`, the sapling integration on the Tezos blockchain. It can be used in combination with the `@airgap/beacon-dapp` or `@airgap/beacon-wallet` packages.",
   "author": "Andreas Gassmann <[email protected]>",
   "homepage": "https://walletbeacon.io",
@@ -34,7 +34,7 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-types": "4.2.0",
-    "@airgap/beacon-ui": "4.2.0"
+    "@airgap/beacon-types": "4.2.1",
+    "@airgap/beacon-ui": "4.2.1"
   }
 }

packages/beacon-blockchain-tezos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-blockchain-tezos",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "This package adds support for the `tezos` blockchain. It can be used in combination with the `@airgap/beacon-dapp` or `@airgap/beacon-wallet` packages.",
   "author": "Andreas Gassmann <[email protected]>",
   "homepage": "https://walletbeacon.io",
@@ -34,7 +34,7 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-types": "4.2.0",
-    "@airgap/beacon-ui": "4.2.0"
+    "@airgap/beacon-types": "4.2.1",
+    "@airgap/beacon-ui": "4.2.1"
   }
 }

packages/beacon-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-core",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "This package contains internal methods that are used by both the dApp and wallet client.",
   "author": "Andreas Gassmann <[email protected]>",
   "homepage": "https://walletbeacon.io",
@@ -34,8 +34,8 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-types": "4.2.0",
-    "@airgap/beacon-utils": "4.2.0",
+    "@airgap/beacon-types": "4.2.1",
+    "@airgap/beacon-utils": "4.2.1",
     "@stablelib/ed25519": "^1.0.3",
     "@stablelib/nacl": "^1.0.4",
     "@stablelib/utf8": "^1.0.1",

packages/beacon-core/src/constants.ts

@@ -1,4 +1,4 @@
-export const SDK_VERSION: string = '4.2.0'
+export const SDK_VERSION: string = '4.2.1'
 export const BEACON_VERSION: string = '3'
 
 export const NOTIFICATION_ORACLE_URL: string =

packages/beacon-dapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-dapp",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Use this package on your dApp to instanciate a DAppClient object and communicate to wallets.",
   "author": "Andreas Gassmann <[email protected]>",
   "homepage": "https://walletbeacon.io",
@@ -35,10 +35,10 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "4.2.0",
-    "@airgap/beacon-transport-matrix": "4.2.0",
-    "@airgap/beacon-transport-postmessage": "4.2.0",
-    "@airgap/beacon-transport-walletconnect": "4.2.0",
-    "@airgap/beacon-ui": "4.2.0"
+    "@airgap/beacon-core": "4.2.1",
+    "@airgap/beacon-transport-matrix": "4.2.1",
+    "@airgap/beacon-transport-postmessage": "4.2.1",
+    "@airgap/beacon-transport-walletconnect": "4.2.1",
+    "@airgap/beacon-ui": "4.2.1"
   }
 }

packages/beacon-dapp/src/dapp-client/DAppClient.ts

@@ -69,7 +69,8 @@ import {
   SimulatedProofOfEventChallengeRequestInput,
   SimulatedProofOfEventChallengeRequest,
   SimulatedProofOfEventChallengeResponse,
-  RequestSimulatedProofOfEventChallengeInput
+  RequestSimulatedProofOfEventChallengeInput,
+  TransportStatus
   // PermissionRequestV3
   // RequestEncryptPayloadInput,
   // EncryptPayloadResponseOutput,
@@ -1341,7 +1342,6 @@ export class DAppClient extends Client {
     logger.log('requestPermissions', JSON.stringify(accountInfo))
 
     await this.accountManager.addAccount(accountInfo)
-    await this.setActiveAccount(accountInfo)
 
     const output: PermissionResponseOutput = {
       ...message,
@@ -2328,12 +2328,23 @@ export class DAppClient extends Client {
   }
 
   public async disconnect() {
+    if (!this._transport.isResolved()) {
+      throw new Error('No transport available.')
+    }
+
+    const transport = await this.transport
+
+    if (transport.connectionStatus === TransportStatus.NOT_CONNECTED) {
+      throw new Error('Not connected.')
+    }
+
     await this.createStateSnapshot()
     this.sendMetrics('performance-metrics/save', await this.buildPayload('disconnect', 'start'))
     this.postMessageTransport = undefined
     this.p2pTransport = undefined
     this.walletConnectTransport = undefined
-    await Promise.all([this.clearActiveAccount(), (await this.transport).disconnect()])
+    await this.clearActiveAccount()
+    await transport.disconnect()
     this.sendMetrics('performance-metrics/save', await this.buildPayload('disconnect', 'success'))
   }
 

packages/beacon-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-sdk",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "The `beacon-sdk` simplifies and abstracts the communication between dApps and wallets over different transport layers.",
   "author": "Andreas Gassmann <[email protected]>",
   "homepage": "https://walletbeacon.io",
@@ -35,15 +35,15 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-blockchain-substrate": "4.2.0",
-    "@airgap/beacon-blockchain-tezos": "4.2.0",
-    "@airgap/beacon-core": "4.2.0",
-    "@airgap/beacon-dapp": "4.2.0",
-    "@airgap/beacon-transport-matrix": "4.2.0",
-    "@airgap/beacon-transport-postmessage": "4.2.0",
-    "@airgap/beacon-types": "4.2.0",
-    "@airgap/beacon-ui": "4.2.0",
-    "@airgap/beacon-utils": "4.2.0",
-    "@airgap/beacon-wallet": "4.2.0"
+    "@airgap/beacon-blockchain-substrate": "4.2.1",
+    "@airgap/beacon-blockchain-tezos": "4.2.1",
+    "@airgap/beacon-core": "4.2.1",
+    "@airgap/beacon-dapp": "4.2.1",
+    "@airgap/beacon-transport-matrix": "4.2.1",
+    "@airgap/beacon-transport-postmessage": "4.2.1",
+    "@airgap/beacon-types": "4.2.1",
+    "@airgap/beacon-ui": "4.2.1",
+    "@airgap/beacon-utils": "4.2.1",
+    "@airgap/beacon-wallet": "4.2.1"
   }
 }

packages/beacon-transport-matrix/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-transport-matrix",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "This package contains methods to facilitate communication over the Beacon network, a decentralised P2P network that is based on the matrix protocol.",
   "author": "Andreas Gassmann <[email protected]>",
   "homepage": "https://walletbeacon.io",
@@ -34,8 +34,8 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "4.2.0",
-    "@airgap/beacon-utils": "4.2.0",
+    "@airgap/beacon-core": "4.2.1",
+    "@airgap/beacon-utils": "4.2.1",
     "axios": "^1.6.2"
   }
 }