Skip to content

Commit

Permalink
Merge pull request #847 from airgap-it/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
jsamol authored Jan 23, 2025
2 parents 8a30699 + 605a266 commit b7f3771
Show file tree
Hide file tree
Showing 26 changed files with 225 additions and 155 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.205.2/containers/typescript-node/.devcontainer/base.Dockerfile

# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
ARG VARIANT="16-bullseye"
ARG VARIANT="18-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}

# [Optional] Uncomment this section to install additional OS packages.
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// Append -bullseye or -buster to pin to an OS version.
// Use -bullseye variants on local on arm64/Apple Silicon.
"args": {
"VARIANT": "16-bullseye"
"VARIANT": "18-bullseye"
}
},

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16
FROM node:18

RUN apt-get update && apt-get install -yq git python build-essential

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "4.3.2",
"version": "4.3.3",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
104 changes: 52 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"engines": {
"npm": ">=7.0.0",
"node": ">=16.0.0"
"node": ">=18.0.0"
},
"scripts": {
"prebuild": "ts-node --project tsconfig-cjs.json scripts/generate-wallet-list.ts",
Expand Down
6 changes: 3 additions & 3 deletions packages/beacon-blockchain-substrate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@airgap/beacon-blockchain-substrate",
"version": "4.3.2",
"version": "4.3.3",
"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",
Expand Down Expand Up @@ -34,7 +34,7 @@
"url": "https://github.com/airgap-it/beacon-sdk/issues"
},
"dependencies": {
"@airgap/beacon-types": "4.3.2",
"@airgap/beacon-ui": "4.3.2"
"@airgap/beacon-types": "4.3.3",
"@airgap/beacon-ui": "4.3.3"
}
}
6 changes: 3 additions & 3 deletions packages/beacon-blockchain-tezos-sapling/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@airgap/beacon-blockchain-tezos-sapling",
"version": "4.3.2",
"version": "4.3.3",
"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",
Expand Down Expand Up @@ -34,7 +34,7 @@
"url": "https://github.com/airgap-it/beacon-sdk/issues"
},
"dependencies": {
"@airgap/beacon-types": "4.3.2",
"@airgap/beacon-ui": "4.3.2"
"@airgap/beacon-types": "4.3.3",
"@airgap/beacon-ui": "4.3.3"
}
}
6 changes: 3 additions & 3 deletions packages/beacon-blockchain-tezos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@airgap/beacon-blockchain-tezos",
"version": "4.3.2",
"version": "4.3.3",
"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",
Expand Down Expand Up @@ -34,7 +34,7 @@
"url": "https://github.com/airgap-it/beacon-sdk/issues"
},
"dependencies": {
"@airgap/beacon-types": "4.3.2",
"@airgap/beacon-ui": "4.3.2"
"@airgap/beacon-types": "4.3.3",
"@airgap/beacon-ui": "4.3.3"
}
}
6 changes: 3 additions & 3 deletions packages/beacon-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@airgap/beacon-core",
"version": "4.3.2",
"version": "4.3.3",
"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",
Expand Down Expand Up @@ -34,8 +34,8 @@
"url": "https://github.com/airgap-it/beacon-sdk/issues"
},
"dependencies": {
"@airgap/beacon-types": "4.3.2",
"@airgap/beacon-utils": "4.3.2",
"@airgap/beacon-types": "4.3.3",
"@airgap/beacon-utils": "4.3.3",
"@stablelib/ed25519": "^1.0.3",
"@stablelib/nacl": "^1.0.4",
"@stablelib/utf8": "^1.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export abstract class BeaconClient {
/**
* This method initializes the SDK by setting some values in the storage and generating a keypair.
*/
private async initSDK(): Promise<void> {
protected async initSDK(): Promise<void> {
this.storage.set(StorageKey.BEACON_SDK_VERSION, SDK_VERSION).catch(console.error)

this.loadOrCreateBeaconSecret().catch(console.error)
Expand Down
2 changes: 1 addition & 1 deletion packages/beacon-core/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const SDK_VERSION: string = '4.3.2'
export const SDK_VERSION: string = '4.3.3'
export const BEACON_VERSION: string = '3'

export const NOTIFICATION_ORACLE_URL: string =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ClientEvents } from './ClientEvents'
*
*/
export abstract class CommunicationClient {
constructor(protected readonly keyPair?: KeyPair) {}
constructor(protected keyPair?: KeyPair) {}

public eventHandlers: Map<ClientEvents, Function> = new Map()

Expand Down
12 changes: 6 additions & 6 deletions packages/beacon-dapp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@airgap/beacon-dapp",
"version": "4.3.2",
"version": "4.3.3",
"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",
Expand Down Expand Up @@ -35,11 +35,11 @@
"url": "https://github.com/airgap-it/beacon-sdk/issues"
},
"dependencies": {
"@airgap/beacon-core": "4.3.2",
"@airgap/beacon-transport-matrix": "4.3.2",
"@airgap/beacon-transport-postmessage": "4.3.2",
"@airgap/beacon-transport-walletconnect": "4.3.2",
"@airgap/beacon-ui": "4.3.2",
"@airgap/beacon-core": "4.3.3",
"@airgap/beacon-transport-matrix": "4.3.3",
"@airgap/beacon-transport-postmessage": "4.3.3",
"@airgap/beacon-transport-walletconnect": "4.3.3",
"@airgap/beacon-ui": "4.3.3",
"broadcast-channel": "^7.0.0"
}
}
Loading

0 comments on commit b7f3771

Please sign in to comment.