angular8 version update

Author: dakk

Gulpfile.js

@@ -0,0 +1,230 @@
+{
+	"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+	"version": 1,
+	"newProjectRoot": "projects",
+	"projects": {
+		"helperbit": {
+			"projectType": "application",
+			"schematics": {
+				"@schematics/angular:component": {
+					"style": "scss"
+				}
+			},
+			"root": "app",
+			"sourceRoot": "app",
+			"prefix": "app",
+			"architect": {
+				"build": {
+					"builder": "@angular-devkit/build-angular:browser",
+					"options": {
+						"budgets": [
+							{
+								"type": "initial",
+								"maximumWarning": "5mb",
+								"maximumError": "10mb"
+							},
+							{
+								"type": "anyComponentStyle",
+								"maximumWarning": "6kb",
+								"maximumError": "10kb"
+							}
+						],
+						"baseHref": "/",
+						"deployUrl": "/",
+						"outputPath": "dist/",
+						"index": "app/index.html",
+						"main": "app/main.ts",
+						"polyfills": "app/polyfills.ts",
+						"tsConfig": "app/tsconfig.app.json",
+						"aot": false,
+						"assets": [
+							"app/favicon.ico",
+							{
+								"glob": "**/*",
+								"input": "app/assets/",
+								"output": "/"
+							},
+							{
+								"glob": "**/*",
+								"input": "app/widgets/",
+								"output": "/widgets",
+								"ignore": [
+									"node_modules",
+									"**/node_modules",
+									"app/widgets/node_modules"
+								]
+							}
+						],
+						"styles": [
+							"node_modules/bootstrap/dist/css/bootstrap.min.css",
+							"node_modules/leaflet/dist/leaflet.css",
+							"node_modules/intl-tel-input/build/css/intlTelInput.css",
+							"node_modules/bootstrap-slider/dist/css/bootstrap-slider.min.css",
+							"node_modules/bootstrap-social/bootstrap-social.css",
+							"node_modules/cryptocoins-icons/webfont/cryptocoins.css",
+							"node_modules/font-awesome/css/font-awesome.min.css",
+							"app/assets/fonts/fonts.css",
+							"node_modules/ng-bootstrap-to-bootstrap-3/dist/ng-bootstrap-to-bootstrap-3.min.css",
+							"node_modules/angular-archwizard/archwizard.css",
+							"app/styles.scss"
+						],
+						"scripts": [
+							"node_modules/intl-tel-input/build/js/utils.js",
+							"node_modules/intl-tel-input/build/js/intlTelInput.min.js"
+						]
+					},
+					"configurations": {
+						"mainnet": {
+							"fileReplacements": [
+								{
+									"replace": "app/config.js",
+									"with": "app/config/mainnet.js"
+								}
+							],
+							"optimization": true,
+							"outputHashing": "all",
+							"sourceMap": false,
+							"extractCss": false,
+							"namedChunks": true,
+							"aot": false,
+							"extractLicenses": true,
+							"vendorChunk": true,
+							"buildOptimizer": false
+						},
+						"testnet": {
+							"fileReplacements": [
+								{
+									"replace": "app/config.js",
+									"with": "app/config/testnet.js"
+								}
+							],
+							"optimization": true,
+							"outputHashing": "all",
+							"sourceMap": false,
+							"extractCss": false,
+							"namedChunks": true,
+							"vendorSourceMap": false,
+							"aot": false,
+							"extractLicenses": true,
+							"vendorChunk": true,
+							"buildOptimizer": false
+						},
+						"mainnet-staging": {
+							"fileReplacements": [
+								{
+									"replace": "app/config.js",
+									"with": "app/config/mainnet-staging.js"
+								}
+							],
+							"optimization": true,
+							"outputHashing": "all",
+							"sourceMap": false,
+							"extractCss": false,
+							"namedChunks": true,
+							"aot": false,
+							"extractLicenses": true,
+							"vendorChunk": true,
+							"buildOptimizer": false
+						},
+						"dev": {
+							"fileReplacements": [
+								{
+									"replace": "app/config.js",
+									"with": "app/config/dev.js"
+								}
+							],
+							"optimization": false,
+							"outputHashing": "all",
+							"sourceMap": false,
+							"extractCss": false,
+							"vendorSourceMap": false,
+							"namedChunks": true,
+							"aot": false,
+							"extractLicenses": false,
+							"vendorChunk": true,
+							"buildOptimizer": false
+						}
+					}
+				},
+				"serve": {
+					"builder": "@angular-devkit/build-angular:dev-server",
+					"options": {
+						"browserTarget": "helperbit:build"
+					},
+					"configurations": {
+						"dev": {
+							"browserTarget": "helperbit:build:dev"
+						}
+					}
+				},
+				"extract-i18n": {
+					"builder": "@angular-devkit/build-angular:extract-i18n",
+					"options": {
+						"browserTarget": "helperbit:build"
+					}
+				},
+				"test": {
+					"builder": "@angular-devkit/build-angular:karma",
+					"options": {
+						"codeCoverage": true,
+						"main": "app/test.ts",
+						"polyfills": "app/polyfills.ts",
+						"tsConfig": "tsconfig.spec.json",
+						"karmaConfig": "karma.conf.js",
+						"assets": [
+							"app/favicon.ico",
+							"app/assets"
+						],
+						"styles": [
+							"app/styles.scss"
+						],
+						"scripts": []
+					}
+				},
+				"lint": {
+					"builder": "@angular-devkit/build-angular:tslint",
+					"options": {
+						"tsConfig": [
+							"app/tsconfig.app.json",
+							"tsconfig.spec.json",
+							"e2e/tsconfig.json"
+						],
+						"exclude": [
+							"**/node_modules/**"
+						]
+					}
+				},
+				"e2e": {
+					"builder": "@angular-devkit/build-angular:protractor",
+					"options": {
+						"protractorConfig": "e2e/protractor.conf.js",
+						"devServerTarget": "helperbit:serve"
+					},
+					"configurations": {
+						"production": {
+							"devServerTarget": "helperbit:serve:production"
+						}
+					}
+				},
+				"server": {
+					"builder": "@angular-devkit/build-angular:server",
+					"options": {
+						"outputPath": "dist/server",
+						"main": "app/main.server.ts",
+						"tsConfig": "tsconfig.server.json"
+					},
+					"configurations": {
+						"dev": {
+							"sourceMap": false,
+							"optimization": {
+								"scripts": false,
+								"styles": true
+							}
+						}
+					}
+				}
+			}
+		}
+	},
+	"defaultProject": "helperbit"
+}

angular.json

@@ -3,34 +3,29 @@ import TransportU2F from "@ledgerhq/hw-transport-u2f";
 import Btc from "@ledgerhq/hw-app-btc";
 import {
 	BitcoinSignService, BitcoinSignOptions, compressPublicKey,
-	prepareScripts, toByteArray, scriptTypeOfBitcoinScriptType
+	prepareScripts, toByteArray
 } from './bitcoin-service';
-import { ConfigService } from '../../app.config';
-import { deserializeCall } from '../../models/common';
-
-require("babel-polyfill");
+import { unwrap } from '../../../models/common';
+import AppSettings from '../../../app.settings';
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs/internal/Observable';
 
 
+@Injectable()
 export default class BitcoinLedgerService implements BitcoinSignService {
-	config: ConfigService;
-	$http: any;
-
 	defaultAccount: string;
 	defaultPath: string;
 
-	constructor(config: ConfigService, $http) {
-		this.config = config;
-		this.$http = $http;
 
+	constructor(private http: HttpClient) {
 		this.defaultAccount = '7276'; // HB
-		this.defaultPath = "44'/" + (config.networkName == 'testnet' ? '1' : '0') + "'/" + this.defaultAccount + "'/0/0";
+		this.defaultPath = "44'/" + (AppSettings.networkName == 'testnet' ? '1' : '0') + "'/" + this.defaultAccount + "'/0/0";
 	}
 
-	private rawTransactions(hashes: string[]): Promise<{ [txid: string]: string }> {
-		return deserializeCall<{ [txid: string]: string }>(
-			this.$http.post(this.config.apiUrl + '/blockchain/rawtransactions', { hashes: hashes }),
-			'transactions'
-		);
+	private rawTransactions(hashes: string[]): Observable<{ [txid: string]: string }> {
+		return this.http.post<{ [txid: string]: string }>(AppSettings.apiUrl + '/blockchain/rawtransactions', { hashes: hashes })
+			.pipe(unwrap('transactions'));
 	}
 
 	private getPublicKeyFromPath(path: string, ledgerWaitCallback) {
@@ -81,7 +76,7 @@ export default class BitcoinLedgerService implements BitcoinSignService {
 		if (options.scripttype != 'p2sh')
 			segwit = true;
 
-		const walletScripts = prepareScripts(options.scripttype, options.n, options.pubkeys, this.config.network);
+		const walletScripts = prepareScripts(options.scripttype, options.n, options.pubkeys, AppSettings.network);
 
 		return new Promise((resolve, reject) => {
 			ledgerWaitCallback(1, 'wait');
@@ -92,7 +87,7 @@ export default class BitcoinLedgerService implements BitcoinSignService {
 					const btc = new Btc(transport);
 
 					/* Download utxo transaction raw */
-					this.rawTransactions(options.utxos.map(utxo => utxo.tx)).then(transactions => {
+					this.rawTransactions(options.utxos.map(utxo => utxo.tx)).subscribe(transactions => {
 						/* Create inputs and serialized outputs */
 						const inputs = options.utxos.map(utxo => [
 							btc.splitTransaction(transactions[utxo.tx], bitcoinjs.Transaction.fromHex(transactions[utxo.tx]).hasWitnesses()),
@@ -101,14 +96,14 @@ export default class BitcoinLedgerService implements BitcoinSignService {
 							// bitcoinjs.Transaction.fromHex(transactions[utxo.tx]).outs[utxo.n].sequence
 						]);
 						const paths = inputs.map(i => this.defaultPath);
-						const txb = bitcoinjs.Psbt.fromHex(txhex, { network: this.config.network });
+						const txb = bitcoinjs.Psbt.fromHex(txhex, { network: AppSettings.network });
 						const outshex = btc.serializeTransactionOutputs(btc.splitTransaction((txb as any).__CACHE.__TX.toHex(), true)).toString('hex');
 
 						btc.signP2SHTransaction(inputs, paths, outshex, 0/*tx.locktime*/, 1 /*SIGHASH_ALL*/, segwit, 2).then(signatures => {
 							/* Inject signatures */
 							for (let j = 0; j < txb.inputCount; j++) {
 								txb.signInput(j, {
-									network: this.config.network,
+									network: AppSettings.network,
 									publicKey: toByteArray(publickey),
 									sign: (hash) => bitcoinjs.script.signature.decode(toByteArray(signatures[j])).signature
 								} as bitcoinjs.ECPairInterface);
@@ -122,7 +117,7 @@ export default class BitcoinLedgerService implements BitcoinSignService {
 							ledgerWaitCallback(2, 'error');
 							return reject(err);
 						});
-					}).catch(err => {
+					}, err => {
 						// eslint-disable-next-line no-console
 						console.log('Failed acquiring txhashes:', err);
 						ledgerWaitCallback(2, 'error');
@@ -138,6 +133,4 @@ export default class BitcoinLedgerService implements BitcoinSignService {
 			});
 		});
 	}
-
-	static get $inject() { return ['config', '$http'] };
 }