Skip to content

Commit

Permalink
Chore/serializer update
Browse files Browse the repository at this point in the history
  • Loading branch information
jsamol authored and godenzim committed Jan 4, 2023
1 parent ea7fe3d commit ba59638
Show file tree
Hide file tree
Showing 12 changed files with 203 additions and 163 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ COPY config /app/config
COPY apply-diagnostic-modules.js /app
COPY fix-qrscanner-gradle.js /app
COPY patch-dependency-versions.js /app
COPY patch-coinlib.js /app

# install dependencies
RUN npm install
Expand Down
265 changes: 137 additions & 128 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"e2e-test-docker": "protractor ./test-config/protractor-docker.conf.js",
"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",
"postinstall": "node patch-coinlib.js && 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 ./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",
Expand All @@ -55,21 +55,21 @@
}
},
"dependencies": {
"@airgap/angular-core": "0.0.33-beta.1",
"@airgap/angular-ngrx": "0.0.33-beta.1",
"@airgap/angular-core": "0.0.33-beta.7",
"@airgap/angular-ngrx": "0.0.33-beta.7",
"@airgap/beacon-sdk": "3.1.5-beta.0",
"@airgap/aeternity": "^0.13.7-beta.21",
"@airgap/astar": "^0.13.7-beta.21",
"@airgap/bitcoin": "^0.13.7-beta.21",
"@airgap/coinlib-core": "^0.13.7-beta.21",
"@airgap/cosmos": "^0.13.7-beta.21",
"@airgap/ethereum": "^0.13.7-beta.21",
"@airgap/groestlcoin": "^0.13.7-beta.21",
"@airgap/moonbeam": "^0.13.7-beta.21",
"@airgap/polkadot": "^0.13.7-beta.21",
"@airgap/serializer": "^0.13.7-beta.21",
"@airgap/substrate": "^0.13.7-beta.21",
"@airgap/tezos": "^0.13.7-beta.21",
"@airgap/aeternity": "^0.13.7-beta.26",
"@airgap/astar": "^0.13.7-beta.26",
"@airgap/bitcoin": "^0.13.7-beta.26",
"@airgap/coinlib-core": "^0.13.7-beta.26",
"@airgap/cosmos": "^0.13.7-beta.26",
"@airgap/ethereum": "^0.13.7-beta.26",
"@airgap/groestlcoin": "^0.13.7-beta.26",
"@airgap/moonbeam": "^0.13.7-beta.26",
"@airgap/polkadot": "^0.13.7-beta.26",
"@airgap/serializer": "^0.13.7-beta.26",
"@airgap/substrate": "^0.13.7-beta.26",
"@airgap/tezos": "^0.13.7-beta.26",
"@airgap/sapling-wasm": "0.0.7",
"@angular/animations": "^11.2.9",
"@angular/common": "^11.2.9",
Expand Down
30 changes: 30 additions & 0 deletions patch-coinlib.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// remove types from coinlib local dependencies to avoid incompatibility errors

const fs = require('fs')
const path = require('path')

const rootdir = ''
const coreDependencies = path.join(rootdir, 'node_modules/@airgap/coinlib-core/dependencies/src')

const dependencies = [coreDependencies]

function removeTypes(path) {
const isDirectory = fs.lstatSync(path).isDirectory()
if (!isDirectory) {
return
}

const files = fs.readdirSync(path)
for (const file of files) {
const absoluteFilePath = `${path}/${file}`
if (file.endsWith('.d.ts')) {
fs.rmSync(absoluteFilePath)
console.log('Removed: ', absoluteFilePath)
} else {
removeTypes(absoluteFilePath)
}
}
}

console.log('patch-coinlib.js: Removing types from local dependencies')
dependencies.forEach((dir) => removeTypes(dir))
6 changes: 3 additions & 3 deletions src/app/components/tezos-fa-form/tezos-fa-form.store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import {
TezosProtocolNetwork,
TezosProtocolOptions
} 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 { TezosContract } from '@airgap/tezos/v0/protocol/contract/TezosContract'
import { TezosContractMetadata } from '@airgap/tezos/v0/protocol/types/contract/TezosContractMetadata'
import { TezosFATokenMetadata } from '@airgap/tezos/v0/protocol/types/fa/TezosFATokenMetadata'
import { Injectable } from '@angular/core'
import { ComponentStore, tapResponse } from '@ngrx/component-store'
import { from, Observable, Subscriber } from 'rxjs'
Expand Down
4 changes: 2 additions & 2 deletions src/app/components/tezos-fa-form/tezos-fa-form.utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TezosContractMetadata } from '@airgap/tezos/protocol/types/contract/TezosContractMetadata'
import { TezosFATokenMetadata } from '@airgap/tezos/protocol/types/fa/TezosFATokenMetadata'
import { TezosContractMetadata } from '@airgap/tezos/v0/protocol/types/contract/TezosContractMetadata'
import { TezosFATokenMetadata } from '@airgap/tezos/v0/protocol/types/fa/TezosFATokenMetadata'

import {
ContractNotFoundError,
Expand Down
8 changes: 4 additions & 4 deletions src/app/extensions/delegation/MoonbeamDelegationExtensions.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { AmountConverterPipe } from '@airgap/angular-core'
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 { MoonbeamCollatorDetails } from '@airgap/moonbeam/v0/protocol/moonbeam/data/staking/MoonbeamCollatorDetails'
import { MoonbeamDelegationDetails } from '@airgap/moonbeam/v0/protocol/moonbeam/data/staking/MoonbeamDelegationDetails'
import { MoonbeamDelegatorDetails } from '@airgap/moonbeam/v0/protocol/moonbeam/data/staking/MoonbeamDelegatorDetails'
import { MoonbeamStakingActionType } from '@airgap/moonbeam/v0/protocol/moonbeam/data/staking/MoonbeamStakingActionType'
import { DecimalPipe } from '@angular/common'
import { FormBuilder, Validators } from '@angular/forms'
import { TranslateService } from '@ngx-translate/core'
Expand Down
4 changes: 2 additions & 2 deletions src/app/ledger/app/substrate/SubstrateLedgerApp.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 { SubstrateSignatureType } from '@airgap/substrate/v0/protocol/common/data/transaction/SubstrateSignature'
import { SubstrateCompatSignatureType, substrateSignatureFactory } from '@airgap/substrate/v0/protocol/compat/SubstrateCompatSignature'
import { ResponseAddress, ResponseBase, ResponseSign, SubstrateApp } from '@zondax/ledger-substrate'

import { ReturnCode } from '../../ReturnCode'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import { Action } from '@airgap/coinlib-core/actions/Action'
import { IAirGapTransactionResult, IProtocolTransactionCursor } from '@airgap/coinlib-core/interfaces/IAirGapTransaction'
import { TezosKtProtocol } from '@airgap/tezos'
import { TezosKtAddressResult } from '@airgap/tezos/protocol/types/kt/TezosKtAddressResult'
import { TezosKtAddressResult } from '@airgap/tezos/v0/protocol/types/kt/TezosKtAddressResult'
import { HttpClient } from '@angular/common/http'
import { Component } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { ProtocolService } from '@airgap/angular-core'
import { AirGapMarketWallet, ProtocolNetwork } from '@airgap/coinlib-core'
import { RemoteData } from '@airgap/coinlib-core/utils/remote-data/RemoteData'
import { TezosProtocol, TezosProtocolNetwork } from '@airgap/tezos'
import { TezosContractRemoteDataFactory } from '@airgap/tezos/protocol/contract/remote-data/TezosContractRemoteDataFactory'
import { TezosContract } from '@airgap/tezos/protocol/contract/TezosContract'
import { TezosFATokenMetadata } from '@airgap/tezos/protocol/types/fa/TezosFATokenMetadata'
import { TezosContractRemoteDataFactory } from '@airgap/tezos/v0/protocol/contract/remote-data/TezosContractRemoteDataFactory'
import { TezosContract } from '@airgap/tezos/v0/protocol/contract/TezosContract'
import { TezosFATokenMetadata } from '@airgap/tezos/v0/protocol/types/fa/TezosFATokenMetadata'
import { gql, request } from 'graphql-request'

import { faProtocolSymbol } from '../../../../types/GenericProtocolSymbols'
Expand Down
8 changes: 4 additions & 4 deletions src/app/services/exchange/exchange.quipuswap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import {
} from '@airgap/coinlib-core'
import { AirGapTransactionStatus, IAirGapTransaction } from '@airgap/coinlib-core/interfaces/IAirGapTransaction'
import { RawTezosTransaction, TezosProtocol, TezosWrappedOperation } from '@airgap/tezos'
import { TezosOperation } from '@airgap/tezos/protocol/types/operations/TezosOperation'
import { TezosTransactionOperation, TezosTransactionParameters } from '@airgap/tezos/protocol/types/operations/Transaction'
import { TezosAddressResult } from '@airgap/tezos/protocol/types/TezosAddressResult'
import { TezosOperationType } from '@airgap/tezos/protocol/types/TezosOperationType'
import { TezosOperation } from '@airgap/tezos/v0/protocol/types/operations/TezosOperation'
import { TezosTransactionOperation, TezosTransactionParameters } from '@airgap/tezos/v0/protocol/types/operations/Transaction'
import { TezosAddressResult } from '@airgap/tezos/v0/protocol/types/TezosAddressResult'
import { TezosOperationType } from '@airgap/tezos/v0/protocol/types/TezosOperationType'
import { FormBuilder, FormGroup, Validators } from '@angular/forms'
import { Schema } from '@taquito/michelson-encoder'
import { Contract, TezosToolkit, TransferParams } from '@taquito/taquito'
Expand Down
2 changes: 1 addition & 1 deletion src/app/services/operations/operations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { RawEthereumTransaction } from '@airgap/ethereum'
import { IACMessageDefinitionObjectV3, IACMessageType } from '@airgap/serializer'
import { RawSubstrateTransaction } from '@airgap/substrate'
import { RawTezosTransaction, TezosBTC, TezosKtProtocol, TezosSaplingProtocol } from '@airgap/tezos'
import { TezosSaplingAddress } from '@airgap/tezos/protocol/sapling/TezosSaplingAddress'
import { TezosSaplingAddress } from '@airgap/tezos/v0/protocol/sapling/TezosSaplingAddress'
import { Injectable } from '@angular/core'
import { FormBuilder } from '@angular/forms'
import { LoadingController, ToastController } from '@ionic/angular'
Expand Down

0 comments on commit ba59638

Please sign in to comment.