proof_size: None

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
nathanwhit · Dec 21, 2022 · fe5caf9 · fe5caf9
1 parent 8ddaa2f
commit fe5caf9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 0 deletions.
diff --git a/frame/support/procedural/src/storage/storage_struct.rs b/frame/support/procedural/src/storage/storage_struct.rs
@@ -281,6 +281,7 @@ pub fn decl_and_impl(def: &DeclStorageDefExt) -> TokenStream {
 										>::storage_value_final_key().to_vec(),
 										max_values: Some(1),
 										max_size: Some(max_size),
+										proof_size,
 									}
 								]
 							}

diff --git a/frame/support/src/storage/types/double_map.rs b/frame/support/src/storage/types/double_map.rs
@@ -701,6 +701,7 @@ where
 					.saturating_add(Value::max_encoded_len())
 					.saturated_into(),
 			),
+			proof_size: None,
 		}]
 	}
 }
@@ -727,6 +728,7 @@ where
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
 			max_size: None,
+			proof_size: None,
 		}]
 	}
 }

diff --git a/frame/support/src/storage/types/map.rs b/frame/support/src/storage/types/map.rs
@@ -450,6 +450,7 @@ where
 					.saturating_add(Value::max_encoded_len())
 					.saturated_into(),
 			),
+			proof_size: None,
 		}]
 	}
 }
@@ -474,6 +475,7 @@ where
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
 			max_size: None,
+			proof_size: None,
 		}]
 	}
 }

diff --git a/frame/support/src/storage/types/nmap.rs b/frame/support/src/storage/types/nmap.rs
@@ -590,6 +590,7 @@ where
 					.saturating_add(Value::max_encoded_len())
 					.saturated_into(),
 			),
+			proof_size: None,
 		}]
 	}
 }
@@ -612,6 +613,7 @@ where
 			prefix: Self::final_prefix().to_vec(),
 			max_values: MaxValues::get(),
 			max_size: None,
+			proof_size: None,
 		}]
 	}
 }

diff --git a/frame/support/src/storage/types/value.rs b/frame/support/src/storage/types/value.rs
@@ -239,6 +239,7 @@ where
 			prefix: Self::hashed_key().to_vec(),
 			max_values: Some(1),
 			max_size: Some(Value::max_encoded_len().saturated_into()),
+			proof_size: None,
 		}]
 	}
 }
@@ -259,6 +260,7 @@ where
 			prefix: Self::hashed_key().to_vec(),
 			max_values: Some(1),
 			max_size: None,
+			proof_size: None,
 		}]
 	}
 }

diff --git a/frame/support/src/traits/storage.rs b/frame/support/src/traits/storage.rs
@@ -65,6 +65,13 @@ pub struct StorageInfo {
 	pub max_values: Option<u32>,
 	/// The maximum size of key/values in the storage, or none if no maximum specified.
 	pub max_size: Option<u32>,
+	pub proof_size: Option<ProofSizeMode>,
+}
+
+#[derive(codec::Encode, codec::Decode, crate::RuntimeDebug, Eq, PartialEq, Clone)]
+pub enum ProofSizeMode {
+	MaxEncodedLen,
+	Measured,
 }
 
 /// A trait to give information about storage.