Initial new UI source code import (#2607)
* address -> name mappings * expanding, loading all coin details * send use only actual BasicCoin tokens registered (any reg) * sending token & accounts * form styling updates * send form layout in place * coin send working as expected * api subscriptions on multiple addresses * bring in events * simplify * basic events display in-place, functionally complete * basic functionality in-place * fix horrible event address issue * rwork display of events slightly * test TLA availability * table for owner -> tokens * fix signature lookup address * fix signature lookup address * basic overview styling * txhash links * page layout adjustments * background import * adjust colors * no global registration, simplify color selection * updated styling * connection dialog for "busy connecting" * initial token connection - WIP * init token updates take place * basic test for manual token * rework connection display * allow updates of the secure token * first stab at making the build build * update runner tags * fix linting issues * skip tests requiring network (should be e2e, TODO) * re-enable javascript tag/runner * release push does the trick * push to any branch, CI name * javscript-test runner as well * swap dependencies build requires test * revert stages swap * retrieve images associated with tokens * remove js build deps order * null image when hash = 0x0 * 6x64 images (hashes for registries) * don't pass tokens as prop to IdentityIcon * check images against content hash pictures * cleanup signer after connection changes * fix naming typo * display unknownImages for balances (not available as content hash) * unknownImage for transfer dialog * basic githubhint layout * single input for commit/filename * ethcore_hashContent call * lookup hash * registration in place * fixes * events is using a proper table * pass value through as-is * stop wrongly using main app IdentityIcon * NEVER export class instance functions * alignment back to normal * typo in definition * set & get images working (mostly) * show content retrieval info * set exitcode via || * use javascript:latest images * disable npm progress bar * rename phase I * rename phase II * only send build output to GitHub on major branches * also run the build step as part of the test (until comprehensive) * ci-specific build (no webpack progress) * allow for account creation via recovery phrase * display account uuid (where available), closes #2546 * connection dialog now shows up in dapps as well, closes #2538 * token images show up as expected * IdentityName component added and deployed * fix padding tests * adjust tests to map to stricter 0x-prefixed hex * render names via common component for the address -> name * split lint into seperate script (early exit) * test phases changed to lint, test & pack * pack part of test phase * remove files marked for deletion (cleanup) * Signer cleanups, start moving in the direction of the rest * add personal signer methods * basic signer request subscription * don't poll blockNumber when not connected * missing return, creating massive ws queue backlogs * ΞTH -> ETH * fix failing tests * registry uses setAddress to actually set addresses now * bytes mapping operates on lowerCase hex strings * sha3 ids for each application * add dappreg to list of contracts * adjust alignment of queries * show gas estimation log * abi with payable for register function * add key as required * image retrieval from dappreg * use proper Image urls * embed and link apps from Parity, retrieved via /api/apps * filter apps that has been replaced * proxy entry for parity-utils * add basiccoin abi * add support for fallback abi type * capture constructor paramaters * merge master into js * move images to assets/images/ * add font assets * import fonts as part of build * don't inline woff files * Revert "merge master into js" This reverts commit cfcfa81bd26f1b3cbc748d3afa1eb5c670b363fe. * remove unused npm packages * information on gas estimates (like almost everywhere else) * don't pass gas & gasPrice to estimation * display account passwordhint when available * signer subscriptions based on polling & function trapping * pending requests retrieved via jsapi * update signer middleware * remove all web3 instances * remove web3 package * last web3 dependencies removed * no need to toChecksumAddress - api takes care of it * expand description for personal_confirmRequest * Signer conversion from web3 -> parity.js completed * explicit in no return * green circle background * remove generated background * convert /api/* paths to localhost:8080/api/* paths (hard-coded, temporary) * change dapps to load from localhost:8080/ui/* * remove dangling web3 files * update manager test for signer * /api/ping -> / * additional token images * additional token images * add missing styles.css for 8180 error pages * cater for txhash returning null/empty object * adjust output directories * Release merge with origin with ours strategy * additional token images * cater for development server * s/localhost/127.0.0.1/ (cater for origin) * Fix address selection for contract deployment * Adjust z-index for error overlay * better text on unique background pattern * fix signer rejections * Don't allow gavcoin transfer with no balance * fix txhash rendering in signer * remove unnecessary ParityBackground * script to update js-precompiled * Redirect from :8080 to :8180 * Remove extra return * Dapp logo images
This commit is contained in:
62
js/src/api/subscriptions/eth.js
Normal file
62
js/src/api/subscriptions/eth.js
Normal file
@@ -0,0 +1,62 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import BigNumber from 'bignumber.js';
|
||||
|
||||
export default class Eth {
|
||||
constructor (updateSubscriptions, api) {
|
||||
this._api = api;
|
||||
this._updateSubscriptions = updateSubscriptions;
|
||||
this._started = false;
|
||||
|
||||
this._lastBlock = new BigNumber(-1);
|
||||
}
|
||||
|
||||
get isStarted () {
|
||||
return this._started;
|
||||
}
|
||||
|
||||
start () {
|
||||
this._started = true;
|
||||
|
||||
return this._blockNumber();
|
||||
}
|
||||
|
||||
_blockNumber = () => {
|
||||
const nextTimeout = (timeout = 1000) => {
|
||||
setTimeout(() => {
|
||||
this._blockNumber();
|
||||
}, timeout);
|
||||
};
|
||||
|
||||
if (!this._api.transport.isConnected) {
|
||||
nextTimeout(500);
|
||||
return;
|
||||
}
|
||||
|
||||
return this._api.eth
|
||||
.blockNumber()
|
||||
.then((blockNumber) => {
|
||||
if (!blockNumber.eq(this._lastBlock)) {
|
||||
this._lastBlock = blockNumber;
|
||||
this._updateSubscriptions('eth_blockNumber', null, blockNumber);
|
||||
}
|
||||
|
||||
nextTimeout();
|
||||
})
|
||||
.catch(nextTimeout);
|
||||
}
|
||||
}
|
||||
101
js/src/api/subscriptions/eth.spec.js
Normal file
101
js/src/api/subscriptions/eth.spec.js
Normal file
@@ -0,0 +1,101 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import BigNumber from 'bignumber.js';
|
||||
import sinon from 'sinon';
|
||||
import 'sinon-as-promised';
|
||||
|
||||
import Eth from './eth';
|
||||
|
||||
const START_BLOCK = 5000;
|
||||
|
||||
function stubApi (blockNumber) {
|
||||
const _calls = {
|
||||
blockNumber: []
|
||||
};
|
||||
|
||||
return {
|
||||
_calls,
|
||||
transport: {
|
||||
isConnected: true
|
||||
},
|
||||
eth: {
|
||||
blockNumber: () => {
|
||||
const stub = sinon.stub().resolves(new BigNumber(blockNumber || START_BLOCK))();
|
||||
_calls.blockNumber.push(stub);
|
||||
return stub;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
describe('api/subscriptions/eth', () => {
|
||||
let api;
|
||||
let eth;
|
||||
let cb;
|
||||
|
||||
beforeEach(() => {
|
||||
api = stubApi();
|
||||
cb = sinon.stub();
|
||||
eth = new Eth(cb, api);
|
||||
});
|
||||
|
||||
describe('constructor', () => {
|
||||
it('starts the instance in a stopped state', () => {
|
||||
expect(eth.isStarted).to.be.false;
|
||||
});
|
||||
});
|
||||
|
||||
describe('start', () => {
|
||||
describe('blockNumber available', () => {
|
||||
beforeEach(() => {
|
||||
return eth.start();
|
||||
});
|
||||
|
||||
it('sets the started status', () => {
|
||||
expect(eth.isStarted).to.be.true;
|
||||
});
|
||||
|
||||
it('calls eth_blockNumber', () => {
|
||||
expect(api._calls.blockNumber.length).to.be.ok;
|
||||
});
|
||||
|
||||
it('updates subscribers', () => {
|
||||
expect(cb).to.have.been.calledWith('eth_blockNumber', null, new BigNumber(START_BLOCK));
|
||||
});
|
||||
});
|
||||
|
||||
describe('blockNumber not available', () => {
|
||||
beforeEach(() => {
|
||||
api = stubApi(-1);
|
||||
eth = new Eth(cb, api);
|
||||
return eth.start();
|
||||
});
|
||||
|
||||
it('sets the started status', () => {
|
||||
expect(eth.isStarted).to.be.true;
|
||||
});
|
||||
|
||||
it('calls eth_blockNumber', () => {
|
||||
expect(api._calls.blockNumber.length).to.be.ok;
|
||||
});
|
||||
|
||||
it('does not update subscribers', () => {
|
||||
expect(cb).not.to.been.called;
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
19
js/src/api/subscriptions/index.js
Normal file
19
js/src/api/subscriptions/index.js
Normal file
@@ -0,0 +1,19 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export Logging from './logging';
|
||||
|
||||
export default from './manager';
|
||||
44
js/src/api/subscriptions/logging.js
Normal file
44
js/src/api/subscriptions/logging.js
Normal file
@@ -0,0 +1,44 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
let instance = null;
|
||||
|
||||
export default class Logging {
|
||||
constructor (updateSubscriptions) {
|
||||
this._updateSubscriptions = updateSubscriptions;
|
||||
|
||||
instance = this;
|
||||
}
|
||||
|
||||
get isStarted () {
|
||||
return true;
|
||||
}
|
||||
|
||||
start () {
|
||||
}
|
||||
|
||||
static send (method, params, json) {
|
||||
if (!instance) {
|
||||
return;
|
||||
}
|
||||
|
||||
return instance._updateSubscriptions('logging', null, {
|
||||
method,
|
||||
params,
|
||||
json
|
||||
});
|
||||
}
|
||||
}
|
||||
49
js/src/api/subscriptions/logging.spec.js
Normal file
49
js/src/api/subscriptions/logging.spec.js
Normal file
@@ -0,0 +1,49 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import sinon from 'sinon';
|
||||
|
||||
import Logging from './logging';
|
||||
|
||||
describe('api/subscriptions/logging', () => {
|
||||
let cb;
|
||||
let logging;
|
||||
|
||||
beforeEach(() => {
|
||||
cb = sinon.stub();
|
||||
logging = new Logging(cb);
|
||||
});
|
||||
|
||||
describe('constructor', () => {
|
||||
it('starts the instance in a started state', () => {
|
||||
expect(logging.isStarted).to.be.true;
|
||||
});
|
||||
});
|
||||
|
||||
describe('send', () => {
|
||||
const method = 'method';
|
||||
const params = 'params';
|
||||
const json = 'json';
|
||||
|
||||
beforeEach(() => {
|
||||
Logging.send(method, params, json);
|
||||
});
|
||||
|
||||
it('calls the subscription update', () => {
|
||||
expect(cb).to.have.been.calledWith('logging', null, { method, params, json });
|
||||
});
|
||||
});
|
||||
});
|
||||
134
js/src/api/subscriptions/manager.js
Normal file
134
js/src/api/subscriptions/manager.js
Normal file
@@ -0,0 +1,134 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { isError } from '../util/types';
|
||||
|
||||
import Eth from './eth';
|
||||
import Logging from './logging';
|
||||
import Personal from './personal';
|
||||
import Signer from './signer';
|
||||
|
||||
const events = {
|
||||
'logging': { module: 'logging' },
|
||||
'eth_blockNumber': { module: 'eth' },
|
||||
'personal_accountsInfo': { module: 'personal' },
|
||||
'personal_listAccounts': { module: 'personal' },
|
||||
'personal_requestsToConfirm': { module: 'signer' }
|
||||
};
|
||||
|
||||
let nextSubscriptionId = 0;
|
||||
|
||||
export default class Manager {
|
||||
constructor (api) {
|
||||
this._api = api;
|
||||
|
||||
this.subscriptions = {};
|
||||
this.values = {};
|
||||
|
||||
Object.keys(events).forEach((subscriptionName) => {
|
||||
this.subscriptions[subscriptionName] = {};
|
||||
this.values[subscriptionName] = {
|
||||
error: null,
|
||||
data: null
|
||||
};
|
||||
});
|
||||
|
||||
this._logging = new Logging(this._updateSubscriptions);
|
||||
this._eth = new Eth(this._updateSubscriptions, api);
|
||||
this._personal = new Personal(this._updateSubscriptions, api, this);
|
||||
this._signer = new Signer(this._updateSubscriptions, api, this);
|
||||
}
|
||||
|
||||
_validateType (subscriptionName) {
|
||||
const subscription = events[subscriptionName];
|
||||
|
||||
if (!subscription) {
|
||||
return new Error(`${subscriptionName} is not a valid interface, subscribe using one of ${Object.keys(events).join(', ')}`);
|
||||
}
|
||||
|
||||
return subscription;
|
||||
}
|
||||
|
||||
subscribe (subscriptionName, callback) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const subscription = this._validateType(subscriptionName);
|
||||
|
||||
if (isError(subscription)) {
|
||||
reject(subscription);
|
||||
return;
|
||||
}
|
||||
|
||||
const subscriptionId = nextSubscriptionId++;
|
||||
const { error, data } = this.values[subscriptionName];
|
||||
const engine = this[`_${subscription.module}`];
|
||||
|
||||
this.subscriptions[subscriptionName][subscriptionId] = callback;
|
||||
|
||||
if (!engine.isStarted) {
|
||||
engine.start();
|
||||
} else {
|
||||
this._sendData(subscriptionName, subscriptionId, callback, error, data);
|
||||
}
|
||||
|
||||
resolve(subscriptionId);
|
||||
});
|
||||
}
|
||||
|
||||
unsubscribe (subscriptionName, subscriptionId) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const subscription = this._validateType(subscriptionName);
|
||||
|
||||
if (isError(subscription)) {
|
||||
reject(subscription);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.subscriptions[subscriptionName][subscriptionId]) {
|
||||
reject(new Error(`Cannot find subscription ${subscriptionId} for type ${subscriptionName}`));
|
||||
return;
|
||||
}
|
||||
|
||||
delete this.subscriptions[subscriptionName][subscriptionId];
|
||||
resolve();
|
||||
});
|
||||
}
|
||||
|
||||
_sendData (subscriptionName, subscriptionId, callback, error, data) {
|
||||
try {
|
||||
callback(error, data);
|
||||
} catch (error) {
|
||||
console.error(`Unable to update callback for ${subscriptionName}, subscriptionId ${subscriptionId}`, error);
|
||||
this.unsubscribe(subscriptionName, subscriptionId);
|
||||
}
|
||||
}
|
||||
|
||||
_updateSubscriptions = (subscriptionName, error, data) => {
|
||||
if (!this.subscriptions[subscriptionName]) {
|
||||
throw new Error(`Cannot find entry point for subscriptions of type ${subscriptionName}`);
|
||||
}
|
||||
|
||||
this.values[subscriptionName] = { error, data };
|
||||
Object.keys(this.subscriptions[subscriptionName]).forEach((subscriptionId) => {
|
||||
const callback = this.subscriptions[subscriptionName][subscriptionId];
|
||||
|
||||
this._sendData(subscriptionName, subscriptionId, callback, error, data);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export {
|
||||
events
|
||||
};
|
||||
98
js/src/api/subscriptions/manager.spec.js
Normal file
98
js/src/api/subscriptions/manager.spec.js
Normal file
@@ -0,0 +1,98 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import sinon from 'sinon';
|
||||
|
||||
import Manager, { events } from './manager';
|
||||
|
||||
function newStub () {
|
||||
const start = () => manager._updateSubscriptions(manager.__test, null, 'test');
|
||||
const manager = new Manager({
|
||||
transport: {
|
||||
isConnected: true
|
||||
}
|
||||
});
|
||||
|
||||
manager._eth = {
|
||||
isStarted: false,
|
||||
start
|
||||
};
|
||||
|
||||
manager._personal = {
|
||||
isStarted: false,
|
||||
start
|
||||
};
|
||||
|
||||
manager._signer = {
|
||||
isStarted: false,
|
||||
start
|
||||
};
|
||||
|
||||
return manager;
|
||||
}
|
||||
|
||||
describe('api/subscriptions/manager', () => {
|
||||
let manager;
|
||||
|
||||
beforeEach(() => {
|
||||
manager = newStub();
|
||||
});
|
||||
|
||||
describe('constructor', () => {
|
||||
it('sets up the subscription types & defaults', () => {
|
||||
expect(Object.keys(manager.subscriptions)).to.deep.equal(Object.keys(events));
|
||||
expect(Object.keys(manager.values)).to.deep.equal(Object.keys(events));
|
||||
});
|
||||
});
|
||||
|
||||
describe('subscriptions', () => {
|
||||
Object
|
||||
.keys(events)
|
||||
.filter((eventName) => eventName.indexOf('_') !== -1)
|
||||
.forEach((eventName) => {
|
||||
const { module } = events[eventName];
|
||||
let engine;
|
||||
let cb;
|
||||
let subscriptionId;
|
||||
|
||||
describe(eventName, () => {
|
||||
beforeEach(() => {
|
||||
engine = manager[`_${module}`];
|
||||
manager.__test = eventName;
|
||||
cb = sinon.stub();
|
||||
sinon.spy(engine, 'start');
|
||||
return manager
|
||||
.subscribe(eventName, cb)
|
||||
.then((_subscriptionId) => {
|
||||
subscriptionId = _subscriptionId;
|
||||
});
|
||||
});
|
||||
|
||||
it(`puts the ${module} engine in a started state`, () => {
|
||||
expect(engine.start).to.have.been.called;
|
||||
});
|
||||
|
||||
it('returns a subscriptionId', () => {
|
||||
expect(subscriptionId).to.be.ok;
|
||||
});
|
||||
|
||||
it('calls the subscription callback with updated values', () => {
|
||||
expect(cb).to.have.been.calledWith(null, 'test');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
77
js/src/api/subscriptions/personal.js
Normal file
77
js/src/api/subscriptions/personal.js
Normal file
@@ -0,0 +1,77 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default class Personal {
|
||||
constructor (updateSubscriptions, api, subscriber) {
|
||||
this._subscriber = subscriber;
|
||||
this._api = api;
|
||||
this._updateSubscriptions = updateSubscriptions;
|
||||
this._started = false;
|
||||
}
|
||||
|
||||
get isStarted () {
|
||||
return this._started;
|
||||
}
|
||||
|
||||
start () {
|
||||
this._started = true;
|
||||
|
||||
return Promise.all([
|
||||
this._listAccounts(),
|
||||
this._accountsInfo(),
|
||||
this._loggingSubscribe()
|
||||
]);
|
||||
}
|
||||
|
||||
_listAccounts = () => {
|
||||
return this._api.personal
|
||||
.listAccounts()
|
||||
.then((accounts) => {
|
||||
this._updateSubscriptions('personal_listAccounts', null, accounts);
|
||||
});
|
||||
}
|
||||
|
||||
_accountsInfo = () => {
|
||||
return this._api.personal
|
||||
.accountsInfo()
|
||||
.then((info) => {
|
||||
this._updateSubscriptions('personal_accountsInfo', null, info);
|
||||
});
|
||||
}
|
||||
|
||||
_loggingSubscribe () {
|
||||
return this._subscriber.subscribe('logging', (error, data) => {
|
||||
if (error || !data) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (data.method) {
|
||||
case 'personal_importGethAccounts':
|
||||
case 'personal_newAccount':
|
||||
case 'personal_newAccountFromPhrase':
|
||||
case 'personal_newAccountFromWallet':
|
||||
this._listAccounts();
|
||||
this._accountsInfo();
|
||||
return;
|
||||
|
||||
case 'personal_setAccountName':
|
||||
case 'personal_setAccountMeta':
|
||||
this._accountsInfo();
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
122
js/src/api/subscriptions/personal.spec.js
Normal file
122
js/src/api/subscriptions/personal.spec.js
Normal file
@@ -0,0 +1,122 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import sinon from 'sinon';
|
||||
import 'sinon-as-promised';
|
||||
|
||||
import Personal from './personal';
|
||||
|
||||
const TEST_INFO = {
|
||||
'0xfa64203C044691aA57251aF95f4b48d85eC00Dd5': {
|
||||
name: 'test'
|
||||
}
|
||||
};
|
||||
const TEST_LIST = ['0xfa64203C044691aA57251aF95f4b48d85eC00Dd5'];
|
||||
|
||||
function stubApi (accounts, info) {
|
||||
const _calls = {
|
||||
accountsInfo: [],
|
||||
listAccounts: []
|
||||
};
|
||||
|
||||
return {
|
||||
_calls,
|
||||
personal: {
|
||||
accountsInfo: () => {
|
||||
const stub = sinon.stub().resolves(info || TEST_INFO)();
|
||||
_calls.accountsInfo.push(stub);
|
||||
return stub;
|
||||
},
|
||||
|
||||
listAccounts: () => {
|
||||
const stub = sinon.stub().resolves(accounts || TEST_LIST)();
|
||||
_calls.listAccounts.push(stub);
|
||||
return stub;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function stubLogging () {
|
||||
return {
|
||||
subscribe: sinon.stub()
|
||||
};
|
||||
}
|
||||
|
||||
describe('api/subscriptions/personal', () => {
|
||||
let api;
|
||||
let cb;
|
||||
let logging;
|
||||
let personal;
|
||||
|
||||
beforeEach(() => {
|
||||
api = stubApi();
|
||||
cb = sinon.stub();
|
||||
logging = stubLogging();
|
||||
personal = new Personal(cb, api, logging);
|
||||
});
|
||||
|
||||
describe('constructor', () => {
|
||||
it('starts the instance in a stopped state', () => {
|
||||
expect(personal.isStarted).to.be.false;
|
||||
});
|
||||
});
|
||||
|
||||
describe('start', () => {
|
||||
describe('info available', () => {
|
||||
beforeEach(() => {
|
||||
return personal.start();
|
||||
});
|
||||
|
||||
it('sets the started status', () => {
|
||||
expect(personal.isStarted).to.be.true;
|
||||
});
|
||||
|
||||
it('calls personal_accountsInfo', () => {
|
||||
expect(api._calls.accountsInfo.length).to.be.ok;
|
||||
});
|
||||
|
||||
it('calls personal_listAccounts', () => {
|
||||
expect(api._calls.listAccounts.length).to.be.ok;
|
||||
});
|
||||
|
||||
it('updates subscribers', () => {
|
||||
expect(cb.firstCall).to.have.been.calledWith('personal_listAccounts', null, TEST_LIST);
|
||||
expect(cb.secondCall).to.have.been.calledWith('personal_accountsInfo', null, TEST_INFO);
|
||||
});
|
||||
});
|
||||
|
||||
describe('info not available', () => {
|
||||
beforeEach(() => {
|
||||
api = stubApi([], {});
|
||||
personal = new Personal(cb, api, logging);
|
||||
return personal.start();
|
||||
});
|
||||
|
||||
it('sets the started status', () => {
|
||||
expect(personal.isStarted).to.be.true;
|
||||
});
|
||||
|
||||
it('calls personal_accountsInfo', () => {
|
||||
expect(api._calls.accountsInfo.length).to.be.ok;
|
||||
});
|
||||
|
||||
it('calls personal_listAccounts', () => {
|
||||
expect(api._calls.listAccounts.length).to.be.ok;
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
76
js/src/api/subscriptions/signer.js
Normal file
76
js/src/api/subscriptions/signer.js
Normal file
@@ -0,0 +1,76 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default class Signer {
|
||||
constructor (updateSubscriptions, api, subscriber) {
|
||||
this._subscriber = subscriber;
|
||||
this._api = api;
|
||||
this._updateSubscriptions = updateSubscriptions;
|
||||
this._started = false;
|
||||
}
|
||||
|
||||
get isStarted () {
|
||||
return this._started;
|
||||
}
|
||||
|
||||
start () {
|
||||
this._started = true;
|
||||
|
||||
return Promise.all([
|
||||
this._listRequests(true),
|
||||
this._loggingSubscribe()
|
||||
]);
|
||||
}
|
||||
|
||||
_listRequests = (doTimeout) => {
|
||||
const nextTimeout = (timeout = 1000) => {
|
||||
if (doTimeout) {
|
||||
setTimeout(() => {
|
||||
this._listRequests(true);
|
||||
}, timeout);
|
||||
}
|
||||
};
|
||||
|
||||
if (!this._api.transport.isConnected) {
|
||||
nextTimeout(500);
|
||||
return;
|
||||
}
|
||||
|
||||
return this._api.personal
|
||||
.requestsToConfirm()
|
||||
.then((requests) => {
|
||||
this._updateSubscriptions('personal_requestsToConfirm', null, requests);
|
||||
nextTimeout();
|
||||
})
|
||||
.catch(nextTimeout);
|
||||
}
|
||||
|
||||
_loggingSubscribe () {
|
||||
return this._subscriber.subscribe('logging', (error, data) => {
|
||||
if (error || !data) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (data.method) {
|
||||
case 'eth_postTransaction':
|
||||
case 'eth_sendTranasction':
|
||||
case 'eth_sendRawTransaction':
|
||||
this._listRequests(false);
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user