Remove contracts RPCs

Cargo.toml

@@ -86,8 +86,8 @@ members = [
 	"frame/child-bounties",
 	"frame/collective",
 	"frame/contracts",
-	"frame/contracts/rpc",
-	"frame/contracts/rpc/runtime-api",
+	"frame/contracts/primitives",
+	"frame/contracts/runtime-api",
 	"frame/conviction-voting",
 	"frame/democracy",
 	"frame/fast-unstake",

bin/node/rpc/Cargo.toml

@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpsee = { version = "0.15.1", features = ["server"] }
 node-primitives = { version = "2.0.0", path = "../primitives" }
-pallet-contracts-rpc = { version = "4.0.0-dev", path = "../../../frame/contracts/rpc/" }
 pallet-mmr-rpc = { version = "3.0.0", path = "../../../frame/merkle-mountain-range/rpc/" }
 pallet-transaction-payment-rpc = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/rpc/" }
 sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" }

bin/node/rpc/src/lib.rs

@@ -108,7 +108,6 @@ where
 		+ Send
 		+ 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
-	C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,
 	C::Api: pallet_mmr_rpc::MmrRuntimeApi<Block, <Block as sp_runtime::traits::Block>::Hash>,
 	C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
 	C::Api: BabeApi<Block>,
@@ -118,7 +117,6 @@ where
 	B: sc_client_api::Backend<Block> + Send + Sync + 'static,
 	B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
 {
-	use pallet_contracts_rpc::{Contracts, ContractsApiServer};
 	use pallet_mmr_rpc::{Mmr, MmrApiServer};
 	use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
 	use sc_consensus_babe_rpc::{Babe, BabeApiServer};
@@ -150,7 +148,6 @@ where
 	// Making synchronous calls in light client freezes the browser currently,
 	// more context: https://github.com/paritytech/substrate/pull/3480
 	// These RPCs should use an asynchronous caller instead.
-	io.merge(Contracts::new(client.clone()).into_rpc())?;
 	io.merge(Mmr::new(client.clone()).into_rpc())?;
 	io.merge(TransactionPayment::new(client.clone()).into_rpc())?;
 	io.merge(

bin/node/runtime/Cargo.toml

@@ -61,8 +61,8 @@ pallet-bounties = { version = "4.0.0-dev", default-features = false, path = "../
 pallet-child-bounties = { version = "4.0.0-dev", default-features = false, path = "../../../frame/child-bounties" }
 pallet-collective = { version = "4.0.0-dev", default-features = false, path = "../../../frame/collective" }
 pallet-contracts = { version = "4.0.0-dev", default-features = false, path = "../../../frame/contracts" }
-pallet-contracts-primitives = { version = "6.0.0", default-features = false, path = "../../../frame/contracts/common/" }
-pallet-contracts-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/contracts/rpc/runtime-api/" }
+pallet-contracts-primitives = { version = "6.0.0", default-features = false, path = "../../../frame/contracts/primitives/" }
+pallet-contracts-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/contracts/runtime-api/" }
 pallet-conviction-voting = { version = "4.0.0-dev", default-features = false, path = "../../../frame/conviction-voting" }
 pallet-democracy = { version = "4.0.0-dev", default-features = false, path = "../../../frame/democracy" }
 pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false, path = "../../../frame/election-provider-multi-phase" }
@@ -139,7 +139,7 @@ std = [
 	"pallet-collective/std",
 	"pallet-contracts/std",
 	"pallet-contracts-primitives/std",
-	"pallet-contracts-rpc-runtime-api/std",
+	"pallet-contracts-runtime-api/std",
 	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
 	"pallet-elections-phragmen/std",

bin/node/runtime/src/lib.rs

@@ -1941,7 +1941,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_contracts_rpc_runtime_api::ContractsApi<
+	impl pallet_contracts_runtime_api::ContractsApi<
 		Block, AccountId, Balance, BlockNumber, Hash,
 	>
 		for Runtime

frame/contracts/Cargo.toml

@@ -36,7 +36,7 @@ rand_pcg = { version = "0.3", optional = true }
 frame-benchmarking = { version = "4.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../system" }
-pallet-contracts-primitives = { version = "6.0.0", default-features = false, path = "common" }
+pallet-contracts-primitives = { version = "6.0.0", default-features = false, path = "primitives" }
 pallet-contracts-proc-macro = { version = "4.0.0-dev", path = "proc-macro" }
 sp-core = { version = "6.0.0", default-features = false, path = "../../primitives/core" }
 sp-io = { version = "6.0.0", default-features = false, path = "../../primitives/io" }

frame/contracts/common/Cargo.toml → frame/contracts/primitives/Cargo.toml

@@ -15,23 +15,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 bitflags = "1.0"
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
-serde = { version = "1", features = ["derive"], optional = true }
 
 # Substrate Dependencies (This crate should not rely on frame)
 sp-core = { version = "6.0.0", path = "../../../primitives/core", default-features = false }
 sp-std = { version = "4.0.0", default-features = false, path = "../../../primitives/std" }
-sp-rpc = { version = "6.0.0", path = "../../../primitives/rpc", optional = true }
 sp-runtime = { version = "6.0.0", default-features = false, path = "../../../primitives/runtime" }
 
 [features]
 default = ["std"]
 std = [
 	"codec/std",
-	"scale-info/std",
 	"sp-core/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"sp-rpc",
-	"serde",
 ]

frame/contracts/common/src/lib.rs → frame/contracts/primitives/src/lib.rs

@@ -28,25 +28,10 @@ use sp_runtime::{
 };
 use sp_std::prelude::*;
 
-#[cfg(feature = "std")]
-use serde::{Deserialize, Serialize};
-
-#[cfg(feature = "std")]
-use sp_rpc::number::NumberOrHex;
-
 /// Result type of a `bare_call` or `bare_instantiate` call.
 ///
 /// It contains the execution result together with some auxiliary information.
 #[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(
-	feature = "std",
-	serde(
-		rename_all = "camelCase",
-		bound(serialize = "R: Serialize, Balance: Copy + Into<NumberOrHex>"),
-		bound(deserialize = "R: Deserialize<'de>, Balance: TryFrom<NumberOrHex>")
-	)
-)]
 pub struct ContractResult<R, Balance> {
 	/// How much gas was consumed during execution.
 	pub gas_consumed: u64,
@@ -80,7 +65,6 @@ pub struct ContractResult<R, Balance> {
 	///
 	/// The debug message is never generated during on-chain execution. It is reserved for
 	/// RPC calls.
-	#[cfg_attr(feature = "std", serde(with = "as_string"))]
 	pub debug_message: Vec<u8>,
 	/// The execution result of the wasm code.
 	pub result: R,
@@ -113,8 +97,6 @@ pub enum ContractAccessError {
 bitflags! {
 	/// Flags used by a contract to customize exit behaviour.
 	#[derive(Encode, Decode)]
-	#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-	#[cfg_attr(feature = "std", serde(rename_all = "camelCase", transparent))]
 	pub struct ReturnFlags: u32 {
 		/// If this bit is set all changes made by the contract execution are rolled back.
 		const REVERT = 0x0000_0001;
@@ -123,8 +105,6 @@ bitflags! {
 
 /// Output of a contract call or instantiation which ran to completion.
 #[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 pub struct ExecReturnValue {
 	/// Flags passed along by `seal_return`. Empty when `seal_return` was never called.
 	pub flags: ReturnFlags,
@@ -141,8 +121,6 @@ impl ExecReturnValue {
 
 /// The result of a successful contract instantiation.
 #[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 pub struct InstantiateReturnValue<AccountId> {
 	/// The output of the called constructor.
 	pub result: ExecReturnValue,
@@ -152,27 +130,15 @@ pub struct InstantiateReturnValue<AccountId> {
 
 /// The result of succesfully uploading a contract.
 #[derive(PartialEq, Eq, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(
-	feature = "std",
-	serde(
-		rename_all = "camelCase",
-		bound(serialize = "CodeHash: Serialize, Balance: Copy + Into<NumberOrHex>"),
-		bound(deserialize = "CodeHash: Deserialize<'de>, Balance: TryFrom<NumberOrHex>")
-	)
-)]
 pub struct CodeUploadReturnValue<CodeHash, Balance> {
 	/// The key under which the new code is stored.
 	pub code_hash: CodeHash,
 	/// The deposit that was reserved at the caller. Is zero when the code already existed.
-	#[cfg_attr(feature = "std", serde(with = "as_hex"))]
 	pub deposit: Balance,
 }
 
 /// Reference to an existing code hash or a new wasm module.
 #[derive(Eq, PartialEq, Encode, Decode, RuntimeDebug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 pub enum Code<Hash> {
 	/// A wasm module as raw bytes.
 	Upload(Bytes),
@@ -188,27 +154,16 @@ impl<T: Into<Vec<u8>>, Hash> From<T> for Code<Hash> {
 
 /// The amount of balance that was either charged or refunded in order to pay for storage.
 #[derive(Eq, PartialEq, Ord, PartialOrd, Encode, Decode, RuntimeDebug, Clone)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[cfg_attr(
-	feature = "std",
-	serde(
-		rename_all = "camelCase",
-		bound(serialize = "Balance: Copy + Into<NumberOrHex>"),
-		bound(deserialize = "Balance: TryFrom<NumberOrHex>")
-	)
-)]
 pub enum StorageDeposit<Balance> {
 	/// The transaction reduced storage consumption.
 	///
 	/// This means that the specified amount of balance was transferred from the involved
 	/// contracts to the call origin.
-	#[cfg_attr(feature = "std", serde(with = "as_hex"))]
 	Refund(Balance),
 	/// The transaction increased overall storage usage.
 	///
 	/// This means that the specified amount of balance was transferred from the call origin
 	/// to the contracts involved.
-	#[cfg_attr(feature = "std", serde(with = "as_hex"))]
 	Charge(Balance),
 }
 
@@ -295,42 +250,3 @@ where
 		}
 	}
 }
-
-#[cfg(feature = "std")]
-mod as_string {
-	use super::*;
-	use serde::{ser::Error, Deserializer, Serializer};
-
-	pub fn serialize<S: Serializer>(bytes: &Vec<u8>, serializer: S) -> Result<S::Ok, S::Error> {
-		std::str::from_utf8(bytes)
-			.map_err(|e| S::Error::custom(format!("Debug buffer contains invalid UTF8: {}", e)))?
-			.serialize(serializer)
-	}
-
-	pub fn deserialize<'de, D: Deserializer<'de>>(deserializer: D) -> Result<Vec<u8>, D::Error> {
-		Ok(String::deserialize(deserializer)?.into_bytes())
-	}
-}
-
-#[cfg(feature = "std")]
-mod as_hex {
-	use super::*;
-	use serde::{de::Error as _, Deserializer, Serializer};
-
-	pub fn serialize<S, Balance>(balance: &Balance, serializer: S) -> Result<S::Ok, S::Error>
-	where
-		S: Serializer,
-		Balance: Copy + Into<NumberOrHex>,
-	{
-		Into::<NumberOrHex>::into(*balance).serialize(serializer)
-	}
-
-	pub fn deserialize<'de, D, Balance>(deserializer: D) -> Result<Balance, D::Error>
-	where
-		D: Deserializer<'de>,
-		Balance: TryFrom<NumberOrHex>,
-	{
-		Balance::try_from(NumberOrHex::deserialize(deserializer)?)
-			.map_err(|_| D::Error::custom("Cannot decode NumberOrHex to Balance"))
-	}
-}