Skip to content

Commit

Permalink
0.5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
igorls committed Jun 23, 2018
1 parent cdba2c8 commit a7d15b3
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 14 deletions.
27 changes: 27 additions & 0 deletions ng-dist/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,33 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

[email protected]
MIT
# License

[The MIT License (MIT)](http://opensource.org/licenses/MIT)

Copyright (c) 2009-2013 Jeff Mott
Copyright (c) 2013-2016 Evan Vosberg

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

@angular-devkit/[email protected]
MIT
The MIT License
Expand Down
2 changes: 1 addition & 1 deletion ng-dist/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ng-dist/vendor.js

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simpleos",
"version": "0.5.5",
"version": "0.5.6",
"productName": "simpleos",
"description": "EOS Blockchain Interface & Wallet",
"author": {
Expand Down Expand Up @@ -105,8 +105,8 @@
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2",
"zone.js": "^0.8.26",
"webpack": "^4.12.0"
"webpack": "^4.12.0",
"zone.js": "^0.8.26"
},
"dependencies": {
"@angular/animations": "^6.0.6",
Expand All @@ -131,6 +131,8 @@
"@fortawesome/pro-light-svg-icons": "^5.1.0",
"@fortawesome/pro-regular-svg-icons": "^5.1.0",
"@fortawesome/pro-solid-svg-icons": "^5.1.0",
"@types/crypto-js": "^3.1.40",
"crypto-js": "^3.1.9-1",
"electron-updater": "^2.21.10",
"electron-webpack": "^2.1.2",
"menu": "^0.2.5",
Expand Down
4 changes: 3 additions & 1 deletion src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Component, OnInit} from '@angular/core';
import {NetworkService} from './network.service';
import {CryptoService} from './services/crypto.service';

@Component({
selector: 'app-root',
Expand All @@ -10,8 +11,9 @@ export class AppComponent implements OnInit {
update: boolean;
ipc: any;

constructor(public network: NetworkService) {
constructor(public network: NetworkService, private crypto: CryptoService) {
this.update = false;
this.crypto.createPIN('123456');
}

checkUpdate() {
Expand Down
5 changes: 2 additions & 3 deletions src/app/dashboard/dashboard.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,9 @@
<section class="placeholder border-r">
<div class="credits">Made with
<fa-icon [icon]="['fas', 'heart']"></fa-icon>
by <a style="color: #d7d7d7;"
[routerLink]="['about']">EOS Rio</a>
by <a style="color: #d7d7d7;" [routerLink]="['about']">EOS Rio</a>
</div>
<div class="version">v0.5.5</div>
<div class="version">v0.5.6</div>
</section>
</nav>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/landing/landing.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export class LandingComponent implements OnInit {
publickey: String;
importedAccounts: any[];
exodusValid = false;
endpoint = null;
endpoint = 'http://br.eosrio.io:8080';

static parseEOS(tk_string) {
if (tk_string.split(' ')[1] === 'EOS') {
Expand Down
7 changes: 3 additions & 4 deletions src/app/network.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,11 @@ 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://eosapi.blockmatrix.network', owner: 'Blockmatrix', latency: 0, filters: []},
{url: 'https://api1.eosasia.one', owner: 'EOS Asia', latency: 0, filters: []},
{url: 'http://api.hkeos.com', owner: 'HK EOS', latency: 0, filters: []},
{url: 'http://bp.cryptolions.io:8888', owner: 'CryptoLions', latency: 0, filters: []},
{url: 'http://jhb.eosio.africa:8088', owner: 'eosAfrica', latency: 0, filters: []}
{url: 'http://jhb.eosio.africa:8088', owner: 'eosAfrica', latency: 0, filters: []},
{url: 'https://eu1.eosdac.io', owner: 'eosDAC', latency: 0, filters: []},
{url: 'https://fn.eossweden.se', owner: 'eossweden.se', latency: 0, filters: []}
];
this.validEndpoints = [];
this.status = '';
Expand Down
21 changes: 21 additions & 0 deletions src/app/services/crypto.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import {Injectable} from '@angular/core';
import {TextEncoder} from 'text-encoding-shim';
import {EOSJSService} from '../eosjs.service';

import * as CryptoJS from 'crypto-js';

@Injectable({
providedIn: 'root'
})
Expand Down Expand Up @@ -158,4 +160,23 @@ export class CryptoService {
}
}

createPIN(pin: string) {
const salt = CryptoJS.lib.WordArray['random'](128 / 8);
const hash = CryptoJS.PBKDF2(pin, salt, {keySize: 512 / 32, iterations: 1000}).toString();
localStorage.setItem('simpleos-salt', JSON.stringify(salt));
localStorage.setItem('simpleos-hash', hash);
}

unlock() {

}

lock() {

}

updatePIN() {

}

}
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,10 @@
version "0.7.0"
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"

"@types/crypto-js@^3.1.40":
version "3.1.40"
resolved "https://registry.yarnpkg.com/@types/crypto-js/-/crypto-js-3.1.40.tgz#4ce5f484af057b3013798bc28cd0516deba950d1"

"@types/jasmine@*", "@types/jasmine@~2.8.6":
version "2.8.8"
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
Expand Down Expand Up @@ -3228,6 +3232,10 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"

crypto-js@^3.1.9-1:
version "3.1.9-1"
resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"

crypto-random-string@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
Expand Down

0 comments on commit a7d15b3

Please sign in to comment.