Merge branch 'master' into at/contracts-proof-size

frame/contracts/src/benchmarking/mod.rs

@@ -910,9 +910,9 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])
 
-	// The size of the supplied message does not influence the weight because as it is never
-	// processed during on-chain execution: It is only ever read during debugging which happens
-	// when the contract is called as RPC where weights do not matter.
+	// Benchmark debug_message call with zero input data.
+	// Whereas this function is used in RPC mode only, it still should be secured
+	// against an excessive use.
 	#[pov_mode = Measured]
 	seal_debug_message {
 		let r in 0 .. API_BENCHMARK_BATCHES;

frame/contracts/src/schedule.rs

@@ -630,6 +630,7 @@ impl<T: Config> Default for HostFnWeights<T> {
 				1
 			),
 			debug_message: cost_batched!(seal_debug_message),
+			debug_message_per_byte: cost_byte!(seal_debug_message_per_kb),
 			set_storage: cost_batched!(seal_set_storage),
 			set_code_hash: cost_batched!(seal_set_code_hash),
 			set_storage_per_new_byte: cost_byte_batched!(seal_set_storage_per_new_kb),