Merge pull request #472 from airgap-it/develop

Develop
airgap-it · Apr 21, 2023 · 70952b2 · 70952b2
2 parents efdc503 + 0503ff4
commit 70952b2
Show file tree

Hide file tree

Showing 27 changed files with 757 additions and 387 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
   "useWorkspaces": true,
-  "version": "4.0.0"
+  "version": "4.0.1"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -72,9 +72,9 @@
     "@airgap/beacon-ui": "file:packages/beacon-ui",
     "@airgap/beacon-utils": "file:packages/beacon-utils",
     "@airgap/beacon-wallet": "file:packages/beacon-wallet",
-    "@walletconnect/sign-client": "2.4.6",
-    "@walletconnect/types": "^2.0.0-rc.4",
-    "@walletconnect/utils": "^2.0.0-rc.4",
+    "@walletconnect/sign-client": "2.7.0",
+    "@walletconnect/types": "2.7.0",
+    "@walletconnect/utils": "2.7.0",
     "@web3modal/standalone": "2.0.0",
     "stream-browserify": "^3.0.0"
   },

diff --git a/packages/beacon-blockchain-substrate/package.json b/packages/beacon-blockchain-substrate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-blockchain-substrate",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "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": "4.0.0",
-    "@airgap/beacon-ui": "4.0.0"
+    "@airgap/beacon-types": "4.0.1",
+    "@airgap/beacon-ui": "4.0.1"
   }
 }
diff --git 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": "4.0.0",
+  "version": "4.0.1",
   "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": "4.0.0",
-    "@airgap/beacon-ui": "4.0.0"
+    "@airgap/beacon-types": "4.0.1",
+    "@airgap/beacon-ui": "4.0.1"
   }
 }
diff --git a/packages/beacon-blockchain-tezos/package.json b/packages/beacon-blockchain-tezos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-blockchain-tezos",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "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": "4.0.0",
-    "@airgap/beacon-ui": "4.0.0"
+    "@airgap/beacon-types": "4.0.1",
+    "@airgap/beacon-ui": "4.0.1"
   }
 }
diff --git a/packages/beacon-core/package.json b/packages/beacon-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-core",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "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": "4.0.0",
-    "@airgap/beacon-utils": "4.0.0",
+    "@airgap/beacon-types": "4.0.1",
+    "@airgap/beacon-utils": "4.0.1",
     "@stablelib/ed25519": "^1.0.3",
     "@stablelib/nacl": "^1.0.4",
     "@stablelib/utf8": "^1.0.1",

diff --git a/packages/beacon-core/src/constants.ts b/packages/beacon-core/src/constants.ts
@@ -1,4 +1,4 @@
-export const SDK_VERSION: string = '4.0.0'
+export const SDK_VERSION: string = '4.0.1'
 export const BEACON_VERSION: string = '3'
 
 export const NOTIFICATION_ORACLE_URL: string =

diff --git a/packages/beacon-dapp/package.json b/packages/beacon-dapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-dapp",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -35,11 +35,10 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "4.0.0",
-    "@airgap/beacon-transport-matrix": "4.0.0",
-    "@airgap/beacon-transport-postmessage": "4.0.0",
-    "@airgap/beacon-transport-walletconnect": "4.0.0",
-    "@airgap/beacon-ui": "file:../beacon-ui",
-    "qrcode-generator": "1.4.4"
+    "@airgap/beacon-core": "4.0.1",
+    "@airgap/beacon-transport-matrix": "4.0.1",
+    "@airgap/beacon-transport-postmessage": "4.0.1",
+    "@airgap/beacon-transport-walletconnect": "4.0.1",
+    "@airgap/beacon-ui": "4.0.1"
   }
 }
diff --git a/packages/beacon-dapp/src/utils/tzkt-blockexplorer.ts b/packages/beacon-dapp/src/utils/tzkt-blockexplorer.ts
@@ -18,7 +18,8 @@ export class TzktBlockExplorer extends BlockExplorer {
       [NetworkType.KATHMANDUNET]: 'https://kathmandunet.tzkt.io',
       [NetworkType.LIMANET]: 'https://limanet.tzkt.io',
       [NetworkType.MUMBAINET]: 'https://mumbainet.tzkt.io',
-      [NetworkType.CUSTOM]: 'https://mumbainet.tzkt.io'
+      [NetworkType.NAIROBINET]: 'https://nairobinet.tzkt.io',
+      [NetworkType.CUSTOM]: 'https://nairobinet.tzkt.io'
     }
   ) {
     super(rpcUrls)

diff --git a/packages/beacon-sdk/package.json b/packages/beacon-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-sdk",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "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": "4.0.0",
-    "@airgap/beacon-blockchain-tezos": "4.0.0",
-    "@airgap/beacon-core": "4.0.0",
-    "@airgap/beacon-dapp": "4.0.0",
-    "@airgap/beacon-transport-matrix": "4.0.0",
-    "@airgap/beacon-transport-postmessage": "4.0.0",
-    "@airgap/beacon-types": "4.0.0",
-    "@airgap/beacon-ui": "4.0.0",
-    "@airgap/beacon-utils": "4.0.0",
-    "@airgap/beacon-wallet": "4.0.0"
+    "@airgap/beacon-blockchain-substrate": "4.0.1",
+    "@airgap/beacon-blockchain-tezos": "4.0.1",
+    "@airgap/beacon-core": "4.0.1",
+    "@airgap/beacon-dapp": "4.0.1",
+    "@airgap/beacon-transport-matrix": "4.0.1",
+    "@airgap/beacon-transport-postmessage": "4.0.1",
+    "@airgap/beacon-types": "4.0.1",
+    "@airgap/beacon-ui": "4.0.1",
+    "@airgap/beacon-utils": "4.0.1",
+    "@airgap/beacon-wallet": "4.0.1"
   }
 }
diff --git a/packages/beacon-transport-matrix/package.json b/packages/beacon-transport-matrix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-transport-matrix",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "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": "4.0.0",
-    "@airgap/beacon-utils": "4.0.0",
+    "@airgap/beacon-core": "4.0.1",
+    "@airgap/beacon-utils": "4.0.1",
     "axios": "0.24.0"
   }
 }
diff --git a/packages/beacon-transport-postmessage/package.json b/packages/beacon-transport-postmessage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-transport-postmessage",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "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": "4.0.0",
-    "@airgap/beacon-types": "4.0.0",
-    "@airgap/beacon-utils": "4.0.0"
+    "@airgap/beacon-core": "4.0.1",
+    "@airgap/beacon-types": "4.0.1",
+    "@airgap/beacon-utils": "4.0.1"
   }
 }
diff --git a/packages/beacon-transport-walletconnect/package.json b/packages/beacon-transport-walletconnect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-transport-walletconnect",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "Beacon WalletConnect",
   "author": "Papers AG",
   "homepage": "https://walletbeacon.io",
@@ -34,9 +34,9 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "4.0.0",
-    "@airgap/beacon-types": "4.0.0",
-    "@airgap/beacon-utils": "4.0.0",
+    "@airgap/beacon-core": "4.0.1",
+    "@airgap/beacon-types": "4.0.1",
+    "@airgap/beacon-utils": "4.0.1",
     "@walletconnect/sign-client": "2.4.6"
   }
 }
diff --git a/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts b/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts
@@ -172,6 +172,10 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
       throw new Error('No account shared by wallet')
     }
 
+    if (result.some((account) => !account.pubkey)) {
+      throw new Error('Public Key in `tezos_getAccounts` is empty!')
+    }
+
     const serializer = new Serializer()
     const serialized = await serializer.serialize({
       type: BeaconMessageType.PermissionResponse,

diff --git a/packages/beacon-transport-walletconnect/tsconfig.json b/packages/beacon-transport-walletconnect/tsconfig.json
@@ -6,8 +6,6 @@
     "paths": {
       "@airgap/beacon-transport-walletconnect": ["./src"]
     }
-    // "lib": ["esnext", "dom"], // TODO JGD remove?
-    // "module": "esnext"
   },
   "include": ["./src"]
 }
diff --git a/packages/beacon-types/package.json b/packages/beacon-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-types",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",

diff --git a/packages/beacon-types/src/types/beacon/NetworkType.ts b/packages/beacon-types/src/types/beacon/NetworkType.ts
@@ -13,5 +13,6 @@ export enum NetworkType {
   KATHMANDUNET = 'kathmandunet',
   LIMANET = 'limanet',
   MUMBAINET = 'mumbainet',
+  NAIROBINET = 'nairobinet',
   CUSTOM = 'custom'
 }
diff --git a/packages/beacon-types/src/types/ui.ts b/packages/beacon-types/src/types/ui.ts
@@ -29,6 +29,7 @@ export interface WebApp extends AppBase {
     [NetworkType.KATHMANDUNET]?: string
     [NetworkType.LIMANET]?: string
     [NetworkType.MUMBAINET]?: string
+    [NetworkType.NAIROBINET]?: string
     [NetworkType.CUSTOM]?: string
   }
 }

diff --git a/packages/beacon-ui/package.json b/packages/beacon-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-ui",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -34,10 +34,10 @@
     "url": "https://github.com/airgap-it/beacon-sdk/issues"
   },
   "dependencies": {
-    "@airgap/beacon-core": "4.0.0",
-    "@airgap/beacon-transport-postmessage": "4.0.0",
-    "@airgap/beacon-types": "4.0.0",
-    "@airgap/beacon-utils": "4.0.0",
+    "@airgap/beacon-core": "4.0.1",
+    "@airgap/beacon-transport-postmessage": "4.0.1",
+    "@airgap/beacon-types": "4.0.1",
+    "@airgap/beacon-utils": "4.0.1",
     "qrcode-svg": "^1.1.0",
     "solid-js": "^1.6.6"
   },

diff --git a/packages/beacon-ui/src/ui/alert/index.tsx b/packages/beacon-ui/src/ui/alert/index.tsx
@@ -207,6 +207,12 @@ const openAlert = async (config: AlertConfig): Promise<string> => {
     style7.textContent = loaderStyles.default
     shadowRoot.appendChild(style7)
 
+    // Inject font styles
+    const styleFonts = document.createElement('style')
+    styleFonts.textContent =
+      "* { font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', sans-serif;}"
+    shadowRoot.appendChild(styleFonts)
+
     const wallets: Wallet[] = [
       ...desktopList.map((wallet) => {
         return {
@@ -245,14 +251,15 @@ const openAlert = async (config: AlertConfig): Promise<string> => {
         }
       }),
       ...webList.map((wallet) => {
+        const link = wallet.links[config.pairingPayload?.preferredNetwork ?? NetworkType.MAINNET]
         return {
           id: wallet.key,
           key: wallet.key,
           name: wallet.shortName,
           image: wallet.logo,
           description: 'Web App',
           type: 'web',
-          link: wallet.links.mainnet
+          link: link ?? wallet.links.mainnet
         }
       })
     ]

diff --git a/packages/beacon-ui/src/ui/toast/index.tsx b/packages/beacon-ui/src/ui/toast/index.tsx
@@ -52,6 +52,12 @@ const createToast = (config: ToastConfig) => {
   style2.textContent = loaderStyles.default
   shadowRoot.appendChild(style2)
 
+  // Inject font styles
+  const styleFonts = document.createElement('style')
+  styleFonts.textContent =
+    "* { font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', sans-serif;}"
+  shadowRoot.appendChild(styleFonts)
+
   dispose = render(
     () => (
       <Toast
@@ -110,7 +116,7 @@ const openToast = async (config: ToastConfig): Promise<void> => {
     console.log('DO NOT RUN ON SERVER')
     return
   }
-  
+
   const id = await generateGUID()
   setRenderLast(id)
 

diff --git a/packages/beacon-ui/tsconfig.json b/packages/beacon-ui/tsconfig.json
@@ -2,12 +2,11 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist/esm",
-    "strict": true,
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
+    // "target": "ESNext",
+    // "module": "ESNext",
+    // "moduleResolution": "node",
+    // "allowSyntheticDefaultImports": true,
+    // "esModuleInterop": true,
     "jsx": "preserve",
     "jsxImportSource": "solid-js",
     "types": ["vite/client", "node"],

diff --git a/packages/beacon-utils/package.json b/packages/beacon-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@airgap/beacon-utils",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "> TODO: description",
   "author": "Andreas Gassmann <a.gassmann@papers.ch>",
   "homepage": "https://walletbeacon.io",
@@ -38,8 +38,6 @@
     "@stablelib/nacl": "^1.0.3",
     "@stablelib/random": "^1.0.2",
     "@stablelib/utf8": "^1.0.1",
-    "@types/libsodium-wrappers": "0.7.9",
-    "bs58check": "2.1.2",
-    "libsodium-wrappers": "0.7.9"
+    "bs58check": "2.1.2"
   }
 }