Tomasz Drwięga
77942c0b48
Merge branch 'master' into signer-wsnotification
2016-06-02 13:02:10 +02:00
Gav Wood
4c44994807
Merge branch 'master' into diffing
2016-06-02 12:44:38 +02:00
debris
9a626c84bc
fixed #1204
2016-06-02 12:44:05 +02:00
Gav Wood
29e18cfc4d
Merge branch 'vmtracing'
2016-06-02 12:43:14 +02:00
Gav Wood
401bdca153
Merge branch 'master' of github.com:ethcore/parity
2016-06-02 12:42:16 +02:00
Gav Wood
b17581d7de
VM tracing and JSON RPC endpoint for it. ( #1169 )
...
* Groundwork for basic VM tracing.
* RPC endpoint for VM tracing and ser/de types ready.
* Create VMTracer trait.
* Rearchitected VM tracing to reflect existing tracing.
Should more or less work now.
* Integrated VM tracing into JSONRPC.
* Fix ethcore module tests.
* Add tests for VM tracing.
* Fix consensus test code.
* Fix mock tests.
* Added VM trace information for post-execution stuff.
* Fix max-value calls and add "creates" field to getTransaction.
* Tests for VM tracing.
* Don't implement the trait with unimplemented.
* Remove invlaid comment.
* Fix tests.
2016-06-02 12:40:31 +02:00
Gav Wood
b9ec87548d
Minor renaming diff -> state_diff
2016-06-02 12:39:25 +02:00
Gav Wood
bc5c3da2af
Merge branch 'vmtracing' into diffing
2016-06-02 12:28:09 +02:00
Tomasz Drwięga
716c9bb43c
Merge branch 'master' into signer-wsnotification
...
Conflicts:
rpc/src/v1/impls/mod.rs
2016-06-02 12:22:52 +02:00
Tomasz Drwięga
e9bcce05a1
Refactoring the signing queue
2016-06-02 12:17:28 +02:00
Nikolay Volf
7ad9c73c75
devtools helpers extended ( #1186 )
...
* devtools extensions
* some doc effort
2016-06-02 11:51:03 +02:00
Arkadiy Paronyan
8596a347ea
Networking refactoring ( #1172 )
...
* Networking refactoring
* Make sure the same socket is reused
* Safer atomic ordering
* Replaced eq with ==
2016-06-02 11:49:56 +02:00
Gav Wood
d40a038f37
Fix tests.
2016-06-02 11:49:27 +02:00
Gav Wood
26da38a439
Merge remote-tracking branch 'origin/master' into vmtracing
2016-06-02 11:40:39 +02:00
Robert Habermeier
e170916563
Merge pull request #1195 from ethcore/client-refact
...
Client & Miner refactoring
2016-06-01 20:54:19 +02:00
Tomasz Drwięga
5f68b81f68
Updating jsonrpc-core
2016-06-01 20:32:16 +02:00
Tomasz Drwięga
89deaef809
Merge branch 'signer-wsnotification' into signer-ui
2016-06-01 20:13:36 +02:00
Nikolay Volf
626acda6a3
fix warnings
2016-06-01 20:11:05 +02:00
Robert Habermeier
b7ada4dee0
update readme ( #1201 )
...
* update readme
[ci skip]
* minor fixes
* mention dapps server.
[ci skip]
2016-06-01 20:10:51 +02:00
Gav Wood
5c63311268
Add missing types.
2016-06-01 20:02:23 +02:00
Tomasz Drwięga
555555e6f7
Merge branch 'master' into signer-wsnotification
...
Conflicts:
parity/signer.rs
rpc/src/v1/helpers/signing_queue.rs
rpc/src/v1/impls/eth_signing.rs
rpc/src/v1/impls/personal_signer.rs
signer/src/ws_server/mod.rs
2016-06-01 20:00:43 +02:00
Nikolay Volf
c370bcaded
merge fixes
2016-06-01 19:57:34 +02:00
Nikolay Volf
6676c6cf7e
Merge branch 'master' into client-refact
2016-06-01 19:42:32 +02:00
Tomasz Drwięga
99e26b8480
Simple signing queue, confirmation APIs exposed in signer WebSockets. ( #1182 )
...
* Splitting methods requiring signing into separate trait
* Single place where RPC apis are created.
* Separating eth_filter
* Separating eth_signing
* Stubs for Personal Signer methods
* Test for EthSigningQueueClient
* TransactionConfirmation API
* Exposing PersonalSigner API
* Defining ApiSets dependent on context
* Removing types
* Fixing default impl
* Fixing un-mocked tests
* Update signing_queue.rs
[ci skip]
* Removing unused import [ci skip]
2016-06-01 19:37:34 +02:00
Tomasz Drwięga
a7a2b55362
Using ethcore http server
2016-06-01 19:32:05 +02:00
Tomasz Drwięga
d601e11d59
Removing typeS
2016-06-01 19:05:27 +02:00
Tomasz Drwięga
4742860b2e
Using ethcore http server
2016-06-01 18:00:40 +02:00
Tomasz Drwięga
1fd9110829
Serde bump
2016-06-01 17:59:21 +02:00
Robert Habermeier
b9b0ce8d65
Merge pull request #1199 from ethcore/ordered-dapps
...
Using ordered hashmap to keep the order of dapps on home screen
2016-06-01 16:19:00 +02:00
Nikolay Volf
1ef4db82e8
doctest fixes
2016-06-01 14:50:06 +02:00
Tomasz Drwięga
ae572cb8f5
Using ordered hashmap to keep the order of dapps on home screen
2016-06-01 13:25:20 +02:00
Marek Kotewicz
ee77fc3bc3
Merge pull request #1197 from ethcore/x-frame
...
Disabling `ethcore` by default, adding x-frame-options header to dapps.
2016-06-01 13:20:46 +02:00
Nikolay Volf
985d412c48
fix merges again
2016-06-01 13:03:26 +02:00
Nikolay Volf
c00b84e10b
merge fixes
2016-06-01 12:54:47 +02:00
Nikolay Volf
0c782bf34b
Merge branch 'master' into client-refact
2016-06-01 12:45:04 +02:00
Arkadiy Paronyan
f41466c8b5
Merge pull request #1196 from rphmeier/rpc-tests
...
transaction count verifier tests
2016-06-01 12:44:51 +02:00
Nikolay Volf
db749dc564
fix remaining tests & doctest
2016-06-01 12:44:11 +02:00
Arkadiy Paronyan
e743972102
Merge pull request #1192 from rphmeier/x_macros
...
expunge x! and xx! from the codebase
2016-06-01 12:43:15 +02:00
Nikolay Volf
cee31f9e8d
fix travis
2016-06-01 03:19:20 +02:00
Nikolay Volf
d45a676dc0
all tests fixed
2016-05-31 22:24:32 +02:00
Tomasz Drwięga
67421fc69e
Adding explanatory comment for safe_to_embed
2016-05-31 21:56:41 +02:00
Tomasz Drwięga
ae1bcd6a5b
Disabling ethcore APIs for RPC and IPC
2016-05-31 21:53:20 +02:00
Robert Habermeier
5fd4b9d7bd
formatting fix
2016-05-31 21:50:25 +02:00
Nikolay Volf
dad61bb7cf
test and travis fix for absent crate
2016-05-31 21:40:26 +02:00
Tomasz Drwięga
9957328607
DENY frames from other origins to prevent clickjacking
2016-05-31 21:39:11 +02:00
Nikolay Volf
c33b1caf21
executable all issues resolved
2016-05-31 21:38:07 +02:00
Robert Habermeier
bbb858b386
address small syntax breakages
2016-05-31 21:38:05 +02:00
Nikolay Volf
77cef76518
rpc bindings resolved
2016-05-31 21:31:42 +02:00
Robert Habermeier
4146e1f02b
add empty rule to map macros
2016-05-31 21:18:54 +02:00
Nikolay Volf
2a08fb8fe3
and conditional dispatch
2016-05-31 21:17:46 +02:00
