2017-01-25 18:51:41 +01:00
|
|
|
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
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
2016-10-18 11:52:56 +02:00
|
|
|
// 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/>.
|
|
|
|
|
2016-12-21 15:12:40 +01:00
|
|
|
import { uniq } from 'lodash';
|
2017-01-23 13:04:08 +01:00
|
|
|
import store from 'store';
|
2016-12-21 15:12:40 +01:00
|
|
|
|
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
2016-10-18 11:52:56 +02:00
|
|
|
import Api from './api';
|
2017-01-12 14:25:32 +01:00
|
|
|
import { LOG_KEYS, getLogger } from '~/config';
|
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
2016-10-18 11:52:56 +02:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
const log = getLogger(LOG_KEYS.Signer);
|
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
2016-10-18 11:52:56 +02:00
|
|
|
|
|
|
|
export default class SecureApi extends Api {
|
2017-01-12 14:25:32 +01:00
|
|
|
_isConnecting = false;
|
|
|
|
_needsToken = false;
|
|
|
|
_tokens = [];
|
2017-06-04 12:34:03 +02:00
|
|
|
_uiApi = null;
|
2017-01-12 14:25:32 +01:00
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
_dappsUrl = null;
|
|
|
|
_wsUrl = null;
|
2017-06-04 12:34:03 +02:00
|
|
|
_url = null;
|
2017-01-12 14:25:32 +01:00
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
static getTransport (url, sysuiToken, protocol) {
|
2017-06-04 12:34:03 +02:00
|
|
|
const transportUrl = SecureApi.transportUrl(url, protocol);
|
|
|
|
|
|
|
|
return new Api.Transport.Ws(transportUrl, sysuiToken, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
static transportUrl (url, protocol) {
|
2017-05-24 12:24:07 +02:00
|
|
|
const proto = protocol() === 'https:' ? 'wss:' : 'ws:';
|
|
|
|
|
2017-06-04 12:34:03 +02:00
|
|
|
return `${proto}//${url}`;
|
2017-05-24 12:24:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Returns a protocol with `:` at the end.
|
|
|
|
static protocol () {
|
|
|
|
return window.location.protocol;
|
2017-01-23 13:04:08 +01:00
|
|
|
}
|
|
|
|
|
2017-06-04 12:34:03 +02:00
|
|
|
constructor (uiUrl, nextToken, getTransport = SecureApi.getTransport, protocol = SecureApi.protocol) {
|
2017-01-23 13:04:08 +01:00
|
|
|
const sysuiToken = store.get('sysuiToken');
|
2017-06-04 12:34:03 +02:00
|
|
|
const transport = getTransport(uiUrl, sysuiToken, protocol);
|
2017-01-23 13:04:08 +01:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
super(transport);
|
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
2016-10-18 11:52:56 +02:00
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
this.protocol = protocol;
|
2017-06-04 12:34:03 +02:00
|
|
|
this._url = uiUrl;
|
|
|
|
this._uiApi = new Api(new Api.Transport.Http(`${this.protocol()}//${this._url}/rpc`, 0), false);
|
|
|
|
this._wsUrl = uiUrl;
|
2017-01-23 13:04:08 +01:00
|
|
|
// Try tokens from localStorage, from hash and 'initial'
|
2016-12-21 15:12:40 +01:00
|
|
|
this._tokens = uniq([sysuiToken, nextToken, 'initial'])
|
|
|
|
.filter((token) => token)
|
|
|
|
.map((token) => ({ value: token, tried: false }));
|
2016-11-08 23:17:33 +01:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
// When the transport is closed, try to reconnect
|
|
|
|
transport.on('close', this.connect, this);
|
2017-03-28 14:34:31 +02:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
this.connect();
|
|
|
|
}
|
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
get _dappsAddress () {
|
|
|
|
if (!this._dappsUrl) {
|
|
|
|
return {
|
|
|
|
host: null,
|
|
|
|
port: 8545
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
const [host, port] = this._dappsUrl.split(':');
|
|
|
|
|
|
|
|
return {
|
|
|
|
host,
|
|
|
|
port: parseInt(port, 10)
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
get dappsPort () {
|
2017-05-24 12:24:07 +02:00
|
|
|
return this._dappsAddress.port;
|
2017-01-12 14:25:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
get dappsUrl () {
|
2017-05-24 12:24:07 +02:00
|
|
|
const { port } = this._dappsAddress;
|
|
|
|
|
|
|
|
return `${this.protocol()}//${this.hostname}:${port}`;
|
2017-01-12 14:25:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
get hostname () {
|
|
|
|
if (window.location.hostname === 'home.parity') {
|
|
|
|
return 'dapps.parity';
|
|
|
|
}
|
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
const { host } = this._dappsAddress;
|
|
|
|
|
|
|
|
if (!host || host === '0.0.0.0') {
|
2017-01-12 14:25:32 +01:00
|
|
|
return window.location.hostname;
|
|
|
|
}
|
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
return host;
|
2017-01-12 14:25:32 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
get isConnecting () {
|
|
|
|
return this._isConnecting;
|
|
|
|
}
|
|
|
|
|
|
|
|
get isConnected () {
|
|
|
|
return this._transport.isConnected;
|
|
|
|
}
|
|
|
|
|
|
|
|
get needsToken () {
|
|
|
|
return this._needsToken;
|
|
|
|
}
|
|
|
|
|
|
|
|
get secureToken () {
|
|
|
|
return this._transport.token;
|
|
|
|
}
|
|
|
|
|
|
|
|
connect () {
|
|
|
|
if (this._isConnecting) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
log.debug('trying to connect...');
|
|
|
|
|
|
|
|
this._isConnecting = true;
|
|
|
|
|
|
|
|
this.emit('connecting');
|
|
|
|
|
|
|
|
// Reset the tested Tokens
|
|
|
|
this._resetTokens();
|
|
|
|
|
|
|
|
// Try to connect
|
|
|
|
return this._connect()
|
|
|
|
.then((connected) => {
|
|
|
|
this._isConnecting = false;
|
|
|
|
|
|
|
|
if (connected) {
|
|
|
|
const token = this.secureToken;
|
2017-01-23 13:39:52 +01:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
log.debug('got connected ; saving token', token);
|
|
|
|
|
|
|
|
// Save the sucessful token
|
|
|
|
this._saveToken(token);
|
|
|
|
this._needsToken = false;
|
|
|
|
|
|
|
|
// Emit the connected event
|
|
|
|
return this.emit('connected');
|
|
|
|
}
|
|
|
|
|
|
|
|
// If not connected, we need a new token
|
|
|
|
log.debug('needs a token');
|
|
|
|
this._needsToken = true;
|
|
|
|
|
|
|
|
return this.emit('disconnected');
|
|
|
|
})
|
|
|
|
.catch((error) => {
|
|
|
|
this._isConnecting = false;
|
|
|
|
|
|
|
|
log.debug('emitting "disconnected"');
|
|
|
|
this.emit('disconnected');
|
|
|
|
console.error('unhandled error in secureApi', error);
|
|
|
|
});
|
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
2016-10-18 11:52:56 +02:00
|
|
|
}
|
|
|
|
|
2016-12-21 15:12:40 +01:00
|
|
|
/**
|
|
|
|
* Returns a Promise that gets resolved with
|
|
|
|
* a boolean: `true` if the node is up, `false`
|
2017-01-12 14:25:32 +01:00
|
|
|
* otherwise (HEAD request to the Node)
|
2016-12-21 15:12:40 +01:00
|
|
|
*/
|
2017-01-12 14:25:32 +01:00
|
|
|
isNodeUp () {
|
2017-06-04 12:34:03 +02:00
|
|
|
return fetch(`${this.protocol()}//${this._url}/api/ping`, { method: 'HEAD' })
|
2016-11-23 18:20:18 +01:00
|
|
|
.then(
|
|
|
|
(r) => r.status === 200,
|
|
|
|
() => false
|
|
|
|
)
|
|
|
|
.catch(() => false);
|
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
/**
|
|
|
|
* Update the given token, ie. add it to the token
|
|
|
|
* list, and then try to connect (if not already connecting)
|
|
|
|
*/
|
|
|
|
updateToken (_token) {
|
|
|
|
const token = this._sanitiseToken(_token);
|
2017-01-23 13:39:52 +01:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
log.debug('updating token', token);
|
|
|
|
|
|
|
|
// Update the tokens list: put the new one on first position
|
|
|
|
this._tokens = [ { value: token, tried: false } ].concat(this._tokens);
|
|
|
|
|
|
|
|
// Try to connect with the new token added
|
|
|
|
return this.connect();
|
2016-12-21 15:12:40 +01:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
/**
|
|
|
|
* Try to connect to the Node with the next Token in
|
|
|
|
* the list
|
|
|
|
*/
|
|
|
|
_connect () {
|
|
|
|
log.debug('trying next token');
|
2016-12-21 15:12:40 +01:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
// Get the first not-tried token
|
|
|
|
const nextToken = this._getNextToken();
|
|
|
|
|
|
|
|
// If no more tokens to try, user has to enter a new one
|
|
|
|
if (!nextToken) {
|
|
|
|
return Promise.resolve(false);
|
2016-12-21 15:12:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
nextToken.tried = true;
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
return this._connectWithToken(nextToken.value)
|
|
|
|
.then((validToken) => {
|
|
|
|
// If not valid, try again with the next token in the list
|
|
|
|
if (!validToken) {
|
|
|
|
return this._connect();
|
|
|
|
}
|
|
|
|
|
|
|
|
// If correct and valid token, wait until the Node is ready
|
|
|
|
// and resolve as connected
|
|
|
|
return this._waitUntilNodeReady()
|
|
|
|
.then(() => true);
|
|
|
|
})
|
|
|
|
.catch((error) => {
|
|
|
|
log.error('unkown error in _connect', error);
|
|
|
|
return false;
|
|
|
|
});
|
2016-12-21 15:12:40 +01:00
|
|
|
}
|
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
2016-10-18 11:52:56 +02:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
/**
|
|
|
|
* Connect with the given token.
|
|
|
|
* It returns a Promise that gets resolved
|
|
|
|
* with `validToken` as argument, whether the given token
|
|
|
|
* is valid or not
|
|
|
|
*/
|
|
|
|
_connectWithToken (_token) {
|
|
|
|
// Sanitize the token first
|
|
|
|
const token = this._sanitiseToken(_token);
|
2016-12-21 15:12:40 +01:00
|
|
|
|
2017-06-04 12:34:03 +02:00
|
|
|
const connectPromise = this._fetchSettings()
|
|
|
|
.then(() => {
|
|
|
|
// Update the URL and token in the transport layer
|
|
|
|
this.transport.url = SecureApi.transportUrl(this._wsUrl, this.protocol);
|
|
|
|
this.transport.updateToken(token, false);
|
|
|
|
|
|
|
|
log.debug('connecting with token', token);
|
2017-01-12 14:25:32 +01:00
|
|
|
|
2017-06-04 12:34:03 +02:00
|
|
|
return this.transport.connect();
|
|
|
|
})
|
2016-12-21 15:12:40 +01:00
|
|
|
.then(() => {
|
2017-01-12 14:25:32 +01:00
|
|
|
log.debug('connected with', token);
|
|
|
|
|
2016-12-21 15:12:40 +01:00
|
|
|
if (token === 'initial') {
|
2017-01-12 14:25:32 +01:00
|
|
|
return this._generateAuthorizationToken();
|
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
2016-10-18 11:52:56 +02:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
// The token is valid !
|
2016-12-21 15:12:40 +01:00
|
|
|
return true;
|
|
|
|
})
|
2017-01-12 14:25:32 +01:00
|
|
|
.catch((error) => {
|
|
|
|
// Log if it's not a close error (ie. wrong token)
|
|
|
|
if (error && error.type !== 'close') {
|
|
|
|
log.debug('did not connect ; error', error);
|
|
|
|
}
|
|
|
|
|
2017-03-21 17:01:33 +01:00
|
|
|
return false;
|
|
|
|
});
|
|
|
|
|
|
|
|
return Promise
|
|
|
|
.all([
|
|
|
|
connectPromise,
|
|
|
|
this.isNodeUp()
|
|
|
|
])
|
|
|
|
.then(([ connected, isNodeUp ]) => {
|
|
|
|
if (connected) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If it's not up, try again in a few...
|
|
|
|
if (!isNodeUp) {
|
|
|
|
const timeout = this.transport.retryTimeout;
|
|
|
|
|
|
|
|
log.debug('node is not up ; will try again in', timeout, 'ms');
|
|
|
|
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
window.setTimeout(() => {
|
|
|
|
this._connectWithToken(token).then(resolve).catch(reject);
|
|
|
|
}, timeout);
|
2016-12-21 15:12:40 +01:00
|
|
|
});
|
2017-03-21 17:01:33 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// The token is invalid
|
|
|
|
log.debug('tried with a wrong token', token);
|
|
|
|
return false;
|
2016-12-21 15:12:40 +01:00
|
|
|
});
|
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
2016-10-18 11:52:56 +02:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
/**
|
|
|
|
* Retrieve the correct ports from the Node
|
|
|
|
*/
|
|
|
|
_fetchSettings () {
|
|
|
|
return Promise
|
2016-11-04 23:08:12 +01:00
|
|
|
.all([
|
2017-06-04 12:34:03 +02:00
|
|
|
this._uiApi.parity.dappsUrl(),
|
|
|
|
this._uiApi.parity.wsUrl()
|
2016-11-04 23:08:12 +01:00
|
|
|
])
|
2017-05-24 12:24:07 +02:00
|
|
|
.then(([dappsUrl, wsUrl]) => {
|
|
|
|
this._dappsUrl = dappsUrl;
|
2017-06-04 12:34:03 +02:00
|
|
|
this._wsUrl = wsUrl;
|
2016-11-04 23:08:12 +01:00
|
|
|
});
|
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
2016-10-18 11:52:56 +02:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
/**
|
|
|
|
* Try to generate an Authorization Token.
|
|
|
|
* Then try to connect with the new token.
|
|
|
|
*/
|
|
|
|
_generateAuthorizationToken () {
|
|
|
|
return this.signer
|
|
|
|
.generateAuthorizationToken()
|
|
|
|
.then((token) => this._connectWithToken(token));
|
2016-11-04 23:08:12 +01:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
/**
|
|
|
|
* Get the next token to try, if any left
|
|
|
|
*/
|
|
|
|
_getNextToken () {
|
|
|
|
// Get the first not-tried token
|
|
|
|
const nextTokenIndex = this._tokens.findIndex((t) => !t.tried);
|
2016-11-10 20:45:03 +01:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
// If no more tokens to try, user has to enter a new one
|
|
|
|
if (nextTokenIndex < 0) {
|
|
|
|
return null;
|
2016-11-10 20:45:03 +01:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
const nextToken = this._tokens[nextTokenIndex];
|
2017-01-23 13:39:52 +01:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
return nextToken;
|
2016-11-04 23:08:12 +01:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
_resetTokens () {
|
|
|
|
this._tokens = this._tokens.map((token) => ({
|
|
|
|
...token,
|
|
|
|
tried: false
|
|
|
|
}));
|
2016-11-04 23:08:12 +01:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
_sanitiseToken (token) {
|
|
|
|
return token.replace(/[^a-zA-Z0-9]/g, '');
|
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
2016-10-18 11:52:56 +02:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
_saveToken (token) {
|
2017-01-23 13:04:08 +01:00
|
|
|
store.set('sysuiToken', token);
|
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
2016-10-18 11:52:56 +02:00
|
|
|
}
|
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
/**
|
|
|
|
* Promise gets resolved when the node is up
|
|
|
|
* and running (it might take some time before
|
|
|
|
* the node is actually ready even when the client
|
|
|
|
* is connected).
|
|
|
|
*
|
2017-03-10 19:40:47 +01:00
|
|
|
* We check that the `parity_netChain` RPC calls
|
2017-01-12 14:25:32 +01:00
|
|
|
* returns successfully
|
|
|
|
*/
|
|
|
|
_waitUntilNodeReady (_timeleft) {
|
|
|
|
// Default timeout to 30 seconds
|
|
|
|
const timeleft = Number.isFinite(_timeleft)
|
|
|
|
? _timeleft
|
|
|
|
: 30 * 1000;
|
|
|
|
|
|
|
|
// After timeout, just resolve the promise...
|
|
|
|
if (timeleft <= 0) {
|
|
|
|
console.warn('node is still not ready after 30 seconds...');
|
|
|
|
return Promise.resolve(true);
|
|
|
|
}
|
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
2016-10-18 11:52:56 +02:00
|
|
|
|
2017-01-12 14:25:32 +01:00
|
|
|
const start = Date.now();
|
|
|
|
|
|
|
|
return this
|
2017-03-10 19:40:47 +01:00
|
|
|
.parity.netChain()
|
2017-01-12 14:25:32 +01:00
|
|
|
.then(() => true)
|
|
|
|
.catch((error) => {
|
|
|
|
if (!error) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (error.type !== 'NETWORK_DISABLED') {
|
|
|
|
throw error;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Timeout between 250ms and 750ms
|
|
|
|
const timeout = Math.floor(250 + (500 * Math.random()));
|
|
|
|
|
|
|
|
log.debug('waiting until node is ready', 'retry in', timeout, 'ms');
|
|
|
|
|
|
|
|
// Retry in a few...
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
window.setTimeout(() => {
|
|
|
|
const duration = Date.now() - start;
|
|
|
|
|
|
|
|
this._waitUntilNodeReady(timeleft - duration).then(resolve).catch(reject);
|
|
|
|
}, timeout);
|
|
|
|
});
|
|
|
|
});
|
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
2016-10-18 11:52:56 +02:00
|
|
|
}
|
|
|
|
}
|