diff --git a/Cargo.lock b/Cargo.lock index da4823d4a6..a7644feaf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,11 +463,11 @@ dependencies = [ "codechain-sync 0.1.0", "codechain-types 0.1.0", "codechain-vm 0.1.0", - "jsonrpc-core 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-derive 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-http-server 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-ipc-server 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-ws-server 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", + "jsonrpc-core 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-derive 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-http-server 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-ipc-server 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-ws-server 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", "kvdb 0.1.0", "kvdb-rocksdb 0.1.0", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -517,9 +517,9 @@ dependencies = [ "codechain-json 0.1.0", "codechain-logger 0.1.0", "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-derive 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-tcp-server 14.0.1 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", + "jsonrpc-core 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-derive 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-tcp-server 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "primitives 0.4.0 (git+https://github.com/CodeChain-io/rust-codechain-primitives.git)", @@ -1213,8 +1213,8 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "14.0.0" -source = "git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8#d1993a80176afdcbae6949bbf73ebbaf5625e644" +version = "14.0.3" +source = "git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3#2135c25df57715238f1709365e3ea3bedc88e030" dependencies = [ "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1225,23 +1225,23 @@ dependencies = [ [[package]] name = "jsonrpc-derive" -version = "14.0.0" -source = "git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8#d1993a80176afdcbae6949bbf73ebbaf5625e644" +version = "14.0.3" +source = "git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3#2135c25df57715238f1709365e3ea3bedc88e030" dependencies = [ "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "jsonrpc-http-server" -version = "14.0.0" -source = "git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8#d1993a80176afdcbae6949bbf73ebbaf5625e644" +version = "14.0.3" +source = "git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3#2135c25df57715238f1709365e3ea3bedc88e030" dependencies = [ "hyper 0.12.19 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-server-utils 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", + "jsonrpc-core 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-server-utils 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.32 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1250,11 +1250,11 @@ dependencies = [ [[package]] name = "jsonrpc-ipc-server" -version = "14.0.0" -source = "git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8#d1993a80176afdcbae6949bbf73ebbaf5625e644" +version = "14.0.3" +source = "git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3#2135c25df57715238f1709365e3ea3bedc88e030" dependencies = [ - "jsonrpc-core 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-server-utils 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", + "jsonrpc-core 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-server-utils 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parity-tokio-ipc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1263,12 +1263,12 @@ dependencies = [ [[package]] name = "jsonrpc-server-utils" -version = "14.0.0" -source = "git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8#d1993a80176afdcbae6949bbf73ebbaf5625e644" +version = "14.0.3" +source = "git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3#2135c25df57715238f1709365e3ea3bedc88e030" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "globset 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonrpc-core 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", + "jsonrpc-core 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1278,11 +1278,11 @@ dependencies = [ [[package]] name = "jsonrpc-tcp-server" -version = "14.0.1" -source = "git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8#d1993a80176afdcbae6949bbf73ebbaf5625e644" +version = "14.0.3" +source = "git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3#2135c25df57715238f1709365e3ea3bedc88e030" dependencies = [ - "jsonrpc-core 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-server-utils 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", + "jsonrpc-core 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-server-utils 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1290,11 +1290,11 @@ dependencies = [ [[package]] name = "jsonrpc-ws-server" -version = "14.0.0" -source = "git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8#d1993a80176afdcbae6949bbf73ebbaf5625e644" +version = "14.0.3" +source = "git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3#2135c25df57715238f1709365e3ea3bedc88e030" dependencies = [ - "jsonrpc-core 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", - "jsonrpc-server-utils 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)", + "jsonrpc-core 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", + "jsonrpc-server-utils 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1886,6 +1886,14 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "proc-macro2" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "pulldown-cmark" version = "0.0.3" @@ -1920,6 +1928,14 @@ dependencies = [ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "quote" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "rand" version = "0.3.22" @@ -2558,6 +2574,16 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "syn" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "synom" version = "0.11.3" @@ -2975,6 +3001,11 @@ name = "unicode-xid" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "unicode-xid" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "unreachable" version = "1.0.0" @@ -3270,13 +3301,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "141340095b15ed7491bd3d4ced9d20cebfb826174b6bb03386381f62b01e3d77" "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" "checksum itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682" -"checksum jsonrpc-core 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)" = "" -"checksum jsonrpc-derive 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)" = "" -"checksum jsonrpc-http-server 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)" = "" -"checksum jsonrpc-ipc-server 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)" = "" -"checksum jsonrpc-server-utils 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)" = "" -"checksum jsonrpc-tcp-server 14.0.1 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)" = "" -"checksum jsonrpc-ws-server 14.0.0 (git+https://github.com/paritytech/jsonrpc.git?rev=d1993a8)" = "" +"checksum jsonrpc-core 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)" = "" +"checksum jsonrpc-derive 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)" = "" +"checksum jsonrpc-http-server 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)" = "" +"checksum jsonrpc-ipc-server 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)" = "" +"checksum jsonrpc-server-utils 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)" = "" +"checksum jsonrpc-tcp-server 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)" = "" +"checksum jsonrpc-ws-server 14.0.3 (git+https://github.com/paritytech/jsonrpc.git?tag=v14.0.3)" = "" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" @@ -3338,11 +3369,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e10d4b51f154c8a7fb96fd6dad097cb74b863943ec010ac94b9fd1be8861fe1e" "checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27" "checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8" "checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db" +"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1" "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" @@ -3413,6 +3446,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 0.13.11 (registry+https://github.com/rust-lang/crates.io-index)" = "14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b" "checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe" +"checksum syn 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7bedb3320d0f3035594b0b723c8a28d7d336a3eda3881db79e61d676fb644c" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" @@ -3455,6 +3489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f" "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 3aee4e1d14..fb690e203b 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -33,8 +33,8 @@ rustc-hex = "1.0" rustc-serialize = "0.3" time = "0.1" tokio-core = "0.1.17" -jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", rev = "d1993a8" } -jsonrpc-derive = { git = "https://github.com/paritytech/jsonrpc.git", rev = "d1993a8" } -jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", rev = "d1993a8" } -jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc.git", rev = "d1993a8" } -jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", rev = "d1993a8" } +jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.3" } +jsonrpc-derive = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.3" } +jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.3" } +jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.3" } +jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", tag = "v14.0.3" } diff --git a/stratum/Cargo.toml b/stratum/Cargo.toml index e12ad3ad6b..114ecaa173 100644 --- a/stratum/Cargo.toml +++ b/stratum/Cargo.toml @@ -9,9 +9,9 @@ authors = ["Parity Technologies ", "CodeChain Team