Merge branch 'master' into on-demand-priority

rpc/Cargo.toml

@@ -18,6 +18,9 @@ serde_derive = "0.9"
 serde_json = "0.9"
 time = "0.1"
 transient-hashmap = "0.4"
+cid = "0.2.1"
+multihash = "0.5"
+rust-crypto = "0.2.36"
 
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }
 jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.7" }

rpc/src/lib.rs

@@ -27,6 +27,9 @@ extern crate serde;
 extern crate serde_json;
 extern crate time;
 extern crate transient_hashmap;
+extern crate cid;
+extern crate multihash;
+extern crate crypto as rust_crypto;
 
 extern crate jsonrpc_core;
 extern crate jsonrpc_http_server as http;

rpc/src/v1/helpers/errors.rs

@@ -44,6 +44,7 @@ mod codes {
 	pub const REQUEST_REJECTED_LIMIT: i64 = -32041;
 	pub const REQUEST_NOT_FOUND: i64 = -32042;
 	pub const ENCRYPTION_ERROR: i64 = -32055;
+	pub const ENCODING_ERROR: i64 = -32058;
 	pub const FETCH_ERROR: i64 = -32060;
 	pub const NO_LIGHT_PEERS: i64 = -32065;
 	pub const DEPRECATED: i64 = -32070;
@@ -224,6 +225,14 @@ pub fn encryption_error<T: fmt::Debug>(error: T) -> Error {
 	}
 }
 
+pub fn encoding_error<T: fmt::Debug>(error: T) -> Error {
+	Error {
+		code: ErrorCode::ServerError(codes::ENCODING_ERROR),
+		message: "Encoding error.".into(),
+		data: Some(Value::String(format!("{:?}", error))),
+	}
+}
+
 pub fn database_error<T: fmt::Debug>(error: T) -> Error {
 	Error {
 		code: ErrorCode::ServerError(codes::DATABASE_ERROR),

rpc/src/v1/helpers/ipfs.rs

@@ -0,0 +1,38 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// 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/>.
+
+//! IPFS utility functions
+
+use multihash;
+use cid::{Cid, Codec, Version};
+use rust_crypto::sha2::Sha256;
+use rust_crypto::digest::Digest;
+use jsonrpc_core::Error;
+use v1::types::Bytes;
+use super::errors;
+
+/// Compute CIDv0 from protobuf encoded bytes.
+pub fn cid(content: Bytes) -> Result<String, Error> {
+	let mut hasher = Sha256::new();
+	hasher.input(&content.0);
+	let len = hasher.output_bytes();
+	let mut buf = Vec::with_capacity(len);
+	buf.resize(len, 0);
+	hasher.result(&mut buf);
+	let mh = multihash::encode(multihash::Hash::SHA2256, &buf).map_err(errors::encoding_error)?;
+	let cid = Cid::new(Codec::DagProtobuf, Version::V0, &mh);
+	Ok(cid.to_string().into())
+}

rpc/src/v1/helpers/mod.rs

@@ -24,6 +24,7 @@ pub mod fake_sign;
 pub mod light_fetch;
 pub mod informant;
 pub mod oneshot;
+pub mod ipfs;
 
 mod network_settings;
 mod poll_manager;

rpc/src/v1/impls/light/parity.rs

@@ -30,7 +30,7 @@ use ethcore::account_provider::AccountProvider;
 
 use jsonrpc_core::Error;
 use jsonrpc_macros::Trailing;
-use v1::helpers::{errors, SigningQueue, SignerService, NetworkSettings};
+use v1::helpers::{errors, ipfs, SigningQueue, SignerService, NetworkSettings};
 use v1::helpers::dispatch::{LightDispatcher, DEFAULT_MAC};
 use v1::helpers::light_fetch::LightFetch;
 use v1::metadata::Metadata;
@@ -387,4 +387,8 @@ impl Parity for ParityClient {
 
 		self.fetcher().header(number.0.into()).map(from_encoded).boxed()
 	}
+
+	fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> {
+		ipfs::cid(content)
+	}
 }

rpc/src/v1/impls/parity.rs

@@ -37,7 +37,7 @@ use updater::{Service as UpdateService};
 
 use jsonrpc_core::Error;
 use jsonrpc_macros::Trailing;
-use v1::helpers::{errors, SigningQueue, SignerService, NetworkSettings};
+use v1::helpers::{errors, ipfs, SigningQueue, SignerService, NetworkSettings};
 use v1::helpers::accounts::unwrap_provider;
 use v1::helpers::dispatch::DEFAULT_MAC;
 use v1::metadata::Metadata;
@@ -428,4 +428,8 @@ impl<C, M, S: ?Sized, U> Parity for ParityClient<C, M, S, U> where
 			extra_info: client.block_extra_info(id).expect(EXTRA_INFO_PROOF),
 		}).boxed()
 	}
+
+	fn ipfs_cid(&self, content: Bytes) -> Result<String, Error> {
+		ipfs::cid(content)
+	}
 }

rpc/src/v1/tests/mocked/parity.rs

@@ -510,3 +510,14 @@ fn rpc_parity_node_kind() {
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
+
+#[test]
+fn rpc_parity_cid() {
+	let deps = Dependencies::new();
+	let io = deps.default_client();
+
+	let request = r#"{"jsonrpc": "2.0", "method": "parity_cidV0", "params":["0x414243"], "id": 1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":"QmSF59MAENc8ZhM4aM1thuAE8w5gDmyfzkAvNoyPea7aDz","id":1}"#;
+
+	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
+}

rpc/src/v1/traits/parity.rs

@@ -203,5 +203,9 @@ build_rpc_trait! {
 		/// Same as `eth_getBlockByNumber` but without uncles and transactions.
 		#[rpc(async, name = "parity_getBlockHeaderByNumber")]
 		fn block_header(&self, Trailing<BlockNumber>) -> BoxFuture<RichHeader, Error>;
+
+		/// Get IPFS CIDv0 given protobuf encoded bytes.
+		#[rpc(name = "parity_cidV0")]
+		fn ipfs_cid(&self, Bytes) -> Result<String, Error>;
 	}
 }