Commit Graph

11194 Commits

Author SHA1 Message Date
debris
0e912bca5b bring back accidently removed whitespace 2017-10-17 10:44:05 +02:00
debris
607cc6c782 fixed compiling util tests 2017-10-17 10:40:45 +02:00
Jaco Greeff
d852e6b063 Merge branch 'master' into ui-2
# Conflicts:
#	js/src/views/Signer/components/SignRequest/signRequest.js
2017-10-17 09:55:13 +02:00
Jaco Greeff
9c5b96ccbe Updated dependencies 2017-10-17 09:09:54 +02:00
Dmitry Kashitsyn
7fe7b6d9a4 Fixes import in test 2017-10-17 12:12:46 +07:00
Dmitry Kashitsyn
f9e588dd7b Refactors parity/parity to use journaldb crate (#6693) 2017-10-17 11:46:54 +07:00
Dmitry Kashitsyn
c0fc83988f Refactors ethcore to use journaldb crate (#6693) 2017-10-17 11:46:07 +07:00
Dmitry Kashitsyn
e2b96e1fe0 Moves journaldb sources to a separate crate (#6693) 2017-10-17 11:44:52 +07:00
Marek Kotewicz
98d0ef3fff Merge pull request #6795 from paritytech/ipc_cleanup
remove internal ipc
2017-10-16 23:22:47 +02:00
debris
3830f9b464 fixed failing test 2017-10-16 22:12:17 +02:00
debris
95f0384510 Merge branch 'master' into ipc_cleanup 2017-10-16 18:19:41 +02:00
Marek Kotewicz
bb1be15dc4 Merge pull request #6792 from paritytech/kvdb_error
consistent KeyValueDB errors
2017-10-16 18:19:18 +02:00
debris
16d84f8ecf finished removing ipc 2017-10-16 18:18:43 +02:00
Jaco Greeff
a76f768077 Updated dependencies 2017-10-16 18:06:40 +02:00
debris
fa019bd03e remove ipc codegen from ethcore 2017-10-16 17:50:25 +02:00
debris
6f914d1851 remove ipc codegen from stratum 2017-10-16 17:32:15 +02:00
debris
f1c50e5648 remove ipc codegen from updater 2017-10-16 17:28:59 +02:00
debris
c83e9d0f1b remove ipc codegen from secretstore 2017-10-16 17:12:02 +02:00
Jaco Greeff
9e4c1fe6af Update warning layout 2017-10-16 15:51:55 +02:00
Jaco Greeff
de6066d6b0 Add babel-polyfill entry 2017-10-16 15:45:30 +02:00
Jaco Greeff
b49d7ee29c Rebuild after master merge 2017-10-16 15:20:30 +02:00
debris
7661e93a56 fixed secret_store conversion from kvdb error 2017-10-16 14:55:11 +02:00
Jaco Greeff
8453dda7ef Merge branch 'master' into ui-2
# Conflicts:
#	js/package-lock.json
#	js/package.json
#	js/src/api/api.js
#	js/src/api/local/accounts/accounts.js
#	js/src/api/local/localAccountsMiddleware.js
#	js/src/api/local/transactions.js
#	js/src/api/pubsub/signer/signer.js
#	js/src/api/subscriptions/signer.js
#	js/src/api/transport/jsonRpcBase.js
#	js/src/api/transport/middleware.js
#	js/src/api/util/format.js
#	js/src/api/util/format.spec.js
#	js/src/contracts/abi/index.js
#	js/src/contracts/badgereg.js
#	js/src/dapps/tokenreg/Application/application.css
#	js/src/dapps/tokenreg/Application/application.js
#	js/src/modals/CreateWallet/WalletDetails/walletDetails.js
#	js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
#	js/src/modals/CreateWallet/createWalletStore.js
#	js/src/modals/DeployContract/ParametersStep/parametersStep.js
#	js/src/modals/DeployContract/deployContract.js
#	js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
#	js/src/modals/WalletSettings/walletSettings.js
#	js/src/redux/providers/certifications/actions.js
#	js/src/redux/providers/certifications/middleware.js
#	js/src/redux/providers/certifications/reducer.js
#	js/src/redux/providers/requestsActions.js
#	js/src/redux/providers/tokensActions.js
#	js/src/ui/AccountCard/accountCard.css
#	js/src/ui/Balance/balance.js
#	js/src/ui/Balance/balance.spec.js
#	js/src/ui/DappCard/dappCard.js
#	js/src/ui/Form/AddressSelect/addressSelect.js
#	js/src/ui/Form/AddressSelect/addressSelectStore.js
#	js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
#	js/src/ui/Form/TypedInput/typedInput.js
#	js/src/ui/IdentityIcon/identityIcon.js
#	js/src/ui/MethodDecoding/tokenValue.js
#	js/src/util/tx.js
#	js/src/util/wallets.js
#	js/src/util/wallets/consensys-wallet.js
#	js/src/util/wallets/foundation-wallet.js
#	js/src/views/Account/account.js
#	js/src/views/Accounts/List/list.js
#	js/src/views/Contract/Queries/inputQuery.js
#	js/src/views/Contract/Queries/queries.js
#	js/src/views/Contract/contract.js
#	js/src/views/Signer/components/SignRequest/signRequest.css
#	js/src/views/Signer/components/SignRequest/signRequest.js
#	js/src/views/Signer/components/SignRequest/signRequest.spec.js
2017-10-16 12:41:41 +02:00
Arkadiy Paronyan
5b29b6d064 Squash remaining warnings (#6789)
* Fixed comment warnings

* Fixed remaining warnings
2017-10-16 12:31:52 +02:00
debris
8ecdab68c2 add missing space to TrieError description 2017-10-16 12:17:06 +02:00
debris
5e61f3493e require stable error-chain 2017-10-16 12:15:19 +02:00
debris
6dc50d01b5 KeyValueDB trait uses errors instead of strings 2017-10-16 12:11:35 +02:00
Marek Kotewicz
44db0c55c5 Merge pull request #6720 from paritytech/kvdb_split
separated kvdb into 3 crates: kvdb, kvdb-memorydb && kvdb-rocksdb
2017-10-16 10:57:27 +02:00
Afri Schoedon
774598974e Forward-port #6754 #6755 (#6785) 2017-10-16 10:56:23 +02:00
Marek Kotewicz
aa4bc50c6b removed duplicated versions of clippy (#6776) 2017-10-16 10:22:02 +02:00
Marek Kotewicz
8365f4d80e updated ethabi to version 4.0 (#6742)
* updated ethabi to version 4.0

* ethabi 4.0.1
2017-10-16 10:21:35 +02:00
Marek Kotewicz
9fa639ede9 updated rpc_cli and parity to rpassword 1.0 (#6774) 2017-10-16 10:20:55 +02:00
Afri Schoedon
b63c3a66ca Fix sign data typo, ref #6737 (#6750) 2017-10-16 10:08:36 +02:00
debris
fbad6b5514 removed redundant mut from kvdb-memorydb 2017-10-16 10:02:26 +02:00
debris
2ce0eae406 Merge branch 'master' into kvdb_split 2017-10-16 10:01:12 +02:00
Marek Kotewicz
d1c9acf439 Merge pull request #6772 from paritytech/refactoring/cache-6693
Refactoring/cache 6693
2017-10-16 09:58:48 +02:00
Afri Schoedon
832879e5c8 Fix CHANGLOG for 1.8.0 (#6751)
* Fix CHANGLOG for 1.8.0

* Update changelog for 1.8.0

* Add changelog for 1.7.7
2017-10-16 09:35:02 +02:00
Dmitry Kashitsyn
92a9fd3359 Uses dash instead of underscore in crate name 2017-10-16 11:05:54 +07:00
Dmitry Kashitsyn
b03117b262 Removes redundant mut in service.rs.in (#6775) 2017-10-15 17:41:40 +02:00
Dmitry Kashitsyn
e7690ab658 Removes redundant dependencies (#6693) 2017-10-15 21:47:06 +07:00
Dmitry Kashitsyn
4df541e47a Refactors references to MemoryLruCache in ethcore (#6693) 2017-10-15 21:47:06 +07:00
Dmitry Kashitsyn
51b61ccdbf Extracts MemoryLruCache to a separate crate (#6693) 2017-10-15 21:47:06 +07:00
debris
db3ff67182 Merge branch 'master' into kvdb_split 2017-10-15 16:40:20 +02:00
Marek Kotewicz
82c8dccddf Merge pull request #6773 from paritytech/refactoring/redundant-mut
Remove redundant `mut`
2017-10-15 16:38:26 +02:00
debris
fa4e5c98d0 docs 2017-10-15 16:18:45 +02:00
debris
616cafb04a renamed kvdb_memorydb::in_memory -> kvdb_memorydb::create 2017-10-15 16:17:15 +02:00
debris
d88ec35a6a Merge branch 'master' into kvdb_split 2017-10-15 15:55:44 +02:00
Dmitry Kashitsyn
96b4467f86 Removes redundant mut in util 2017-10-15 20:11:34 +07:00
Dmitry Kashitsyn
74876fd410 Removes redundant mut in sync 2017-10-15 20:11:20 +07:00
Dmitry Kashitsyn
dab40e832c Removes redundant mut in rpc 2017-10-15 20:11:07 +07:00