Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Cancel tx JS #4958

Merged
merged 45 commits into from
Apr 25, 2017
Merged
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
49ed3d8
Remove transaction RPC
tomusdrw Mar 17, 2017
a9ae42c
Bumping multihash and libc
tomusdrw Mar 17, 2017
eb8fe28
Updating nanomsg
tomusdrw Mar 17, 2017
3d31031
bump nanomsg
arkpar Mar 17, 2017
eb3e79c
cancel tx
CraigglesO Mar 18, 2017
45d1641
cancel-tx-js
CraigglesO Mar 18, 2017
f871389
cancel-tx-js
CraigglesO Mar 18, 2017
aa47572
cancel-tx-js
CraigglesO Mar 18, 2017
35d959e
cancel-tx-hs
CraigglesO Mar 18, 2017
2235923
cancel-tx-js
CraigglesO Mar 18, 2017
65c6390
cancel-tx-js
CraigglesO Mar 18, 2017
14dd162
cancel-tx-js
CraigglesO Mar 18, 2017
9766508
small fixes
CraigglesO Mar 19, 2017
b57aecd
Merge remote-tracking branch 'origin/master' into cancel-tx-js
CraigglesO Mar 19, 2017
03c19fd
edit & time till submit
CraigglesO Mar 20, 2017
42dd28a
edit & time till submit
CraigglesO Mar 20, 2017
a9662fa
updates
CraigglesO Mar 20, 2017
b7c8c16
updates
CraigglesO Mar 20, 2017
89b4343
udpates
CraigglesO Mar 22, 2017
1aeec64
udpates
CraigglesO Mar 22, 2017
eb8e56d
grumbles
CraigglesO Mar 24, 2017
131b837
step 1
CraigglesO Mar 24, 2017
c56ce69
Merge branch 'master' of github.com:paritytech/parity into cancel-tx-js
CraigglesO Mar 24, 2017
c2ce35c
Wonderful updates
CraigglesO Mar 25, 2017
06c9951
ready
CraigglesO Mar 25, 2017
8e17b08
small refact
CraigglesO Mar 27, 2017
b8a7d62
small refact
CraigglesO Mar 27, 2017
4d9ca26
grumbles 1
CraigglesO Mar 27, 2017
684ab6c
ffx2
CraigglesO Apr 4, 2017
c6195d6
ffx2
CraigglesO Apr 4, 2017
85929ea
good ol' fashioned updates
CraigglesO Apr 4, 2017
35aad6c
latest and greatest
CraigglesO Apr 4, 2017
acf79fe
removeHash
CraigglesO Apr 6, 2017
3c4199b
removeHash
CraigglesO Apr 6, 2017
2c04f54
spec
CraigglesO Apr 6, 2017
2d03df7
fix 1
CraigglesO Apr 10, 2017
c9535bf
fix 1
CraigglesO Apr 10, 2017
8d01b28
fix 2
CraigglesO Apr 10, 2017
666f59f
fix 2
CraigglesO Apr 10, 2017
10eda45
ff
CraigglesO Apr 10, 2017
ca73bc8
ff
CraigglesO Apr 10, 2017
bd05a8c
ff
CraigglesO Apr 10, 2017
0f4f40d
ff
CraigglesO Apr 10, 2017
3bf3972
updates
CraigglesO Apr 21, 2017
fb72ab4
lol
CraigglesO Apr 23, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updating nanomsg
  • Loading branch information
tomusdrw authored and CraigglesO committed Mar 17, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit eb8fe286e1b7df327c2fada23af362ac4756f1cd
18 changes: 9 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ipc/hypervisor/Cargo.toml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ build = "build.rs"

[dependencies]
ethcore-ipc = { path = "../rpc" }
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
ethcore-ipc-nano = { path = "../nano" }
semver = "0.5"
log = "0.3"
2 changes: 1 addition & 1 deletion ipc/nano/Cargo.toml
Original file line number Diff line number Diff line change
@@ -8,6 +8,6 @@ license = "GPL-3.0"

[dependencies]
ethcore-ipc = { path = "../rpc" }
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
log = "0.3"
lazy_static = "0.2"
2 changes: 1 addition & 1 deletion ipc/rpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -8,6 +8,6 @@ license = "GPL-3.0"

[dependencies]
ethcore-devtools = { path = "../../devtools" }
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
ethcore-util = { path = "../../util" }
semver = "0.5"
2 changes: 1 addition & 1 deletion ipc/tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ path = "run.rs"
ethcore-ipc = { path = "../rpc" }
ethcore-devtools = { path = "../../devtools" }
semver = "0.5"
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
ethcore-ipc-nano = { path = "../nano" }
ethcore-util = { path = "../../util" }
log = "0.3"