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/>.
|
|
|
|
|
|
|
|
import * as actions from './signerActions';
|
|
|
|
|
2017-04-21 11:40:22 +02:00
|
|
|
import { inHex } from '@parity/api/format/input';
|
2017-05-09 12:01:44 +02:00
|
|
|
import HardwareStore from '@parity/shared/mobx/hardwareStore';
|
|
|
|
import { Signer } from '@parity/shared/util/signer';
|
2017-04-21 11:40:22 +02:00
|
|
|
|
2017-07-21 15:46:53 +02:00
|
|
|
// FIXME: We should not import from shell
|
|
|
|
import { createSignedTx } from '~/src/Signer/utils/qrscan';
|
2017-05-04 10:40:52 +02: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
|
|
|
export default class SignerMiddleware {
|
|
|
|
constructor (api) {
|
|
|
|
this._api = api;
|
2017-03-02 23:51:56 +01:00
|
|
|
this._hwstore = HardwareStore.get(api);
|
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
|
|
|
}
|
|
|
|
|
|
|
|
toMiddleware () {
|
|
|
|
return (store) => (next) => (action) => {
|
|
|
|
let delegate;
|
|
|
|
|
|
|
|
switch (action.type) {
|
|
|
|
case 'signerStartConfirmRequest':
|
|
|
|
delegate = this.onConfirmStart;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'signerStartRejectRequest':
|
|
|
|
delegate = this.onRejectStart;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
next(action);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!delegate) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
next(action);
|
|
|
|
delegate(store, action);
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2017-03-02 23:51:56 +01:00
|
|
|
_createConfirmPromiseHandler (store, id) {
|
|
|
|
return (promise) => {
|
|
|
|
return promise
|
2016-11-10 11:27:05 +01:00
|
|
|
.then((txHash) => {
|
|
|
|
if (!txHash) {
|
|
|
|
store.dispatch(actions.errorConfirmRequest({ id, err: 'Unable to confirm.' }));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
store.dispatch(actions.successConfirmRequest({ id, txHash }));
|
|
|
|
})
|
|
|
|
.catch((error) => {
|
|
|
|
console.error('confirmRequest', id, error);
|
|
|
|
store.dispatch(actions.errorConfirmRequest({ id, err: error.message }));
|
|
|
|
});
|
|
|
|
};
|
2017-03-02 23:51:56 +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-03-02 23:51:56 +01:00
|
|
|
createNoncePromise (transaction) {
|
|
|
|
return !transaction.nonce || transaction.nonce.isZero()
|
|
|
|
? this._api.parity.nextNonce(transaction.from)
|
|
|
|
: Promise.resolve(transaction.nonce);
|
|
|
|
}
|
2017-01-09 11:14:36 +01:00
|
|
|
|
2017-03-02 23:51:56 +01:00
|
|
|
confirmLedgerTransaction (store, id, transaction) {
|
|
|
|
return this
|
|
|
|
.createNoncePromise(transaction)
|
|
|
|
.then((nonce) => {
|
|
|
|
transaction.nonce = nonce;
|
|
|
|
|
|
|
|
return this._hwstore.signLedger(transaction);
|
|
|
|
})
|
|
|
|
.then((rawTx) => {
|
2017-04-27 18:23:22 +02:00
|
|
|
return this.confirmRawRequest(store, id, rawTx);
|
2017-03-02 23:51:56 +01:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2017-04-27 18:23:22 +02:00
|
|
|
confirmRawRequest (store, id, rawData) {
|
2017-03-02 23:51:56 +01:00
|
|
|
const handlePromise = this._createConfirmPromiseHandler(store, id);
|
2017-03-31 23:36:24 +02:00
|
|
|
|
2017-04-27 18:23:22 +02:00
|
|
|
return handlePromise(this._api.signer.confirmRequestRaw(id, rawData));
|
|
|
|
}
|
|
|
|
|
|
|
|
confirmSignedData (store, id, dataSigned) {
|
|
|
|
const { signature } = dataSigned;
|
|
|
|
|
|
|
|
return this.confirmRawRequest(store, id, signature);
|
2017-03-31 23:36:24 +02:00
|
|
|
}
|
|
|
|
|
2017-05-15 18:59:41 +02:00
|
|
|
confirmDecryptedMsg (store, id, decrypted) {
|
|
|
|
const { msg } = decrypted;
|
|
|
|
|
|
|
|
return this.confirmRawRequest(store, id, msg);
|
|
|
|
}
|
|
|
|
|
2017-03-31 23:36:24 +02:00
|
|
|
confirmSignedTransaction (store, id, txSigned) {
|
|
|
|
const { netVersion } = store.getState().nodeStatus;
|
|
|
|
const { signature, tx } = txSigned;
|
|
|
|
const { rlp } = createSignedTx(netVersion, signature, tx);
|
|
|
|
|
2017-04-27 18:23:22 +02:00
|
|
|
return this.confirmRawRequest(store, id, rlp);
|
2017-03-31 23:36:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
confirmWalletTransaction (store, id, transaction, wallet, password) {
|
2017-03-02 23:51:56 +01:00
|
|
|
const { worker } = store.getState().worker;
|
|
|
|
|
|
|
|
const signerPromise = worker && worker._worker.state === 'activated'
|
|
|
|
? worker
|
|
|
|
.postMessage({
|
|
|
|
action: 'getSignerSeed',
|
|
|
|
data: { wallet, password }
|
2017-01-09 11:14:36 +01:00
|
|
|
})
|
2017-03-02 23:51:56 +01:00
|
|
|
.then((result) => {
|
|
|
|
const seed = Buffer.from(result.data);
|
|
|
|
|
|
|
|
return new Signer(seed);
|
2017-01-09 11:14:36 +01:00
|
|
|
})
|
2017-03-02 23:51:56 +01:00
|
|
|
: Signer.fromJson(wallet, password);
|
|
|
|
|
|
|
|
// NOTE: Derving the key takes significant amount of time,
|
|
|
|
// make sure to display some kind of "in-progress" state.
|
|
|
|
return Promise
|
|
|
|
.all([ signerPromise, this.createNoncePromise(transaction) ])
|
|
|
|
.then(([ signer, nonce ]) => {
|
|
|
|
const txData = {
|
|
|
|
to: inHex(transaction.to),
|
|
|
|
nonce: inHex(transaction.nonce.isZero() ? nonce : transaction.nonce),
|
|
|
|
gasPrice: inHex(transaction.gasPrice),
|
|
|
|
gasLimit: inHex(transaction.gas),
|
|
|
|
value: inHex(transaction.value),
|
|
|
|
data: inHex(transaction.data)
|
|
|
|
};
|
|
|
|
|
|
|
|
return signer.signTransaction(txData);
|
|
|
|
})
|
|
|
|
.then((rawTx) => {
|
2017-04-27 18:23:22 +02:00
|
|
|
return this.confirmRawRequest(store, id, rawTx);
|
2017-03-02 23:51:56 +01:00
|
|
|
})
|
|
|
|
.catch((error) => {
|
|
|
|
console.error(error.message);
|
|
|
|
store.dispatch(actions.errorConfirmRequest({ id, err: error.message }));
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
onConfirmStart = (store, action) => {
|
2017-05-15 18:59:41 +02:00
|
|
|
const { condition, gas = 0, gasPrice = 0, id, password, payload, txSigned, dataSigned, decrypted, wallet } = action.payload;
|
2017-03-02 23:51:56 +01:00
|
|
|
const handlePromise = this._createConfirmPromiseHandler(store, id);
|
|
|
|
const transaction = payload.sendTransaction || payload.signTransaction;
|
|
|
|
|
|
|
|
if (transaction) {
|
|
|
|
const hardwareAccount = this._hwstore.wallets[transaction.from];
|
|
|
|
|
|
|
|
if (wallet) {
|
|
|
|
return this.confirmWalletTransaction(store, id, transaction, wallet, password);
|
2017-03-31 23:36:24 +02:00
|
|
|
} else if (txSigned) {
|
|
|
|
return this.confirmSignedTransaction(store, id, txSigned);
|
2017-03-02 23:51:56 +01:00
|
|
|
} else if (hardwareAccount) {
|
|
|
|
switch (hardwareAccount.via) {
|
|
|
|
case 'ledger':
|
|
|
|
return this.confirmLedgerTransaction(store, id, transaction);
|
|
|
|
|
|
|
|
case 'parity':
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2016-11-10 11:27:05 +01:00
|
|
|
}
|
|
|
|
|
2017-05-15 18:59:41 +02:00
|
|
|
// TODO [ToDr] Support eth_sign for external wallet (wallet && dataSigned)
|
2017-04-27 18:23:22 +02:00
|
|
|
if (dataSigned) {
|
|
|
|
return this.confirmSignedData(store, id, dataSigned);
|
|
|
|
}
|
2017-05-15 18:59:41 +02:00
|
|
|
// TODO [ToDr] Support parity_decrypt for external wallet (wallet && decrypted)
|
|
|
|
if (decrypted) {
|
|
|
|
return this.confirmDecryptedMsg(store, id, decrypted);
|
|
|
|
}
|
2017-04-27 18:23:22 +02:00
|
|
|
|
2017-03-02 23:51:56 +01:00
|
|
|
return handlePromise(this._api.signer.confirmRequest(id, { gas, gasPrice, condition }, password));
|
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
|
|
|
}
|
|
|
|
|
|
|
|
onRejectStart = (store, action) => {
|
|
|
|
const id = action.payload;
|
|
|
|
|
2017-03-02 23:51:56 +01:00
|
|
|
return this._api.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
|
|
|
.rejectRequest(id)
|
|
|
|
.then(() => {
|
|
|
|
store.dispatch(actions.successRejectRequest({ id }));
|
|
|
|
})
|
|
|
|
.catch((error) => {
|
|
|
|
console.error('rejectRequest', id, error);
|
|
|
|
store.dispatch(actions.errorRejectRequest({ id, err: error.message }));
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|