Feat/coinlib split

.gitignore

@@ -38,7 +38,7 @@ airgap_cordova_secure_storage_deploy.pub
 Thumbs.db
 UserInterfaceState.xcuserstate
 
-src/assets/libs/airgap-coin-lib.browserify.js
+src/assets/libs/**/*.browserify.js
 
 .env
 

package.json

@@ -30,7 +30,7 @@
     "e2e-test-ci": "npm run e2e-update && protractor ./test-config/protractor-ci.conf.js",
     "e2e-update": "webdriver-manager update --standalone false --gecko false",
     "postinstall": "node config/patch_crypto.js && npm run browserify-coinlib && jetifier && node apply-diagnostic-modules.js && node patch-dependency-versions.js && node fix-qrscanner-gradle.js",
-    "browserify-coinlib": "browserify ./node_modules/@airgap/coinlib-core/index.js -s airgapCoinLib -o ./src/assets/libs/airgap-coin-lib.browserify.js",
+    "browserify-coinlib": "browserify ./node_modules/@airgap/coinlib-core/index.js -s airgapCoinLib -o ./src/assets/libs/airgap-coin-lib.browserify.js && browserify ./node_modules/@airgap/aeternity/index.js -s airgapCoinLibAeternity -o ./src/assets/libs/airgap-aeternity.browserify.js && browserify ./node_modules/@airgap/astar/index.js -s airgapCoinLibAstar -o ./src/assets/libs/airgap-astar.browserify.js && browserify ./node_modules/@airgap/bitcoin/index.js -s airgapCoinLibBitcoin -o ./src/assets/libs/airgap-bitcoin.browserify.js && browserify ./node_modules/@airgap/cosmos/index.js -s airgapCoinLibCosmos -o ./src/assets/libs/airgap-cosmos.browserify.js && browserify ./node_modules/@airgap/ethereum/index.js -s airgapCoinLibEthereum -o ./src/assets/libs/airgap-ethereum.browserify.js && browserify ./node_modules/@airgap/groestlcoin/index.js -s airgapCoinLibGroestlcoin -o ./src/assets/libs/airgap-groestlcoin.browserify.js && browserify ./node_modules/@airgap/moonbeam/index.js -s airgapCoinLibMoonbeam -o ./src/assets/libs/airgap-moonbeam.browserify.js && browserify ./node_modules/@airgap/polkadot/index.js -s airgapCoinLibPolkadot -o ./src/assets/libs/airgap-polkadot.browserify.js && browserify ./node_modules/@airgap/tezos/index.js -s airgapCoinLibTezos -o ./src/assets/libs/airgap-tezos.browserify.js",
     "prettier": "prettier --write \"src/**/*.ts\" \"src/**/*.js\" \"e2e/**/*.ts\" \"angular.json\" \"README.md\"",
     "remove-sapling": "replace './assets/sapling/sapling-' './assets/no-sapling-web/sapling-' ./src/app/app.component.ts",
     "electron": "npm --prefix electron/ run start",
@@ -55,10 +55,21 @@
     }
   },
   "dependencies": {
-    "@airgap/angular-core": "0.0.32",
-    "@airgap/angular-ngrx": "0.0.32",
-    "@airgap/beacon-sdk": "3.3.0",
-    "@airgap/coinlib-core": "0.13.6",
+    "@airgap/angular-core": "0.0.33-beta.1",
+    "@airgap/angular-ngrx": "0.0.33-beta.1",
+    "@airgap/beacon-sdk": "3.1.5-beta.0",
+    "@airgap/aeternity": "^0.13.7-beta.12",
+    "@airgap/astar": "^0.13.7-beta.12",
+    "@airgap/bitcoin": "^0.13.7-beta.12",
+    "@airgap/coinlib-core": "^0.13.7-beta.12",
+    "@airgap/cosmos": "^0.13.7-beta.12",
+    "@airgap/ethereum": "^0.13.7-beta.12",
+    "@airgap/groestlcoin": "^0.13.7-beta.12",
+    "@airgap/moonbeam": "^0.13.7-beta.12",
+    "@airgap/polkadot": "^0.13.7-beta.12",
+    "@airgap/serializer": "^0.13.7-beta.12",
+    "@airgap/substrate": "^0.13.7-beta.12",
+    "@airgap/tezos": "^0.13.7-beta.12",
     "@airgap/sapling-wasm": "0.0.7",
     "@angular/animations": "^11.2.9",
     "@angular/common": "^11.2.9",

src/app/app.component.ts

@@ -12,34 +12,14 @@ import {
 } from '@airgap/angular-core'
 import {
   AirGapMarketWallet,
-  generateId,
-  IACMessageType,
   IAirGapTransaction,
   ICoinProtocol,
   ICoinSubProtocol,
   MainProtocolSymbols,
   NetworkType,
-  TezosBlockExplorer,
-  TezosFA1p2Protocol,
-  TezosFA2Protocol,
-  TezosFA2ProtocolConfig,
-  TezosFA2ProtocolOptions,
-  TezosFAProtocolConfig,
-  TezosFAProtocolOptions,
-  TezosKtProtocol,
-  TezosNetwork,
-  TezosProtocol,
-  TezosProtocolNetwork,
-  TezosIndexerClient,
-  TezosProtocolOptions,
-  TezosSaplingExternalMethodProvider,
-  TezosShieldedTezProtocol
 } from '@airgap/coinlib-core'
-import { TezosDomains } from '@airgap/coinlib-core/protocols/tezos/domains/TezosDomains'
-import {
-  TezosSaplingProtocolOptions,
-  TezosShieldedTezProtocolConfig
-} from '@airgap/coinlib-core/protocols/tezos/sapling/TezosSaplingProtocolOptions'
+import { generateId, IACMessageType } from '@airgap/serializer'
+import { TezosProtocolNetwork, TezosBlockExplorer, TezosNetwork, TezosIndexerClient, TezosProtocol, TezosProtocolOptions, TezosSaplingExternalMethodProvider, TezosShieldedTezProtocol, TezosSaplingProtocolOptions, TezosShieldedTezProtocolConfig, TezosKtProtocol, TezosFAProtocolOptions, TezosFA1p2Protocol, TezosFAProtocolConfig, TezosFA2ProtocolOptions, TezosFA2Protocol, TezosFA2ProtocolConfig, TezosDomains } from '@airgap/tezos'
 import { AfterViewInit, Component, Inject, NgZone } from '@angular/core'
 import { Router } from '@angular/router'
 import { AppPlugin, URLOpenListenerEvent } from '@capacitor/app'

src/app/components/account-edit-popover/account-edit-popover.component.ts

@@ -1,11 +1,10 @@
 import { ClipboardService, ProtocolService } from '@airgap/angular-core'
+import { AirGapMarketWallet, ICoinProtocol, SubProtocolSymbols } from '@airgap/coinlib-core'
+import { ProtocolNetwork } from '@airgap/coinlib-core/utils/ProtocolNetwork'
+import { ImportAccoutActionContext } from '@airgap/tezos'
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core'
 import { AlertController, NavParams, PopoverController } from '@ionic/angular'
 import { TranslateService } from '@ngx-translate/core'
-import { AirGapMarketWallet, ICoinProtocol } from '@airgap/coinlib-core'
-import { ImportAccoutActionContext } from '@airgap/coinlib-core/actions/GetKtAccountsAction'
-import { ProtocolNetwork } from '@airgap/coinlib-core/utils/ProtocolNetwork'
-import { SubProtocolSymbols } from '@airgap/coinlib-core'
 import { supportsDelegation } from 'src/app/helpers/delegation'
 import { ButtonAction } from 'src/app/models/actions/ButtonAction'
 import { BrowserService } from 'src/app/services/browser/browser.service'

src/app/components/from-to/from-to.component.ts

@@ -1,7 +1,8 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core'
-import { IAirGapTransaction, MainProtocolSymbols, TezosWrappedOperation } from '@airgap/coinlib-core'
-import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'
 import { FeeConverterPipe, ProtocolService } from '@airgap/angular-core'
+import { IAirGapTransaction, MainProtocolSymbols } from '@airgap/coinlib-core'
+import { TezosWrappedOperation } from '@airgap/tezos'
+import { Component, EventEmitter, Input, Output } from '@angular/core'
+import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'
 
 @Component({
   selector: 'beacon-from-to',

src/app/components/portfolio-item/portfolio-item.ts

@@ -67,7 +67,7 @@ export class PortfolioItemComponent {
     this.initMarketPrice()
     this.updateDelegationStatus()
     this.walletChanged = this.accountProvider.walletChangedObservable.subscribe(async () => {
-      this.updateBalance()
+      await this.updateBalance()
       this.updateMarketPrice()
       this.updateDelegationStatus()
     })
@@ -90,14 +90,14 @@ export class PortfolioItemComponent {
     if (this.wallet?.getCurrentBalance() === undefined) {
       await this.wallet?.balanceOf()
     } 
-    this.updateBalance()
+    await this.updateBalance()
   }
 
-  private updateBalance() {
+  private async updateBalance() {
     if (this.wallet?.getCurrentBalance() !== undefined) {
       const converter = new AmountConverterPipe(this.protocolService)
       this.balance = this.wallet.getCurrentBalance()
-      const balanceFormatted = converter.transformValueOnly(this.balance, this.wallet.protocol, this.digits())
+      const balanceFormatted = await converter.transformValueOnly(this.balance, this.wallet.protocol, this.digits())
       this.balanceFormatted = `${balanceFormatted} ${this.wallet.protocol.symbol}`
       const balanceSplit = balanceFormatted.split('.')
       if (balanceSplit.length == 2) {

src/app/components/signed-transaction/signed-transaction.ts

@@ -1,18 +1,12 @@
 import { ProtocolService, SerializerService } from '@airgap/angular-core'
+import { IAirGapTransaction, ICoinProtocol, MainProtocolSymbols, ProtocolSymbols, SignedTransaction } from '@airgap/coinlib-core'
+import { IACMessageDefinitionObject } from '@airgap/serializer'
+import { TezosSaplingProtocol } from '@airgap/tezos'
 import { Component, Input, OnChanges } from '@angular/core'
-import {
-  IACMessageDefinitionObject,
-  IAirGapTransaction,
-  ICoinProtocol,
-  MainProtocolSymbols,
-  ProtocolSymbols,
-  SignedTransaction,
-  TezosSaplingProtocol
-} from '@airgap/coinlib-core'
 import BigNumber from 'bignumber.js'
+import { AccountProvider } from 'src/app/services/account/account.provider'
 
 import { ErrorCategory, handleErrorSentry } from '../../services/sentry-error-handler/sentry-error-handler'
-import { AccountProvider } from 'src/app/services/account/account.provider'
 
 @Component({
   selector: 'signed-transaction',

src/app/components/tezos-fa-form/tezos-fa-form.store.ts

@@ -1,20 +1,18 @@
 import { /* FilesystemService, */ ProtocolService, UIResourceStatus } from '@airgap/angular-core'
+import { ICoinProtocol, MainProtocolSymbols, ProtocolNetwork } from '@airgap/coinlib-core'
 import {
-  ICoinProtocol,
-  MainProtocolSymbols,
-  ProtocolNetwork,
   TezosFA1p2Protocol,
   TezosFA2Protocol,
   TezosFA2ProtocolConfig,
   TezosFA2ProtocolOptions,
   TezosFAProtocolConfig,
   TezosFAProtocolOptions,
+  TezosProtocolNetwork,
   TezosProtocolOptions
-} from '@airgap/coinlib-core'
-import { TezosContract } from '@airgap/coinlib-core/protocols/tezos/contract/TezosContract'
-import { TezosProtocolNetwork } from '@airgap/coinlib-core/protocols/tezos/TezosProtocolOptions'
-import { TezosContractMetadata } from '@airgap/coinlib-core/protocols/tezos/types/contract/TezosContractMetadata'
-import { TezosFATokenMetadata } from '@airgap/coinlib-core/protocols/tezos/types/fa/TezosFATokenMetadata'
+} from '@airgap/tezos'
+import { TezosContract } from '@airgap/tezos/protocol/contract/TezosContract'
+import { TezosContractMetadata } from '@airgap/tezos/protocol/types/contract/TezosContractMetadata'
+import { TezosFATokenMetadata } from '@airgap/tezos/protocol/types/fa/TezosFATokenMetadata'
 import { Injectable } from '@angular/core'
 import { ComponentStore, tapResponse } from '@ngrx/component-store'
 import { from, Observable, Subscriber } from 'rxjs'

src/app/components/tezos-fa-form/tezos-fa-form.utils.ts

@@ -1,6 +1,16 @@
-import { TezosContractMetadata } from '@airgap/coinlib-core/protocols/tezos/types/contract/TezosContractMetadata'
-import { TezosFATokenMetadata } from '@airgap/coinlib-core/protocols/tezos/types/fa/TezosFATokenMetadata'
-import { ContractNotFoundError, InterfaceUnknownError, TezosFAFormError, TezosFAFormErrorType, TokenInterface, TokenMetadataMissingError, TokenVagueError, UnknownError } from './tezos-fa-form.types'
+import { TezosContractMetadata } from '@airgap/tezos/protocol/types/contract/TezosContractMetadata'
+import { TezosFATokenMetadata } from '@airgap/tezos/protocol/types/fa/TezosFATokenMetadata'
+
+import {
+  ContractNotFoundError,
+  InterfaceUnknownError,
+  TezosFAFormError,
+  TezosFAFormErrorType,
+  TokenInterface,
+  TokenMetadataMissingError,
+  TokenVagueError,
+  UnknownError
+} from './tezos-fa-form.types'
 
 export function contractNotFoundError(): ContractNotFoundError {
   return { type: TezosFAFormErrorType.CONTRACT_NOT_FOUND }

src/app/components/walletconnect-from-to/walletconnect-from-to.component.ts

@@ -1,5 +1,6 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core'
-import { IAirGapTransaction, RawEthereumTransaction } from '@airgap/coinlib-core'
+import { IAirGapTransaction } from '@airgap/coinlib-core'
+import { RawEthereumTransaction } from '@airgap/ethereum'
+import { Component, EventEmitter, Input, Output } from '@angular/core'
 import { FormBuilder, FormGroup, Validators } from '@angular/forms'
 import BigNumber from 'bignumber.js'
 

src/app/extensions/delegation/CosmosDelegationExtensions.ts

@@ -1,13 +1,11 @@
 import { AmountConverterPipe } from '@airgap/angular-core'
+import { DelegateeDetails, DelegatorAction, DelegatorDetails } from '@airgap/coinlib-core/protocols/ICoinDelegateProtocol'
+import { CosmosDelegationActionType, CosmosProtocol, CosmosUnbondingDelegation, CosmosValidator } from '@airgap/cosmos'
 import { DecimalPipe } from '@angular/common'
-import * as moment from 'moment'
 import { FormBuilder, Validators } from '@angular/forms'
 import { TranslateService } from '@ngx-translate/core'
-import { CosmosProtocol } from '@airgap/coinlib-core'
-import { CosmosUnbondingDelegation, CosmosValidator } from '@airgap/coinlib-core/protocols/cosmos/CosmosTypes'
-import { CosmosDelegationActionType } from '@airgap/coinlib-core/protocols/cosmos/CosmosProtocol'
-import { DelegateeDetails, DelegatorAction, DelegatorDetails } from '@airgap/coinlib-core/protocols/ICoinDelegateProtocol'
 import BigNumber from 'bignumber.js'
+import * as moment from 'moment'
 import {
   AirGapDelegateeDetails,
   AirGapDelegationDetails,
@@ -19,7 +17,7 @@ import { UIAccountSummary } from 'src/app/models/widgets/display/UIAccountSummar
 import { UIIconText } from 'src/app/models/widgets/display/UIIconText'
 import { UIWidget } from 'src/app/models/widgets/UIWidget'
 import { ShortenStringPipe } from 'src/app/pipes/shorten-string/shorten-string.pipe'
-import { CosmosValidatorDetails, CoinlibService } from 'src/app/services/coinlib/coinlib.service'
+import { CoinlibService, CosmosValidatorDetails } from 'src/app/services/coinlib/coinlib.service'
 import { DecimalValidator } from 'src/app/validators/DecimalValidator'
 
 import { ProtocolDelegationExtensions } from './ProtocolDelegationExtensions'

src/app/extensions/delegation/MoonbeamDelegationExtensions.ts

@@ -1,9 +1,10 @@
 import { AmountConverterPipe } from '@airgap/angular-core'
-import { DelegateeDetails, DelegatorAction, DelegatorDetails, MoonbeamProtocol } from '@airgap/coinlib-core'
-import { MoonbeamCollatorDetails } from '@airgap/coinlib-core/protocols/substrate/moonbeam/data/staking/MoonbeamCollatorDetails'
-import { MoonbeamDelegationDetails } from '@airgap/coinlib-core/protocols/substrate/moonbeam/data/staking/MoonbeamDelegationDetails'
-import { MoonbeamDelegatorDetails } from '@airgap/coinlib-core/protocols/substrate/moonbeam/data/staking/MoonbeamDelegatorDetails'
-import { MoonbeamStakingActionType } from '@airgap/coinlib-core/protocols/substrate/moonbeam/data/staking/MoonbeamStakingActionType'
+import { DelegateeDetails, DelegatorAction, DelegatorDetails } from '@airgap/coinlib-core'
+import { MoonbeamProtocol } from '@airgap/moonbeam'
+import { MoonbeamCollatorDetails } from '@airgap/moonbeam/protocol/moonbeam/data/staking/MoonbeamCollatorDetails'
+import { MoonbeamDelegationDetails } from '@airgap/moonbeam/protocol/moonbeam/data/staking/MoonbeamDelegationDetails'
+import { MoonbeamDelegatorDetails } from '@airgap/moonbeam/protocol/moonbeam/data/staking/MoonbeamDelegatorDetails'
+import { MoonbeamStakingActionType } from '@airgap/moonbeam/protocol/moonbeam/data/staking/MoonbeamStakingActionType'
 import { DecimalPipe } from '@angular/common'
 import { FormBuilder, Validators } from '@angular/forms'
 import { TranslateService } from '@ngx-translate/core'

src/app/extensions/delegation/SubstrateDelegationExtensions.ts

@@ -1,14 +1,17 @@
 import { AmountConverterPipe } from '@airgap/angular-core'
-import { MainProtocolSymbols, SubstrateDelegateProtocol, SubstrateNetwork, SubstratePayee } from '@airgap/coinlib-core'
+import { MainProtocolSymbols } from '@airgap/coinlib-core'
 import { DelegatorAction } from '@airgap/coinlib-core/protocols/ICoinDelegateProtocol'
-import { SubstrateElectionStatus } from '@airgap/coinlib-core/protocols/substrate/common/data/staking/SubstrateEraElectionStatus'
-import { SubstrateNominationStatus } from '@airgap/coinlib-core/protocols/substrate/common/data/staking/SubstrateNominationStatus'
 import {
+  SubstrateDelegateProtocol,
+  SubstrateElectionStatus,
+  SubstrateNetwork,
+  SubstrateNominationStatus,
   SubstrateNominatorDetails,
-  SubstrateStakingDetails
-} from '@airgap/coinlib-core/protocols/substrate/common/data/staking/SubstrateNominatorDetails'
-import { SubstrateStakingActionType } from '@airgap/coinlib-core/protocols/substrate/common/data/staking/SubstrateStakingActionType'
-import { SubstrateValidatorDetails } from '@airgap/coinlib-core/protocols/substrate/common/data/staking/SubstrateValidatorDetails'
+  SubstratePayee,
+  SubstrateStakingActionType,
+  SubstrateStakingDetails,
+  SubstrateValidatorDetails
+} from '@airgap/substrate'
 import { DecimalPipe } from '@angular/common'
 import { FormBuilder, Validators } from '@angular/forms'
 import { TranslateService } from '@ngx-translate/core'

src/app/extensions/delegation/TezosDelegationExtensions.ts

@@ -1,10 +1,10 @@
 import { AddressService, AmountConverterPipe } from '@airgap/angular-core'
+import { DelegateeDetails, DelegatorAction, DelegatorDetails } from '@airgap/coinlib-core/protocols/ICoinDelegateProtocol'
+import { NetworkType } from '@airgap/coinlib-core/utils/ProtocolNetwork'
+import { TezosDelegatorAction, TezosProtocol } from '@airgap/tezos'
 import { DecimalPipe } from '@angular/common'
 import { FormBuilder, FormGroup } from '@angular/forms'
 import { TranslateService } from '@ngx-translate/core'
-import { /*DelegationInfo, */TezosDelegatorAction, TezosProtocol } from '@airgap/coinlib-core'
-import { DelegateeDetails, DelegatorAction, DelegatorDetails } from '@airgap/coinlib-core/protocols/ICoinDelegateProtocol'
-import { NetworkType } from '@airgap/coinlib-core/utils/ProtocolNetwork'
 import BigNumber from 'bignumber.js'
 import * as moment from 'moment'
 import {

src/app/helpers/delegation.ts

@@ -1,6 +1,7 @@
-import { ICoinProtocol, ICoinDelegateProtocol, TezosProtocol } from '@airgap/coinlib-core'
+import { ICoinDelegateProtocol, ICoinProtocol, MainProtocolSymbols, SubProtocolSymbols } from '@airgap/coinlib-core'
+import { TezosProtocol } from '@airgap/tezos'
+
 import { IAirGapCoinDelegateProtocol } from '../interfaces/IAirGapCoinDelegateProtocol'
-import { MainProtocolSymbols, SubProtocolSymbols } from '@airgap/coinlib-core'
 
 export function supportsDelegation(protocol: ICoinProtocol): protocol is ICoinDelegateProtocol {
   const delegateProtocol = protocol as ICoinDelegateProtocol

src/app/ledger/app/substrate/KusamaLedgerApp.ts

@@ -1,5 +1,6 @@
+import { KusamaProtocol } from '@airgap/polkadot'
+import { SubstrateNetwork, SubstrateProtocol } from '@airgap/substrate'
 import { newKusamaApp, SubstrateApp } from '@zondax/ledger-substrate'
-import { KusamaProtocol, SubstrateNetwork, SubstrateProtocol } from '@airgap/coinlib-core'
 
 import { SubstrateLedgerApp } from './SubstrateLedgerApp'
 

src/app/ledger/app/substrate/PolkadotLedgerApp.ts

@@ -1,5 +1,6 @@
+import { PolkadotProtocol } from '@airgap/polkadot'
+import { SubstrateNetwork, SubstrateProtocol } from '@airgap/substrate'
 import { newPolkadotApp, SubstrateApp } from '@zondax/ledger-substrate'
-import { PolkadotProtocol, SubstrateNetwork, SubstrateProtocol } from '@airgap/coinlib-core'
 
 import { SubstrateLedgerApp } from './SubstrateLedgerApp'
 

src/app/ledger/app/substrate/SubstrateLedgerApp.ts

@@ -1,18 +1,7 @@
-import {
-  AirGapCoinWallet,
-  AirGapMarketWallet,
-  AirGapWalletPriceService,
-  AirGapWalletStatus,
-  RawSubstrateTransaction,
-  SubstrateNetwork,
-  SubstrateProtocol,
-  SubstrateTransaction
-} from '@airgap/coinlib-core'
-import { SubstrateSignatureType } from '@airgap/coinlib-core/protocols/substrate/common/data/transaction/SubstrateSignature'
-import {
-  SubstrateCompatSignatureType,
-  substrateSignatureFactory
-} from '@airgap/coinlib-core/protocols/substrate/compat/SubstrateCompatSignature'
+import { AirGapCoinWallet, AirGapMarketWallet, AirGapWalletPriceService, AirGapWalletStatus } from '@airgap/coinlib-core'
+import { RawSubstrateTransaction, SubstrateNetwork, SubstrateProtocol, SubstrateTransaction } from '@airgap/substrate'
+import { SubstrateSignatureType } from '@airgap/substrate/protocol/common/data/transaction/SubstrateSignature'
+import { SubstrateCompatSignatureType, substrateSignatureFactory } from '@airgap/substrate/protocol/compat/SubstrateCompatSignature'
 import { ResponseAddress, ResponseBase, ResponseSign, SubstrateApp } from '@zondax/ledger-substrate'
 
 import { ReturnCode } from '../../ReturnCode'

src/app/ledger/app/tezos/TezosLedgerApp.ts

@@ -1,11 +1,5 @@
-import {
-  AirGapCoinWallet,
-  AirGapMarketWallet,
-  AirGapWalletPriceService,
-  AirGapWalletStatus,
-  RawTezosTransaction,
-  TezosProtocol
-} from '@airgap/coinlib-core'
+import { AirGapCoinWallet, AirGapMarketWallet, AirGapWalletPriceService, AirGapWalletStatus } from '@airgap/coinlib-core'
+import { RawTezosTransaction, TezosProtocol } from '@airgap/tezos'
 import Tezos from '@obsidiansystems/hw-app-xtz'
 
 import { LedgerApp } from '../LedgerApp'