Skip to content

Commit

Permalink
Merge branch 'feat/cacu-i' into 'develop'
Browse files Browse the repository at this point in the history
Feat/cacu i

See merge request papers/airgap/airgap-vault!491
  • Loading branch information
godenzim committed Apr 4, 2024
2 parents 0e4faf0 + 722c8fd commit 194e5de
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 41 deletions.
74 changes: 38 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,47 +36,49 @@
"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-beta.0",
"@airgap/aeternity": "0.13.26-beta.0",
"@airgap/astar": "0.13.26-beta.0",
"@airgap/bitcoin": "0.13.26-beta.0",
"@airgap/coinlib-core": "0.13.26-beta.0",
"@airgap/coreum": "0.13.26-beta.0",
"@airgap/cosmos": "0.13.26-beta.0",
"@airgap/cosmos-core": "0.13.26-beta.0",
"@airgap/crypto": "0.13.26-beta.0",
"@airgap/ethereum": "0.13.26-beta.0",
"@airgap/groestlcoin": "0.13.26-beta.0",
"@airgap/icp": "0.13.26-beta.0",
"@airgap/module-kit": "0.13.26-beta.0",
"@airgap/moonbeam": "0.13.26-beta.0",
"@airgap/optimism": "0.13.26-beta.0",
"@airgap/polkadot": "0.13.26-beta.0",
"@airgap/serializer": "0.13.26-beta.0",
"@airgap/substrate": "0.13.26-beta.0",
"@airgap/tezos": "0.13.26-beta.0"
},
"dependencies": {
"@airgap/aeternity": "0.13.22",
"@airgap/acurast": "0.13.26-beta.0",
"@airgap/aeternity": "0.13.26-beta.0",
"@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/astar": "0.13.26-beta.0",
"@airgap/bitcoin": "0.13.26-beta.0",
"@airgap/coinlib-core": "0.13.26-beta.0",
"@airgap/coreum": "0.13.26-beta.0",
"@airgap/cosmos": "0.13.26-beta.0",
"@airgap/cosmos-core": "0.13.26-beta.0",
"@airgap/crypto": "0.13.26-beta.0",
"@airgap/ethereum": "0.13.26-beta.0",
"@airgap/groestlcoin": "0.13.26-beta.0",
"@airgap/icp": "0.13.26-beta.0",
"@airgap/module-kit": "0.13.26-beta.0",
"@airgap/moonbeam": "0.13.26-beta.0",
"@airgap/optimism": "0.13.26-beta.0",
"@airgap/polkadot": "0.13.26-beta.0",
"@airgap/sapling-wasm": "0.0.7",
"@airgap/serializer": "0.13.22",
"@airgap/substrate": "0.13.22",
"@airgap/tezos": "0.13.22",
"@airgap/serializer": "0.13.26-beta.0",
"@airgap/substrate": "0.13.26-beta.0",
"@airgap/tezos": "0.13.26-beta.0",
"@airgap-community/iso-rootstock": "1.0.0",
"@angular/cdk": "^14.2.7",
"@angular/common": "16.1.1",
Expand Down
21 changes: 16 additions & 5 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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(),
Expand All @@ -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,
Expand Down

0 comments on commit 194e5de

Please sign in to comment.