From 4f0cc29762c15eca15e06f138252dc4290cdf0c9 Mon Sep 17 00:00:00 2001 From: Igor Lins e Silva Date: Sun, 17 Jun 2018 21:54:52 -0300 Subject: [PATCH] v0.5.2 fix for multi account action history --- package.json | 56 ++-- src/app/app-routing.module.ts | 66 ++--- src/app/dashboard/vote/vote.component.html | 16 +- src/app/dashboard/vote/vote.component.ts | 28 +- src/app/dashboard/wallet/wallet.component.ts | 262 ++++++++++--------- src/app/eosjs.service.ts | 4 +- src/app/network.service.ts | 9 +- yarn.lock | 209 +++++---------- 8 files changed, 305 insertions(+), 345 deletions(-) diff --git a/package.json b/package.json index 3bb50161..4ff3af22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simpleos", - "version": "0.5.1", + "version": "0.5.2", "productName": "simpleos", "description": "EOS Blockchain Interface & Wallet", "author": { @@ -82,9 +82,9 @@ }, "devDependencies": { "@angular-devkit/build-angular": "^0.6.8", - "@angular/cli": "^6.0.8", - "@angular/compiler": "^6.0.4", - "@angular/compiler-cli": "^6.0.4", + "@angular/cli":"^6.0.8", + "@angular/compiler": "^6.0.5", + "@angular/compiler-cli": "^6.0.5", "@types/jasmine": "~2.8.6", "@types/jasminewd2": "~2.0.3", "@types/node": "10.1.2", @@ -94,20 +94,20 @@ "babel-plugin-transform-async-to-generator": "^6.24.1", "babel-preset-env": "^1.7.0", "babel-preset-react": "^6.24.1", - "bootstrap": "^4.1.1", + "bootstrap":"^4.1.1", "codelyzer": "~4.2.1", "core-js": "^2.5.4", - "electron": "2.0.2", - "electron-builder": "^20.15.1", - "electron-reload": "^1.2.2", - "eosjs": "^14.0.0", + "electron":"^2.0.2", + "electron-builder":"20.14.7", + "electron-reload":"^1.2.2", + "eosjs":"^15.0.0", "hammerjs": "^2.0.8", "jquery": "^3.3.1", "moment": "^2.22.2", - "ng-lottie": "^0.3.1", + "ng-lottie":"^0.3.1", "npm-run-all": "^4.1.3", "popper.js": "^1.14.3", - "primeng": "^5.2.6", + "primeng":"^6.0.0-rc.1", "protractor": "~5.3.0", "rxjs": "^6.2.0", "rxjs-compat": "^6.2.0", @@ -119,20 +119,20 @@ "zone.js": "^0.8.26" }, "dependencies": { - "@angular/animations": "^6.0.4", - "@angular/cdk": "^6.0.4", - "@angular/common": "^6.0.4", - "@angular/core": "^6.0.4", - "@angular/forms": "^6.0.4", - "@angular/http": "^6.0.4", - "@angular/language-service": "^6.0.4", - "@angular/material": "^6.0.4", - "@angular/platform-browser": "^6.0.4", - "@angular/platform-browser-dynamic": "^6.0.4", - "@angular/router": "^6.0.4", - "@clr/angular": "^0.12.0-rc.2", - "@clr/icons": "^0.12.0-rc.2", - "@clr/ui": "^0.12.0-rc.2", + "@angular/animations":"^6.0.5", + "@angular/cdk": "^6.0.5", + "@angular/common": "^6.0.5", + "@angular/core": "^6.0.5", + "@angular/forms": "^6.0.5", + "@angular/http": "^6.0.5", + "@angular/language-service": "^6.0.5", + "@angular/material": "^6.0.5", + "@angular/platform-browser": "^6.0.5", + "@angular/platform-browser-dynamic": "^6.0.5", + "@angular/router": "^6.0.5", + "@clr/angular": "^0.12.0", + "@clr/icons": "^0.12.0", + "@clr/ui": "^0.12.0", "@fortawesome/angular-fontawesome": "^0.1.0-10", "@fortawesome/fontawesome-pro-webfonts": "^1.0.9", "@fortawesome/fontawesome-svg-core": "^1.2.0-11", @@ -141,9 +141,9 @@ "@fortawesome/pro-regular-svg-icons": "^5.1.0-8", "@fortawesome/pro-solid-svg-icons": "^5.1.0-8", "electron-builder-squirrel-windows": "^20.15.0", - "electron-updater": "^2.21.10", - "electron-webpack": "^2.1.2", + "electron-updater":"^2.21.11", + "electron-webpack":"^2.1.2", "menu": "^0.2.5", - "opn": "^5.3.0" + "opn":"^5.3.0" } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a91b3e5c..3d66dca0 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -10,42 +10,42 @@ import {ConfigComponent} from './dashboard/config/config.component'; import {AboutComponent} from './dashboard/about/about.component'; const routes: Routes = [ - {path: '', component: LandingComponent}, - { - path: 'dashboard', - component: DashboardComponent, - children: [ - { - path: 'wallet', - component: WalletComponent, - }, - { - path: 'send', - component: SendComponent, - }, - { - path: 'history', - component: HistoryComponent, - }, - { - path: 'vote', - component: VoteComponent, - }, - { - path: 'config', - component: ConfigComponent, - }, - { - path: 'about', - component: AboutComponent, - } - ] - } + {path: '', component: LandingComponent}, + { + path: 'dashboard', + component: DashboardComponent, + children: [ + { + path: 'wallet', + component: WalletComponent, + }, + { + path: 'send', + component: SendComponent, + }, + { + path: 'history', + component: HistoryComponent, + }, + { + path: 'vote', + component: VoteComponent, + }, + { + path: 'config', + component: ConfigComponent, + }, + { + path: 'about', + component: AboutComponent, + } + ] + } ]; @NgModule({ - imports: [RouterModule.forRoot(routes)], - exports: [RouterModule] + imports: [RouterModule.forRoot(routes, {useHash: true})], + exports: [RouterModule] }) export class AppRoutingModule { } diff --git a/src/app/dashboard/vote/vote.component.html b/src/app/dashboard/vote/vote.component.html index 491b6227..77531c03 100644 --- a/src/app/dashboard/vote/vote.component.html +++ b/src/app/dashboard/vote/vote.component.html @@ -27,7 +27,7 @@ Think of EOS as a farm.
- You need eos tokens to rent land on the farm.
+ You need eos tokens to rent land on the farm and use its resources.
In order to rent, you stake your tokens.
When you stake, you also have power to vote, as a “resident” on the farm, but those tokens will be locked for use in transactions.
When you unstake, your tokens will only be free for transfers after 3 days. @@ -37,7 +37,7 @@
- % @@ -60,6 +60,14 @@ style="margin-top: 14px" [disabled]="stakedisabled">Set Stake {{this.stakerr}} + + + + Please, be careful when staking the minimum.
+ This is not recommended if you want to do a lot of transactions, as you will have little CPU bandwidth and may have to wait long hours to stake again.
+ However, if you just want to remove the tokens to an exchange, that is fine. + +
@@ -280,7 +288,7 @@
You can vote for up to 30

Stake +{{stakingHRV}} ?

Unstake {{stakingHRV}} ?

-

Total staked will be: {{valuetoStake | number}}

+

Total staked will be: {{valuetoStake | number: '1.4-4'}}

Voting power will be: {{percenttoStake | number}}%

After staking, this tokens will be locked for at least 3 days.
Your tokens will be free for transfers after 3 days.
@@ -288,7 +296,7 @@
Your tokens will be free for transfers
- + {{wrongpass}} diff --git a/src/app/dashboard/vote/vote.component.ts b/src/app/dashboard/vote/vote.component.ts index 8c9e16ca..9f72bbc8 100644 --- a/src/app/dashboard/vote/vote.component.ts +++ b/src/app/dashboard/vote/vote.component.ts @@ -15,6 +15,7 @@ import {CryptoService} from '../../services/crypto.service'; export class VoteComponent implements OnInit, AfterViewInit { max: number; min: number; + minstake: boolean; valuetoStake: string; percenttoStake: string; stakeModal: boolean; @@ -38,9 +39,8 @@ export class VoteComponent implements OnInit, AfterViewInit { percentMask = createNumberMask({ prefix: '', allowDecimal: true, - decimalSymbol: '', includeThousandsSeparator: false, - decimalLimit: 0, + decimalLimit: 1, integerLimit: 3, }); stakingDiff: number; @@ -56,6 +56,7 @@ export class VoteComponent implements OnInit, AfterViewInit { private toaster: ToasterService) { this.max = 100; this.min = 0; + this.minstake = false; this.valuetoStake = ''; this.percenttoStake = ''; this.stakeModal = false; @@ -120,12 +121,17 @@ export class VoteComponent implements OnInit, AfterViewInit { this.showToast('success', 'Action broadcasted', 'Check your history for confirmation.'); this.aService.refreshFromChain(); }).catch((error) => { - console.log('Catch', error); - this.wrongpass = 'Something went wrong!'; + console.log(JSON.parse(error)); + if (JSON.parse(error).error.name === 'leeway_deadline_exception') { + this.wrongpass = 'Not enough CPU bandwidth to perform transaction. Try again later.'; + } else { + this.wrongpass = JSON.parse(error).error.what; + } this.busy = false; }); } else { - this.wrongpass = 'Something went wrong!'; + console.dir(data); + this.wrongpass = 'Catch2!'; this.busy = false; } }).catch(() => { @@ -172,7 +178,11 @@ export class VoteComponent implements OnInit, AfterViewInit { updateStakeValue() { this.stakedisabled = false; + this.minstake = false; this.valuetoStake = (this.totalBalance * (parseFloat(this.percenttoStake) / 100)).toString(); + if (this.valuetoStake === '1') { + this.minstake = true; + } } updateStakePercent() { @@ -181,10 +191,12 @@ export class VoteComponent implements OnInit, AfterViewInit { } checkPercent() { + this.minstake = false; const min = 100 / this.totalBalance; - if (parseFloat(this.percenttoStake) < min) { + if (parseFloat(this.percenttoStake) <= min) { this.percenttoStake = min.toString(); this.updateStakeValue(); + this.minstake = true; } if (parseFloat(this.percenttoStake) > 100) { this.percenttoStake = '100'; @@ -193,9 +205,11 @@ export class VoteComponent implements OnInit, AfterViewInit { } checkValue() { - if (parseFloat(this.valuetoStake) < 1) { + this.minstake = false; + if (parseFloat(this.valuetoStake) <= 1) { this.valuetoStake = '1'; this.updateStakePercent(); + this.minstake = true; } if (parseFloat(this.valuetoStake) > this.totalBalance) { this.valuetoStake = this.totalBalance.toString(); diff --git a/src/app/dashboard/wallet/wallet.component.ts b/src/app/dashboard/wallet/wallet.component.ts index b35a2d55..2782cb83 100644 --- a/src/app/dashboard/wallet/wallet.component.ts +++ b/src/app/dashboard/wallet/wallet.component.ts @@ -5,140 +5,154 @@ import {EOSJSService} from '../../eosjs.service'; import * as moment from 'moment'; @Component({ - selector: 'app-wallet', - templateUrl: './wallet.component.html', - styleUrls: ['./wallet.component.css'] + selector: 'app-wallet', + templateUrl: './wallet.component.html', + styleUrls: ['./wallet.component.css'] }) export class WalletComponent implements OnInit, AfterViewInit, OnDestroy { - fullBalance: number; - staked: number; - unstaked: number; - moment: any; - openTX = WalletComponent.openTXID; - actions: any[]; - headBlock: number; - LIB: number; - blockTracker: any; - - static openTXID(value) { - window.open('https://eosflare.io/tx/' + value); - } + fullBalance: number; + staked: number; + unstaked: number; + moment: any; + openTX = WalletComponent.openTXID; + actions: any[]; + headBlock: number; + LIB: number; + blockTracker: any; + + static openTXID(value) { + window.open('https://eosflare.io/tx/' + value); + } + + constructor(public aService: AccountsService, public eos: EOSJSService) { + this.moment = moment; + this.actions = []; + this.headBlock = 0; + this.LIB = 0; + this.blockTracker = null; + } - constructor(public aService: AccountsService, public eos: EOSJSService) { - this.moment = moment; - this.actions = []; - this.headBlock = 0; - this.LIB = 0; - this.blockTracker = null; + getInfo() { + this.eos['eos']['getInfo']({}).then((info) => { + this.headBlock = info['head_block_num']; + this.LIB = info['last_irreversible_block_num']; + }); + } + + ngOnInit() { + this.getInfo(); + if (!this.blockTracker) { + this.blockTracker = setInterval(() => { + this.getInfo(); + }, 5000); } + console.log(this.aService.accounts); + console.log('Loaded Account Name: ' + this.aService.selected.getValue().name); + } - getInfo() { - this.eos['eos']['getInfo']({}).then((info) => { - this.headBlock = info['head_block_num']; - this.LIB = info['last_irreversible_block_num']; - }); + ngOnDestroy() { + if (this.blockTracker) { + clearInterval(this.blockTracker); + this.blockTracker = null; } + } - ngOnInit() { - this.aService.selected.asObservable().subscribe((sel) => { - if (sel) { - this.fullBalance = sel.full_balance; - this.staked = sel.staked; - this.unstaked = sel.full_balance - sel.staked; - } - }); - this.getInfo(); - if (!this.blockTracker) { - this.blockTracker = setInterval(() => { - this.getInfo(); - }, 5000); + ngAfterViewInit() { + setTimeout(() => { + // this.aService.initFirst(); + }, 1000); + this.aService.selected.asObservable().subscribe((sel) => { + if (sel['name']) { + this.fullBalance = sel.full_balance; + this.staked = sel.staked; + this.unstaked = sel.full_balance - sel.staked; + this.reloadActions(sel.name); + } + }); + } + + reloadActions(account) { + this.eos['eos']['getActions']({ + account_name: account, + offset: 200, + pos: 0 + }).then((data) => { + this.actions = []; + const allowed_actions = ['transfer', 'voteproducer', 'undelegatebw', 'delegatebw']; + data.actions.forEach((item) => { + const act = item['action_trace']['act']; + const id = item['action_trace']['trx_id']; + const block_num = item['block_num']; + const date = item['block_time']; + const contract = act['account']; + const action_name = act['name']; + let amount = 0; + let user = ''; + let type = ''; + let memo = ''; + let votedProducers = null; + let proxy = null; + let voter = null; + let cpu = 0; + let net = 0; + + if (contract === 'eosio.token' && action_name === 'transfer') { + amount = act['data']['quantity']; + user = act['data']['to']; + memo = act['data']['memo']; + type = 'sent'; } - this.eos['eos']['getActions']({ - account_name: this.aService.selected.getValue().name, - offset: 200, - pos: 0 - }).then((data) => { - this.actions = []; - const allowed_actions = ['transfer', 'voteproducer', 'undelegatebw', 'delegatebw']; - data.actions.forEach((item) => { - const act = item['action_trace']['act']; - const id = item['action_trace']['trx_id']; - const block_num = item['block_num']; - const date = item['block_time']; - const contract = act['account']; - const action_name = act['name']; - let amount = 0; - let user = ''; - let type = ''; - let memo = ''; - let votedProducers = null; - let proxy = null; - let voter = null; - let cpu = 0; - let net = 0; - - if (contract === 'eosio.token' && action_name === 'transfer') { - amount = act['data']['quantity']; - user = act['data']['to']; - memo = act['data']['memo']; - type = 'sent'; - } - - if (contract === 'eosio' && action_name === 'voteproducer') { - votedProducers = act['data']['producers']; - proxy = act['data']['proxy']; - voter = act['data']['voter']; - type = 'vote'; - } - - if (contract === 'eosio' && action_name === 'undelegatebw') { - cpu = parseFloat(act['data']['unstake_cpu_quantity'].split(' ')[0]); - net = parseFloat(act['data']['unstake_net_quantity'].split(' ')[0]); - amount = cpu + net; - user = act['data']['from']; - type = 'unstaked'; - // liquidtime = moment.utc(item['block_time']).add(72, 'hours').fromNow(); - } - - if (contract === 'eosio' && action_name === 'delegatebw') { - cpu = parseFloat(act['data']['stake_cpu_quantity'].split(' ')[0]); - net = parseFloat(act['data']['stake_net_quantity'].split(' ')[0]); - amount = cpu + net; - user = act['data']['from']; - type = 'staked'; - } - if (allowed_actions.includes(action_name)) { - this.actions.push({ - id: id, - type: type, - action_name: action_name, - contract: contract, - user: user, - block: block_num, - date: date, - amount: amount, - memo: memo, - votedProducers: votedProducers, - proxy: proxy, - voter: voter - }); - } - }); - this.actions.reverse(); - }); - } - ngOnDestroy() { - if (this.blockTracker) { - clearInterval(this.blockTracker); - this.blockTracker = null; + if (contract === 'eosio' && action_name === 'voteproducer') { + votedProducers = act['data']['producers']; + proxy = act['data']['proxy']; + voter = act['data']['voter']; + type = 'vote'; } - } - ngAfterViewInit() { - setTimeout(() => { - // this.aService.initFirst(); - }, 1000); - } + if (contract === 'eosio' && action_name === 'undelegatebw') { + cpu = parseFloat(act['data']['unstake_cpu_quantity'].split(' ')[0]); + net = parseFloat(act['data']['unstake_net_quantity'].split(' ')[0]); + amount = cpu + net; + user = act['data']['from']; + type = 'unstaked'; + // liquidtime = moment.utc(item['block_time']).add(72, 'hours').fromNow(); + } + + if (contract === 'eosio' && action_name === 'delegatebw') { + cpu = parseFloat(act['data']['stake_cpu_quantity'].split(' ')[0]); + net = parseFloat(act['data']['stake_net_quantity'].split(' ')[0]); + amount = cpu + net; + user = act['data']['from']; + type = 'staked'; + } + + let valid = true; + if (action_name === 'transfer') { + if (act['data']['to'] === 'eosio.stake') { + valid = false; + } + } + + if (allowed_actions.includes(action_name) && valid) { + this.actions.push({ + id: id, + type: type, + action_name: action_name, + contract: contract, + user: user, + block: block_num, + date: date, + amount: amount, + memo: memo, + votedProducers: votedProducers, + proxy: proxy, + voter: voter + }); + } + }); + this.actions.reverse(); + }); + } } diff --git a/src/app/eosjs.service.ts b/src/app/eosjs.service.ts index fa44bc26..4f6aa0ce 100644 --- a/src/app/eosjs.service.ts +++ b/src/app/eosjs.service.ts @@ -358,7 +358,7 @@ export class EOSJSService { }, (err, result) => { if (err) { console.log(err); - reject(); + reject(err); } else { console.log(result); resolve(); @@ -384,7 +384,7 @@ export class EOSJSService { }, (err, result) => { if (err) { console.log(err); - reject(); + reject(err); } else { console.log(result); resolve(); diff --git a/src/app/network.service.ts b/src/app/network.service.ts index d2c9377f..b57ff907 100644 --- a/src/app/network.service.ts +++ b/src/app/network.service.ts @@ -42,9 +42,9 @@ export class NetworkService { constructor(private eosjs: EOSJSService, private router: Router, public aService: AccountsService) { this.publicEndpoints = [ {url: 'http://br.eosrio.io:8080', owner: 'EOS Rio', latency: 0, filters: []}, - {url: 'http://api.eosnewyork.io', owner: 'EOS New York', latency: 0, filters: []}, - {url: 'https://eos.greymass.com', owner: 'Greymass', latency: 0, filters: []}, - {url: 'https://eosapi.blockmatrix.network', owner: 'Blockmatrix', latency: 0, filters: []}, + // {url: 'http://api.eosnewyork.io', owner: 'EOS New York', latency: 0, filters: []}, + // {url: 'https://eos.greymass.com', owner: 'Greymass', latency: 0, filters: []}, + // {url: 'https://eosapi.blockmatrix.network', owner: 'Blockmatrix', latency: 0, filters: []}, // {url: 'http://api.proxy1a.sheos.org', owner: 'shEOS', latency: 0, filters: []}, // {url: 'http://bp.cryptolions.io:8888', owner: 'CryptoLions', latency: 0, filters: []}, // {url: 'http://mainnet.eoscalgary.io', owner: 'EOS Cafe', latency: 0, filters: []}, @@ -190,7 +190,8 @@ export class NetworkService { if (savedAccounts) { if (savedAccounts.length > 0) { this.aService.loadLocalAccounts(savedAccounts); - this.router['navigate'](['dashboard', 'vote']); + this.aService.initFirst(); + this.router['navigate'](['dashboard', 'wallet']); } else { console.log('No saved accounts!'); } diff --git a/yarn.lock b/yarn.lock index 62ae5851..914ac6df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -119,13 +119,13 @@ "@angular-devkit/core" "0.6.8" rxjs "^6.0.0" -"@angular/animations@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.4.tgz#4e22612e8fed3193983d985c748514a03404bd96" +"@angular/animations@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.5.tgz#3964bc2a60facf3c3b417925c4a395b3f44abb94" dependencies: tslib "^1.9.0" -"@angular/cdk@^6.0.4": +"@angular/cdk@^6.0.5": version "6.2.1" resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-6.2.1.tgz#6ac6e58e8557623e6615ebcb673d74bcc575641c" dependencies: @@ -148,70 +148,70 @@ symbol-observable "^1.2.0" yargs-parser "^10.0.0" -"@angular/common@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.4.tgz#e3d194a1bb1e143044774488d610437a982179fa" +"@angular/common@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.5.tgz#7960e1cfc180afb4a1bd56371c48840173cc5a92" dependencies: tslib "^1.9.0" -"@angular/compiler-cli@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.4.tgz#03596a2365aaed418e09999493560ba82fd45190" +"@angular/compiler-cli@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.5.tgz#e3ae6a1042e4a08c43f2554685718a4402710958" dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" tsickle "^0.29.0" -"@angular/compiler@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.4.tgz#86d3adc2c915ee98aa8e00c542c2ef1c09f9c61f" +"@angular/compiler@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.5.tgz#cb8fdb17b0d736c9054c1c9ab382c9cd2cc7ba5d" dependencies: tslib "^1.9.0" -"@angular/core@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.4.tgz#80b19624493126b6c7e3a180a33dee92c84b4bd6" +"@angular/core@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.5.tgz#5846f1b3143f43657dc704fe4bcf9e75b94ec325" dependencies: tslib "^1.9.0" -"@angular/forms@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.4.tgz#abc5ea355b5261c49f111366f41a812aa9d3d1d3" +"@angular/forms@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.5.tgz#d3ec7886d8b61a97b2c0b7501b304b449a2dcae6" dependencies: tslib "^1.9.0" -"@angular/http@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.4.tgz#5598c6eec895014da9242c22236af2757ae9fef1" +"@angular/http@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.5.tgz#53835564bb5c7a4eac7893a28bcaaf0e73fec2cd" dependencies: tslib "^1.9.0" -"@angular/language-service@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-6.0.4.tgz#4a19c1734d28590d987268090b16b12e71a67c30" +"@angular/language-service@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-6.0.5.tgz#824c8cb43ab3976ddb9442ba39562e1dd0108155" -"@angular/material@^6.0.4": +"@angular/material@^6.0.5": version "6.2.1" resolved "https://registry.yarnpkg.com/@angular/material/-/material-6.2.1.tgz#aec3387db755145b80d66d8497d4a834f88b61be" dependencies: tslib "^1.7.1" -"@angular/platform-browser-dynamic@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.4.tgz#3b86f6b826d45418520da583eb8ba0526f62a4bb" +"@angular/platform-browser-dynamic@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.5.tgz#21c9a702fbd4a153ae8aa35fef89ca1a6dfaa658" dependencies: tslib "^1.9.0" -"@angular/platform-browser@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.4.tgz#3a86890324fd9de37df8d7195fcedf4145eefb3b" +"@angular/platform-browser@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.5.tgz#b6b15424a7aa9342284ce7fba6a700f7aad2fd9c" dependencies: tslib "^1.9.0" -"@angular/router@^6.0.4": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.0.4.tgz#81c96dfa42a8c4a218cbd450b1e8959a76ea9595" +"@angular/router@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.0.5.tgz#e9e9e5986e238588020d0531aff3362e836db2a8" dependencies: tslib "^1.9.0" @@ -737,19 +737,19 @@ lodash "^4.17.5" to-fast-properties "^2.0.0" -"@clr/angular@^0.12.0-rc.2": - version "0.12.0-rc.2" - resolved "https://registry.yarnpkg.com/@clr/angular/-/angular-0.12.0-rc.2.tgz#b8eda3cd3d7d252ea841d3ddf9aaee65564b5656" +"@clr/angular@^0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@clr/angular/-/angular-0.12.0.tgz#656138988647127f812f9fde38050d882ba36594" dependencies: tslib "^1.9.0" -"@clr/icons@^0.12.0-rc.2": - version "0.12.0-rc.2" - resolved "https://registry.yarnpkg.com/@clr/icons/-/icons-0.12.0-rc.2.tgz#7e5c4994fdbad27378a9085d7c86a8ac6c7d7d72" +"@clr/icons@^0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@clr/icons/-/icons-0.12.0.tgz#6b6042c0ebb7c535ae31c333509b3d7056a271d6" -"@clr/ui@^0.12.0-rc.2": - version "0.12.0-rc.2" - resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-0.12.0-rc.2.tgz#8570befba948098b3bd0dd600255f4dfbfd627cb" +"@clr/ui@^0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-0.12.0.tgz#f14d67be6dcf3f08b0c2d46a70c948452d26af49" "@fortawesome/angular-fontawesome@^0.1.0-10": version "0.1.0-10" @@ -1170,10 +1170,6 @@ app-builder-bin@1.9.5: version "1.9.5" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.5.tgz#f4e2b26e26578c9a48cea85da44f0bc1a7582fc0" -app-builder-bin@1.9.7: - version "1.9.7" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.9.7.tgz#9f01439fa8088a43471df9e5e071dd3880a8cff0" - app-root-path@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46" @@ -1931,14 +1927,6 @@ babel-plugin-transform-strict-mode@^6.24.1: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-polyfill@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - babel-preset-env@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" @@ -2429,25 +2417,6 @@ builder-util@5.11.1: stat-mode "^0.2.2" temp-file "^3.1.2" -builder-util@5.11.2: - version "5.11.2" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.2.tgz#2d4829f0743ce1b654e94586fade63fd6cfefae5" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.9.7" - bluebird-lst "^1.0.5" - builder-util-runtime "^4.2.1" - chalk "^2.4.1" - debug "^3.1.0" - fs-extra-p "^4.6.0" - is-ci "^1.1.0" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - semver "^5.5.0" - source-map-support "^0.5.6" - stat-mode "^0.2.2" - temp-file "^3.1.2" - builder-util@^5.11.0, builder-util@^5.11.2: version "5.11.4" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.11.4.tgz#24d72aa567ecfeacca72b0740b4ddbffaaef617c" @@ -3693,37 +3662,7 @@ ejs@^2.5.7, ejs@^2.5.9, ejs@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0" -electron-builder-lib@20.15.1: - version "20.15.1" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.15.1.tgz#d2675e71918f62561cf5ecae633dfe5f4219d0e3" - dependencies: - "7zip-bin" "~4.0.2" - app-builder-bin "1.9.7" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.5" - builder-util "5.11.2" - builder-util-runtime "4.2.1" - chromium-pickle-js "^0.2.0" - debug "^3.1.0" - ejs "^2.6.1" - electron-osx-sign "0.4.10" - electron-publish "20.15.0" - fs-extra-p "^4.6.0" - hosted-git-info "^2.6.0" - is-ci "^1.1.0" - isbinaryfile "^3.0.2" - js-yaml "^3.11.0" - lazy-val "^1.0.3" - minimatch "^3.0.4" - normalize-package-data "^2.4.0" - plist "^3.0.1" - read-config-file "3.0.1" - sanitize-filename "^1.6.1" - semver "^5.5.0" - stream-json "^0.6.1" - temp-file "^3.1.2" - -electron-builder-lib@~20.14.6: +electron-builder-lib@20.14.7, electron-builder-lib@~20.14.6: version "20.14.7" resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.14.7.tgz#db91977dd13b0a288e1da5629183807a9847de21" dependencies: @@ -3765,16 +3704,16 @@ electron-builder-squirrel-windows@^20.15.0: optionalDependencies: "7zip-bin" "~3.1.0" -electron-builder@^20.15.1: - version "20.15.1" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.15.1.tgz#078cda29bdb7240244e9bccf30740b1ea42deb44" +electron-builder@20.14.7: + version "20.14.7" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.14.7.tgz#41a7c4cb4384690c936eb4fc396270effac53bd7" dependencies: bluebird-lst "^1.0.5" - builder-util "5.11.2" + builder-util "5.11.1" builder-util-runtime "4.2.1" chalk "^2.4.1" dmg-builder "4.10.1" - electron-builder-lib "20.15.1" + electron-builder-lib "20.14.7" electron-download-tf "4.3.4" fs-extra-p "^4.6.0" is-ci "^1.1.0" @@ -3848,18 +3787,6 @@ electron-publish@20.14.6: lazy-val "^1.0.3" mime "^2.3.1" -electron-publish@20.15.0: - version "20.15.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.15.0.tgz#4dd96b2ce82b8856342a6d60dda571669a390d2d" - dependencies: - bluebird-lst "^1.0.5" - builder-util "^5.11.2" - builder-util-runtime "^4.2.1" - chalk "^2.4.1" - fs-extra-p "^4.6.0" - lazy-val "^1.0.3" - mime "^2.3.1" - electron-reload@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/electron-reload/-/electron-reload-1.2.2.tgz#621ddb443b9fbba1c5e29a5fdd683322b5c42284" @@ -3870,9 +3797,9 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.47: version "1.3.48" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900" -electron-updater@^2.21.10: - version "2.21.10" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.21.10.tgz#aa66757ebf966f4247f247a8433af45cfe8e93b0" +electron-updater@^2.21.11: + version "2.21.11" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.21.11.tgz#7dcb70e54840e45d347e3dbd5168fe63bf085213" dependencies: bluebird-lst "^1.0.5" builder-util-runtime "~4.2.1" @@ -3882,7 +3809,7 @@ electron-updater@^2.21.10: lazy-val "^1.0.3" lodash.isequal "^4.5.0" semver "^5.5.0" - source-map-support "^0.5.5" + source-map-support "^0.5.6" electron-webpack-js@~2.0.3: version "2.0.3" @@ -3926,7 +3853,7 @@ electron-webpack@^2.1.2: webpack-merge "^4.1.2" yargs "^11.1.0" -electron@2.0.2: +electron@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.2.tgz#b77e05f83419cc5ec921a2d21f35b55e4bfc3d68" dependencies: @@ -3990,9 +3917,9 @@ envinfo@^5.7.0: version "5.10.0" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-5.10.0.tgz#503a9774ae15b93ea68bdfae2ccd6306624ea6df" -eosjs-api@6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/eosjs-api/-/eosjs-api-6.1.3.tgz#a5f7d16ab688373729660b0cb72e107898fc02b6" +eosjs-api@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/eosjs-api/-/eosjs-api-6.2.1.tgz#4d6f3d33cfa04aee2b4899ad0842bf3b69aa2c35" dependencies: camel-case "^3.0.0" isomorphic-fetch "^2.2.1" @@ -4010,14 +3937,14 @@ eosjs-ecc@4.0.1: ecurve "^1.0.5" randombytes "^2.0.5" -eosjs@^14.0.0: - version "14.1.1" - resolved "https://registry.yarnpkg.com/eosjs/-/eosjs-14.1.1.tgz#164907430819fea693417e1b10fe666dff30263d" +eosjs@^15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/eosjs/-/eosjs-15.0.0.tgz#8c9329bb640091db070689f050c2bf14d5219ec7" dependencies: - babel-polyfill "^6.26.0" + babel-runtime "^6.26.0" binaryen "^37.0.0" create-hash "^1.1.3" - eosjs-api "6.1.3" + eosjs-api "6.2.1" eosjs-ecc "4.0.1" fcbuffer "2.2.0" @@ -7776,9 +7703,9 @@ pretty-error@^2.0.2: renderkid "^2.0.1" utila "~0.4" -primeng@^5.2.6: - version "5.2.7" - resolved "https://registry.yarnpkg.com/primeng/-/primeng-5.2.7.tgz#9dcf461b6a82ea46de85751dc235ea82303e64b1" +primeng@^6.0.0-rc.1: + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/primeng/-/primeng-6.0.0-rc.1.tgz#038e5657a5395e08a5c1fd9312b12cac1a44b527" private@^0.1.6, private@^0.1.8, private@~0.1.5: version "0.1.8" @@ -8156,10 +8083,6 @@ regenerate@^1.2.1, regenerate@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" -regenerator-runtime@^0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"