storage mapper from addr - add attribute, impl StorageMapperFromAddre…

… for VecMapper

contracts/examples/adder/src/adder.rs

@@ -12,6 +12,9 @@ pub trait Adder {
     #[storage_mapper("sum")]
     fn sum(&self) -> SingleValueMapper<BigUint>;
 
+    #[storage_mapper_from_address("sum")]
+    fn sum_with_address(&self, address: &ManagedAddress) -> SingleValueMapper<BigUint>;
+
     #[init]
     fn init(&self, initial_value: BigUint) {
         self.sum().set(initial_value);

framework/base/src/storage/mappers.rs

@@ -3,7 +3,7 @@ mod bi_di_mapper;
 mod linked_list_mapper;
 mod map_mapper;
 mod map_storage_mapper;
-mod mapper;
+pub mod mapper;
 mod ordered_binary_tree_mapper;
 mod queue_mapper;
 mod set_mapper;

framework/base/src/storage/mappers/mapper.rs

@@ -1,4 +1,4 @@
-use crate::{api::StorageMapperApi, storage::StorageKey};
+use crate::{api::StorageMapperApi, storage::StorageKey, types::ManagedAddress};
 
 pub trait StorageMapper<SA>: 'static
 where
@@ -8,6 +8,13 @@ where
     fn new(base_key: StorageKey<SA>) -> Self;
 }
 
+pub trait StorageMapperFromAddress<SA>: StorageMapper<SA>
+where
+    SA: StorageMapperApi,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self;
+}
+
 pub trait StorageClearable {
     /// Clears all the entries owned by the storage.
     fn clear(&mut self);

framework/base/src/storage/mappers/vec_mapper.rs

@@ -1,4 +1,5 @@
 use super::{
+    mapper::StorageMapperFromAddress,
     set_mapper::{CurrentStorage, StorageAddress},
     StorageClearable, StorageMapper,
 };
@@ -56,12 +57,31 @@ where
     }
 }
 
-impl<SA, T> VecMapper<SA, T, ManagedAddress<SA>>
+impl<SA, T> StorageMapper<SA> for VecMapper<SA, T, ManagedAddress<SA>>
 where
     SA: StorageMapperApi,
     T: TopEncode + TopDecode,
 {
-    pub fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
+    fn new(base_key: StorageKey<SA>) -> Self {
+        let mut len_key = base_key.clone();
+        len_key.append_bytes(LEN_SUFFIX);
+
+        VecMapper {
+            _phantom_api: PhantomData,
+            address: ManagedAddress::default(),
+            base_key,
+            len_key,
+            _phantom_item: PhantomData,
+        }
+    }
+}
+
+impl<SA, T> StorageMapperFromAddress<SA> for VecMapper<SA, T, ManagedAddress<SA>>
+where
+    SA: StorageMapperApi,
+    T: TopEncode + TopDecode,
+{
+    fn new_from_address(address: ManagedAddress<SA>, base_key: StorageKey<SA>) -> Self {
         let mut len_key = base_key.clone();
         len_key.append_bytes(LEN_SUFFIX);
 

framework/derive/src/generate/auto_impl.rs

@@ -4,8 +4,8 @@ use super::{
     auto_impl_event::generate_event_impl,
     auto_impl_proxy::generate_proxy_getter_impl,
     auto_impl_storage::{
-        generate_clear_impl, generate_getter_impl, generate_is_empty_impl, generate_mapper_impl,
-        generate_setter_impl,
+        generate_clear_impl, generate_getter_impl, generate_is_empty_impl,
+        generate_mapper_from_address_impl, generate_mapper_impl, generate_setter_impl,
     },
 };
 
@@ -33,6 +33,9 @@ fn generate_auto_impl(m: &Method, auto_impl: &AutoImpl) -> proc_macro2::TokenStr
         AutoImpl::StorageGetter { identifier } => generate_getter_impl(m, identifier),
         AutoImpl::StorageSetter { identifier } => generate_setter_impl(m, identifier),
         AutoImpl::StorageMapper { identifier } => generate_mapper_impl(m, identifier),
+        AutoImpl::StorageMapperFromAddress { identifier } => {
+            generate_mapper_from_address_impl(m, identifier)
+        },
         AutoImpl::StorageIsEmpty { identifier } => generate_is_empty_impl(m, identifier),
         AutoImpl::StorageClear { identifier } => generate_clear_impl(m, identifier),
         AutoImpl::ProxyGetter => generate_proxy_getter_impl(m),

framework/derive/src/generate/auto_impl_storage.rs

@@ -82,6 +82,25 @@ pub fn generate_mapper_impl(m: &Method, identifier: &str) -> proc_macro2::TokenS
     }
 }
 
+pub fn generate_mapper_from_address_impl(m: &Method, identifier: &str) -> proc_macro2::TokenStream {
+    let msig = method_gen::generate_sig_with_attributes(m);
+    let key_snippet = generate_key_snippet(&m.method_args[1..], identifier);
+
+    match m.return_type.clone() {
+        syn::ReturnType::Default => panic!("getter from address should return some value"),
+        syn::ReturnType::Type(_, ty) => {
+            quote! {
+                #msig {
+                    #key_snippet
+                    <#ty as multiversx_sc::storage::mappers::StorageMapper<Self::Api>>::new(
+                        ___key___
+                    )
+                }
+            }
+        },
+    }
+}
+
 pub fn generate_is_empty_impl(m: &Method, identifier: &str) -> proc_macro2::TokenStream {
     let msig = method_gen::generate_sig_with_attributes(m);
     let key_snippet = generate_key_snippet(m.method_args.as_slice(), identifier);

framework/derive/src/model/method.rs

@@ -7,6 +7,7 @@ pub enum AutoImpl {
     StorageGetter { identifier: String },
     StorageSetter { identifier: String },
     StorageMapper { identifier: String },
+    StorageMapperFromAddress { identifier: String },
     StorageIsEmpty { identifier: String },
     StorageClear { identifier: String },
     ProxyGetter,

framework/derive/src/parse/attributes/attr_names.rs

@@ -21,6 +21,7 @@ pub(super) static ATTR_CALLBACK_CALL_RESULT: &str = "call_result";
 pub(super) static ATTR_STORAGE_GET: &str = "storage_get";
 pub(super) static ATTR_STORAGE_SET: &str = "storage_set";
 pub(super) static ATTR_STORAGE_MAPPER: &str = "storage_mapper";
+pub(super) static ATTR_STORAGE_MAPPER_FROM_ADDRESS: &str = "storage_mapper_from_address";
 pub(super) static ATTR_STORAGE_IS_EMPTY: &str = "storage_is_empty";
 pub(super) static ATTR_STORAGE_CLEAR: &str = "storage_clear";
 pub(super) static ATTR_PROXY: &str = "proxy";

framework/derive/src/parse/attributes/storage_attr.rs

@@ -36,6 +36,20 @@ impl StorageMapperAttribute {
     }
 }
 
+pub struct StorageMapperFromAddressAttribute {
+    pub identifier: String,
+}
+
+impl StorageMapperFromAddressAttribute {
+    pub fn parse(attr: &syn::Attribute) -> Option<Self> {
+        is_attr_one_string_arg(attr, ATTR_STORAGE_MAPPER_FROM_ADDRESS).map(|arg_str| {
+            StorageMapperFromAddressAttribute {
+                identifier: arg_str,
+            }
+        })
+    }
+}
+
 pub struct StorageIsEmptyAttribute {
     pub identifier: String,
 }

framework/derive/src/parse/auto_impl_parse.rs

@@ -5,10 +5,11 @@ use super::attributes::*;
 fn assert_no_other_auto_impl(method: &Method) {
     assert!(
         method.implementation.is_no_implementation(),
-        "Only one auto-implementation can be specified at one time. Auto-implementations are: {}{}{}{}{}{}{}{}",
+        "Only one auto-implementation can be specified at one time. Auto-implementations are: {}{}{}{}{}{}{}{}{}",
         "`#[storage_get]`, ",
         "`#[storage_set]`, ",
         "`#[storage_mapper]`, ",
+        "`#[storage_mapper_from_address]`, ",
         "`#[storage_is_empty]`, ",
         "`#[storage_clear]`, ",
         "`#[proxy]`, ",
@@ -72,6 +73,20 @@ pub fn process_storage_mapper_attribute(attr: &syn::Attribute, method: &mut Meth
         .is_some()
 }
 
+pub fn process_storage_mapper_from_address_attribute(
+    attr: &syn::Attribute,
+    method: &mut Method,
+) -> bool {
+    StorageMapperFromAddressAttribute::parse(attr)
+        .map(|storage_mapper_from_address| {
+            assert_no_other_auto_impl(&*method);
+            method.implementation = MethodImpl::Generated(AutoImpl::StorageMapperFromAddress {
+                identifier: storage_mapper_from_address.identifier,
+            });
+        })
+        .is_some()
+}
+
 pub fn process_storage_is_empty_attribute(attr: &syn::Attribute, method: &mut Method) -> bool {
     StorageIsEmptyAttribute::parse(attr)
         .map(|storage_is_empty| {

framework/derive/src/parse/method_parse.rs

@@ -5,7 +5,8 @@ use super::{
     auto_impl_parse::{
         process_event_attribute, process_proxy_attribute, process_storage_clear_attribute,
         process_storage_get_attribute, process_storage_is_empty_attribute,
-        process_storage_mapper_attribute, process_storage_set_attribute,
+        process_storage_mapper_attribute, process_storage_mapper_from_address_attribute,
+        process_storage_set_attribute,
     },
     extract_method_args, process_allow_multiple_var_args_attribute, process_callback_attribute,
     process_callback_raw_attribute, process_endpoint_attribute, process_external_view_attribute,
@@ -127,6 +128,7 @@ fn process_attribute_second_pass(
         || process_storage_get_attribute(attr, method)
         || process_storage_set_attribute(attr, method)
         || process_storage_mapper_attribute(attr, method)
+        || process_storage_mapper_from_address_attribute(attr, method)
         || process_storage_is_empty_attribute(attr, method)
         || process_storage_clear_attribute(attr, method)
         || process_output_names_attribute(attr, method)