Merge branch 'develop' into 'master'

Develop

See merge request papers/airgap/airgap-vault!499

.gitlab-ci.yml

@@ -89,7 +89,8 @@ build_ios:
  - echo "$IOS_BUILD_JSON" > build.json
  script:
  - export DEVELOPER_DIR=$XCODE_PATH
- - nvm use 16.19.1
+ - nvm use 20
+ - npm install -g yarn
  - yarn install --frozen-lockfile
  - yarn prepare-prod-build
  - yarn apply-diagnostic-modules # manually remove unused cordova-diagnostic-plugin modules

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.19.1
+FROM node:20
 
 # See https://crbug.com/795759
 RUN apt-get update && apt-get install -yq libgconf-2-4 bzip2 build-essential libxtst6
@@ -7,8 +7,8 @@ RUN apt-get install -yq git
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
 RUN echo "deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty multiverse \
-deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty-updates multiverse \
-deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse" | tee /etc/apt/sources.list.d/multiverse.list
+ deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty-updates multiverse \
+ deb http://us-west-2.ec2.archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse" | tee /etc/apt/sources.list.d/multiverse.list
 
 # Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
 # Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y wget --no-install-recommends \
  && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
  && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
  && apt-get update \
- && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst libglu1 ttf-freefont libxss1 libglib2.0-0 \
+ && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst libglu1 ttf-freefont libxss1 libglib2.0-0 libxshmfence1 libglu1 \
  --no-install-recommends \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get purge --auto-remove -y curl \

angular.json

@@ -96,11 +96,11 @@
  "serve": {
  "builder": "@angular-devkit/build-angular:dev-server",
  "options": {
- "browserTarget": "app:build"
+ "buildTarget": "app:build"
  },
  "configurations": {
  "production": {
- "browserTarget": "app:build:production"
+ "buildTarget": "app:build:production"
  },
  "ci": {
  }
@@ -109,7 +109,7 @@
  "extract-i18n": {
  "builder": "@angular-devkit/build-angular:extract-i18n",
  "options": {
- "browserTarget": "app:build"
+ "buildTarget": "app:build"
  }
  },
  "test": {

build/android/Dockerfile

@@ -1,4 +1,4 @@
-FROM beevelop/ionic:v2021.06.1
+FROM beevelop/ionic:v2023.10.1
 
 RUN apt-get update -y && apt-get install -y \
  bzip2 \
@@ -14,7 +14,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 RUN mkdir /app
 WORKDIR /app
 
-RUN yarn cache clean --force && yarn global add n && n 16.19.1
+RUN yarn cache clean --force && yarn global add n && n 20.13.1
 
 # Install app dependencies, using wildcard if package-lock exists and copy capacitor configs and ionic configs
 COPY package.json yarn.lock apply-diagnostic-modules.js patch-dependency-versions.js fix-qrscanner-gradle.js capacitor.config.ts ionic.config.json copy-builtin-modules.js /app/

package.json

@@ -36,55 +36,57 @@
  "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
  },
  "resolutions": {
- "@airgap/aeternity": "0.13.22",
- "@airgap/astar": "0.13.22",
- "@airgap/bitcoin": "0.13.22",
- "@airgap/coinlib-core": "0.13.22",
- "@airgap/coreum": "0.13.22",
- "@airgap/cosmos": "0.13.22",
- "@airgap/cosmos-core": "0.13.22",
- "@airgap/crypto": "0.13.22",
- "@airgap/ethereum": "0.13.22",
- "@airgap/groestlcoin": "0.13.22",
- "@airgap/icp": "0.13.22",
- "@airgap/module-kit": "0.13.22",
- "@airgap/moonbeam": "0.13.22",
- "@airgap/optimism": "0.13.22",
- "@airgap/polkadot": "0.13.22",
- "@airgap/serializer": "0.13.22",
- "@airgap/substrate": "0.13.22",
- "@airgap/tezos": "0.13.22"
+ "@airgap/acurast": "0.13.26",
+ "@airgap/aeternity": "0.13.26",
+ "@airgap/astar": "0.13.26",
+ "@airgap/bitcoin": "0.13.26",
+ "@airgap/coinlib-core": "0.13.26",
+ "@airgap/coreum": "0.13.26",
+ "@airgap/cosmos": "0.13.26",
+ "@airgap/cosmos-core": "0.13.26",
+ "@airgap/crypto": "0.13.26",
+ "@airgap/ethereum": "0.13.26",
+ "@airgap/groestlcoin": "0.13.26",
+ "@airgap/icp": "0.13.26",
+ "@airgap/module-kit": "0.13.26",
+ "@airgap/moonbeam": "0.13.26",
+ "@airgap/optimism": "0.13.26",
+ "@airgap/polkadot": "0.13.26",
+ "@airgap/serializer": "0.13.26",
+ "@airgap/substrate": "0.13.26",
+ "@airgap/tezos": "0.13.26"
  },
  "dependencies": {
- "@airgap/aeternity": "0.13.22",
- "@airgap/angular-core": "0.0.43",
- "@airgap/angular-ngrx": "0.0.43",
- "@airgap/astar": "0.13.22",
- "@airgap/bitcoin": "0.13.22",
- "@airgap/coinlib-core": "0.13.22",
- "@airgap/coreum": "0.13.22",
- "@airgap/cosmos": "0.13.22",
- "@airgap/cosmos-core": "0.13.22",
- "@airgap/crypto": "0.13.22",
- "@airgap/ethereum": "0.13.22",
- "@airgap/groestlcoin": "0.13.22",
- "@airgap/icp": "0.13.22",
- "@airgap/module-kit": "0.13.22",
- "@airgap/moonbeam": "0.13.22",
- "@airgap/optimism": "0.13.22",
- "@airgap/polkadot": "0.13.22",
- "@airgap/sapling-wasm": "0.0.7",
- "@airgap/serializer": "0.13.22",
- "@airgap/substrate": "0.13.22",
- "@airgap/tezos": "0.13.22",
  "@airgap-community/iso-rootstock": "1.0.0",
+ "@airgap/acurast": "0.13.26",
+ "@airgap/aeternity": "0.13.26",
+ "@airgap/angular-core": "0.0.45",
+ "@airgap/angular-ngrx": "0.0.45",
+ "@airgap/astar": "0.13.26",
+ "@airgap/bitcoin": "0.13.26",
+ "@airgap/coinlib-core": "0.13.26",
+ "@airgap/coreum": "0.13.26",
+ "@airgap/cosmos": "0.13.26",
+ "@airgap/cosmos-core": "0.13.26",
+ "@airgap/crypto": "0.13.26",
+ "@airgap/ethereum": "0.13.26",
+ "@airgap/groestlcoin": "0.13.26",
+ "@airgap/icp": "0.13.26",
+ "@airgap/module-kit": "0.13.26",
+ "@airgap/moonbeam": "0.13.26",
+ "@airgap/optimism": "0.13.26",
+ "@airgap/polkadot": "0.13.26",
+ "@airgap/sapling-wasm": "0.0.7",
+ "@airgap/serializer": "0.13.26",
+ "@airgap/substrate": "0.13.26",
+ "@airgap/tezos": "0.13.26",
  "@angular/cdk": "^14.2.7",
- "@angular/common": "16.1.1",
- "@angular/core": "16.1.1",
- "@angular/forms": "16.1.1",
- "@angular/platform-browser": "16.1.1",
- "@angular/platform-browser-dynamic": "16.1.1",
- "@angular/router": "16.1.1",
+ "@angular/common": "17.3.7",
+ "@angular/core": "17.3.7",
+ "@angular/forms": "17.3.7",
+ "@angular/platform-browser": "17.3.7",
+ "@angular/platform-browser-dynamic": "17.3.7",
+ "@angular/router": "17.3.7",
  "@capacitor/android": "^5.0.0",
  "@capacitor/app": "^5.0.0",
  "@capacitor/app-launcher": "^5.0.0",
@@ -102,17 +104,17 @@
  "@ionic-native/core": "5.36.0",
  "@ionic-native/device-motion": "5.36.0",
  "@ionic-native/diagnostic": "5.36.0",
- "@ionic/angular": "^7.0.12",
- "@ionic/core": "^7.0.12",
+ "@ionic/angular": "^7.8.6",
+ "@ionic/core": "^7.8.6",
  "@ionic/storage": "^4.0.0",
  "@ionic/storage-angular": "^4.0.0",
  "@keystonehq/bc-ur-registry": "0.6.3",
  "@keystonehq/bc-ur-registry-eth": "0.19.1",
  "@ngraveio/bc-ur": "1.1.6",
- "@ngrx/component": "^16.0.1",
- "@ngrx/component-store": "^16.0.1",
- "@ngrx/effects": "^16.0.1",
- "@ngrx/store": "^16.0.1",
+ "@ngrx/component": "^17.2.0",
+ "@ngrx/component-store": "^17.2.0",
+ "@ngrx/effects": "^17.2.0",
+ "@ngrx/store": "^17.2.0",
  "@ngx-translate/core": "^15.0.0",
  "@zxing/browser": "0.1.4",
  "@zxing/library": "^0.20.0",
@@ -146,17 +148,17 @@
  "tslib": "^1.10.0",
  "uuid": "^8.3.2",
  "wif": "^2.0.6",
- "zone.js": "~0.13.1"
+ "zone.js": "~0.14.5"
  },
  "devDependencies": {
- "@angular-devkit/architect": "0.1601.0",
- "@angular-devkit/build-angular": "16.1.0",
- "@angular-devkit/core": "16.1.0",
- "@angular-devkit/schematics": "16.1.0",
- "@angular/cli": "16.1.0",
- "@angular/compiler": "16.1.1",
- "@angular/compiler-cli": "16.1.1",
- "@angular/language-service": "16.1.1",
+ "@angular-devkit/architect": "0.1703.6",
+ "@angular-devkit/build-angular": "17.3.6",
+ "@angular-devkit/core": "17.3.6",
+ "@angular-devkit/schematics": "17.3.6",
+ "@angular/cli": "17.3.6",
+ "@angular/compiler": "17.3.7",
+ "@angular/compiler-cli": "17.3.7",
+ "@angular/language-service": "17.3.7",
  "@capacitor/cli": "^5.0.0",
  "@ionic/angular-toolkit": "^9.0.0",
  "@ionic/cli": "^7.1.1",
@@ -169,17 +171,17 @@
  "replace": "1.2.1",
  "sonarqube-scanner": "2.8.1",
  "stream-browserify": "3.0.0",
- "typescript": "4.9.5"
+ "typescript": "5.4.5"
  },
  "buildDependencies": {
- "@angular-devkit/architect": "0.1601.0",
- "@angular-devkit/build-angular": "16.1.0",
- "@angular-devkit/core": "16.1.0",
- "@angular-devkit/schematics": "16.1.0",
- "@angular/cli": "16.1.0",
- "@angular/compiler": "16.1.1",
- "@angular/compiler-cli": "16.1.1",
- "@angular/language-service": "16.1.1",
+ "@angular-devkit/architect": "0.1703.6",
+ "@angular-devkit/build-angular": "17.3.6",
+ "@angular-devkit/core": "17.3.6",
+ "@angular-devkit/schematics": "17.3.6",
+ "@angular/cli": "17.3.6",
+ "@angular/compiler": "17.3.7",
+ "@angular/compiler-cli": "17.3.7",
+ "@angular/language-service": "17.3.7",
  "@capacitor/cli": "^5.0.0",
  "@ionic/angular-toolkit": "^9.0.0",
  "@ionic/cli": "^7.1.1",
@@ -192,7 +194,7 @@
  "replace": "1.2.1",
  "sonarqube-scanner": "2.8.1",
  "stream-browserify": "3.0.0",
- "typescript": "4.9.5"
+ "typescript": "5.4.5"
  },
  "testDependencies": {
  "@types/core-js": "^2.5.0",

src/app/app.component.ts

@@ -1,5 +1,13 @@
 import { AeternityModule } from '@airgap/aeternity'
-import { APP_PLUGIN, createV0TezosShieldedTezProtocol, IACMessageTransport, ICoinProtocolAdapter, ProtocolService, SPLASH_SCREEN_PLUGIN, STATUS_BAR_PLUGIN } from '@airgap/angular-core'
+import {
+ APP_PLUGIN,
+ createV0TezosShieldedTezProtocol,
+ IACMessageTransport,
+ ICoinProtocolAdapter,
+ ProtocolService,
+ SPLASH_SCREEN_PLUGIN,
+ STATUS_BAR_PLUGIN
+} from '@airgap/angular-core'
 import { AstarModule } from '@airgap/astar'
 import { BitcoinModule } from '@airgap/bitcoin'
 import { MainProtocolSymbols } from '@airgap/coinlib-core'
@@ -11,6 +19,7 @@ import { ICPModule } from '@airgap/icp'
 import { MoonbeamModule } from '@airgap/moonbeam'
 import { OptimismModule } from '@airgap/optimism'
 import { PolkadotModule } from '@airgap/polkadot'
+import { AcurastModule } from '@airgap/acurast'
 import { TezosModule, TezosSaplingExternalMethodProvider, TezosShieldedTezProtocol } from '@airgap/tezos'
 import { HttpClient } from '@angular/common/http'
 import { AfterViewInit, Component, Inject, NgZone } from '@angular/core'
@@ -163,6 +172,7 @@ export class AppComponent implements AfterViewInit {
 
  private async initializeProtocols(): Promise<void> {
  this.moduleService.init([
+ new AcurastModule(),
  new BitcoinModule(),
  new EthereumModule(),
  new TezosModule(),
@@ -178,11 +188,12 @@ export class AppComponent implements AfterViewInit {
  ])
  const protocols = await this.moduleService.loadProtocols('offline', [MainProtocolSymbols.XTZ_SHIELDED])
 
- const externalMethodProvider:
- | TezosSaplingExternalMethodProvider
- | undefined = await this.saplingNativeService.createExternalMethodProvider()
+ const externalMethodProvider: TezosSaplingExternalMethodProvider | undefined =
+ await this.saplingNativeService.createExternalMethodProvider()
 
- const shieldedTezAdapter: ICoinProtocolAdapter<TezosShieldedTezProtocol> = await createV0TezosShieldedTezProtocol({ externalProvider: externalMethodProvider })
+ const shieldedTezAdapter: ICoinProtocolAdapter<TezosShieldedTezProtocol> = await createV0TezosShieldedTezProtocol({
+ externalProvider: externalMethodProvider
+ })
 
  this.protocolService.init({
  activeProtocols: protocols.activeProtocols,

src/app/pages/account-add/account-add.page.html

@@ -74,6 +74,19 @@ <h2>
  </ng-container>
  </ion-list>
 
+ <ion-card class="ion-padding" color="primary" (click)="goToIsolatedModule()">
+ <ion-row>
+ <ion-col>
+ <ion-icon style="zoom: 4" src="assets/icons/shapes.svg"></ion-icon>
+ </ion-col>
+ <ion-col size="9">
+ <ion-label class="ion-text-wrap">
+ <h2 style="color: black">{{ 'isolated-module.text' | translate }}</h2>
+ </ion-label>
+ </ion-col>
+ </ion-row>
+ </ion-card>
+
  <ion-fab vertical="bottom" horizontal="end" slot="fixed">
  <ion-button [disabled]="!formValid" color="primary" shape="round" (click)="addWallet()">
  {{ 'wallet-select-coins.create_label' | translate }}