Base Key on [u8; 32]

.config/cargo_spellcheck.dic

@@ -1,4 +1,4 @@
-100
+110
 
 ABI
 AST
@@ -99,5 +99,6 @@ vector/S
 implementer/S
 deduplicated
 wildcard/S
+natively
 payability
 unpayable

crates/env/src/engine/experimental_off_chain/impls.rs

@@ -189,18 +189,15 @@ impl EnvBackend for EnvInstance {
         V: scale::Encode,
     {
         let v = scale::Encode::encode(value);
-        self.engine.set_storage(key.as_bytes(), &v[..]);
+        self.engine.set_storage(key.as_ref(), &v[..]);
     }
 
     fn get_contract_storage<R>(&mut self, key: &Key) -> Result<Option<R>>
     where
         R: scale::Decode,
     {
         let mut output: [u8; 9600] = [0; 9600];
-        match self
-            .engine
-            .get_storage(key.as_bytes(), &mut &mut output[..])
-        {
+        match self.engine.get_storage(key.as_ref(), &mut &mut output[..]) {
             Ok(_) => (),
             Err(ext::Error::KeyNotFound) => return Ok(None),
             Err(_) => panic!("encountered unexpected error"),
@@ -210,7 +207,7 @@ impl EnvBackend for EnvInstance {
     }
 
     fn clear_contract_storage(&mut self, key: &Key) {
-        self.engine.clear_storage(key.as_bytes())
+        self.engine.clear_storage(key.as_ref())
     }
 
     fn decode_input<T>(&mut self) -> Result<T>
@@ -445,7 +442,7 @@ impl TypedEnvBackend for EnvInstance {
         let enc_rent_allowance = &scale::Encode::encode(&rent_allowance)[..];
 
         let filtered: Vec<&[u8]> =
-            filtered_keys.iter().map(|k| &k.as_bytes()[..]).collect();
+            filtered_keys.iter().map(|k| &k.as_ref()[..]).collect();
         self.engine.restore_to(
             enc_account_id,
             enc_code_hash,

crates/env/src/engine/off_chain/tests.rs

@@ -31,13 +31,19 @@ fn store_load_clear() -> Result<()> {
     })
 }
 
+fn add_key(key: &Key, offset: u64) -> Key {
+    let mut result = *key;
+    result += offset;
+    result
+}
+
 #[test]
 fn key_add() -> Result<()> {
     crate::test::run_test::<crate::DefaultEnvironment, _>(|_| {
         let key00 = Key::from([0x0; 32]);
-        let key05 = key00 + 05_u64; // -> 5
-        let key10 = key00 + 10_u64; // -> 10         | same as key55
-        let key55 = key05 + 05_u64; // -> 5 + 5 = 10 | same as key10
+        let key05 = add_key(&key00, 5); // -> 5
+        let key10 = add_key(&key00, 10); // -> 10         | same as key55
+        let key55 = add_key(&key05, 5); // -> 5 + 5 = 10 | same as key10
         crate::set_contract_storage(&key55, &42);
         assert_eq!(crate::get_contract_storage::<i32>(&key10), Ok(Some(42)));
         crate::set_contract_storage(&key10, &1337);
@@ -51,9 +57,9 @@ fn key_add_sub() -> Result<()> {
     crate::test::run_test::<crate::DefaultEnvironment, _>(|_| {
         // given
         let key0a = Key::from([0x0; 32]);
-        let key1a = key0a + 1337_u64;
-        let key2a = key0a + 42_u64;
-        let key3a = key0a + 52_u64;
+        let key1a = add_key(&key0a, 1337);
+        let key2a = add_key(&key0a, 42);
+        let key3a = add_key(&key0a, 52);
 
         // when
         crate::set_contract_storage(&key0a, &1);

crates/env/src/engine/on_chain/impls.rs

@@ -220,15 +220,15 @@ impl EnvBackend for EnvInstance {
         V: scale::Encode,
     {
         let buffer = self.scoped_buffer().take_encoded(value);
-        ext::set_storage(key.as_bytes(), &buffer[..]);
+        ext::set_storage(key.as_ref(), &buffer[..]);
     }
 
     fn get_contract_storage<R>(&mut self, key: &Key) -> Result<Option<R>>
     where
         R: scale::Decode,
     {
         let output = &mut self.scoped_buffer().take_rest();
-        match ext::get_storage(key.as_bytes(), output) {
+        match ext::get_storage(key.as_ref(), output) {
             Ok(_) => (),
             Err(ExtError::KeyNotFound) => return Ok(None),
             Err(_) => panic!("encountered unexpected error"),
@@ -238,7 +238,7 @@ impl EnvBackend for EnvInstance {
     }
 
     fn clear_contract_storage(&mut self, key: &Key) {
-        ext::clear_storage(key.as_bytes())
+        ext::clear_storage(key.as_ref())
     }
 
     fn decode_input<T>(&mut self) -> Result<T>

crates/metadata/src/layout/mod.rs

@@ -99,17 +99,13 @@ impl<'de> serde::Deserialize<'de> for LayoutKey {
 
 impl<'a> From<&'a Key> for LayoutKey {
     fn from(key: &'a Key) -> Self {
-        Self {
-            key: key.to_bytes(),
-        }
+        Self { key: *key.as_ref() }
     }
 }
 
 impl From<Key> for LayoutKey {
     fn from(key: Key) -> Self {
-        Self {
-            key: key.to_bytes(),
-        }
+        Self { key: *key.as_ref() }
     }
 }
 

crates/primitives/Cargo.toml

@@ -18,6 +18,7 @@ include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]
 ink_prelude = { version = "3.0.0-rc6", path = "../prelude/", default-features = false }
 scale = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] }
 scale-info = { version = "1.0", default-features = false, features = ["derive"], optional = true }
+cfg-if = "1"
 
 [dev-dependencies]
 criterion = "0.3.1"