Storage refactoring new hope for review

examples/delegator/lib.rs

@@ -6,10 +6,6 @@ use ink_lang as ink;
 mod delegator {
     use accumulator::AccumulatorRef;
     use adder::AdderRef;
-    use ink_storage::traits::{
-        PackedLayout,
-        SpreadLayout,
-    };
     use subber::SubberRef;
 
     /// Specifies the state of the `delegator` contract.
@@ -18,20 +14,10 @@ mod delegator {
     /// and in `Subber` state will delegate to the `Subber` contract.
     ///
     /// The initial state is `Adder`.
-    #[derive(
-        Debug,
-        Copy,
-        Clone,
-        PartialEq,
-        Eq,
-        scale::Encode,
-        scale::Decode,
-        SpreadLayout,
-        PackedLayout,
-    )]
+    #[derive(Debug, Copy, Clone, PartialEq, Eq, scale::Decode, scale::Encode)]
     #[cfg_attr(
         feature = "std",
-        derive(::scale_info::TypeInfo, ::ink_storage::traits::StorageLayout)
+        derive(ink_storage::traits::StorageLayout, scale_info::TypeInfo)
     )]
     pub enum Which {
         Adder,

examples/dns/lib.rs

@@ -4,10 +4,7 @@ use ink_lang as ink;
 
 #[ink::contract]
 mod dns {
-    use ink_storage::{
-        traits::SpreadAllocate,
-        Mapping,
-    };
+    use ink_storage::Mapping;
 
     /// Emitted whenever a new name is being registered.
     #[ink(event)]
@@ -58,7 +55,7 @@ mod dns {
     /// to facilitate transfers, voting and DApp-related operations instead
     /// of resorting to long IP addresses that are hard to remember.
     #[ink(storage)]
-    #[derive(Default, SpreadAllocate)]
+    #[derive(Default)]
     pub struct DomainNameService {
         /// A hashmap to store all name to addresses mapping.
         name_to_address: Mapping<Hash, AccountId>,
@@ -85,11 +82,7 @@ mod dns {
         /// Creates a new domain name service contract.
         #[ink(constructor)]
         pub fn new() -> Self {
-            // This call is required in order to correctly initialize the
-            // `Mapping`s of our contract.
-            ink_lang::utils::initialize_contract(|contract: &mut Self| {
-                contract.default_address = Default::default();
-            })
+            Default::default()
         }
 
         /// Register specific name with caller as owner.
@@ -115,7 +108,7 @@ mod dns {
                 return Err(Error::CallerIsNotOwner)
             }
 
-            let old_address = self.name_to_address.get(name);
+            let old_address = self.name_to_address.get(&name);
             self.name_to_address.insert(&name, &new_address);
 
             self.env().emit_event(SetAddress {

examples/erc1155/lib.rs

@@ -187,10 +187,7 @@ pub trait Erc1155TokenReceiver {
 mod erc1155 {
     use super::*;
 
-    use ink_storage::{
-        traits::SpreadAllocate,
-        Mapping,
-    };
+    use ink_storage::Mapping;
 
     type Owner = AccountId;
     type Operator = AccountId;
@@ -230,7 +227,7 @@ mod erc1155 {
 
     /// An ERC-1155 contract.
     #[ink(storage)]
-    #[derive(Default, SpreadAllocate)]
+    #[derive(Default)]
     pub struct Contract {
         /// Tracks the balances of accounts across the different tokens that they might be holding.
         balances: Mapping<(AccountId, TokenId), Balance>,
@@ -245,11 +242,7 @@ mod erc1155 {
         /// Initialize a default instance of this ERC-1155 implementation.
         #[ink(constructor)]
         pub fn new() -> Self {
-            // This call is required in order to correctly initialize the
-            // `Mapping`s of our contract.
-            //
-            // Not that `token_id_nonce` will be initialized to its `Default` value.
-            ink_lang::utils::initialize_contract(|_| {})
+            Default::default()
         }
 
         /// Create the initial supply for a token.

examples/erc20/lib.rs

@@ -4,14 +4,11 @@ use ink_lang as ink;
 
 #[ink::contract]
 mod erc20 {
-    use ink_storage::{
-        traits::SpreadAllocate,
-        Mapping,
-    };
+    use ink_storage::Mapping;
 
     /// A simple ERC-20 contract.
     #[ink(storage)]
-    #[derive(SpreadAllocate)]
+    #[derive(Default)]
     pub struct Erc20 {
         /// Total token supply.
         total_supply: Balance,
@@ -60,23 +57,16 @@ mod erc20 {
         /// Creates a new ERC-20 contract with the specified initial supply.
         #[ink(constructor)]
         pub fn new(initial_supply: Balance) -> Self {
-            // This call is required in order to correctly initialize the
-            // `Mapping`s of our contract.
-            ink_lang::utils::initialize_contract(|contract| {
-                Self::new_init(contract, initial_supply)
-            })
-        }
-
-        /// Default initializes the ERC-20 contract with the specified initial supply.
-        fn new_init(&mut self, initial_supply: Balance) {
+            let mut instance = Erc20::default();
             let caller = Self::env().caller();
-            self.balances.insert(&caller, &initial_supply);
-            self.total_supply = initial_supply;
+            instance.balances.insert(&caller, &initial_supply);
+            instance.total_supply = initial_supply;
             Self::env().emit_event(Transfer {
                 from: None,
                 to: Some(caller),
                 value: initial_supply,
             });
+            instance
         }
 
         /// Returns the total token supply.

examples/erc721/lib.rs

@@ -54,10 +54,7 @@ use ink_lang as ink;
 
 #[ink::contract]
 mod erc721 {
-    use ink_storage::{
-        traits::SpreadAllocate,
-        Mapping,
-    };
+    use ink_storage::Mapping;
 
     use scale::{
         Decode,
@@ -68,7 +65,7 @@ mod erc721 {
     pub type TokenId = u32;
 
     #[ink(storage)]
-    #[derive(Default, SpreadAllocate)]
+    #[derive(Default)]
     pub struct Erc721 {
         /// Mapping from token to owner.
         token_owner: Mapping<TokenId, AccountId>,
@@ -129,9 +126,7 @@ mod erc721 {
         /// Creates a new ERC-721 token contract.
         #[ink(constructor)]
         pub fn new() -> Self {
-            // This call is required in order to correctly initialize the
-            // `Mapping`s of our contract.
-            ink_lang::utils::initialize_contract(|_| {})
+            Default::default()
         }
 
         /// Returns the balance of the owner.

examples/mother/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "mother"
 description = "Mother of all contracts"
-version = "3.0.1"
+version = "4.0.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 publish = false

examples/mother/lib.rs

@@ -29,52 +29,23 @@ mod mother {
         vec::Vec,
     };
 
-    use ink_lang::utils::initialize_contract;
-    use ink_storage::{
-        traits::{
-            PackedLayout,
-            SpreadAllocate,
-            SpreadLayout,
-        },
-        Mapping,
-    };
+    use ink_storage::Mapping;
 
-    use ink_storage::traits::KeyPtr;
     /// Struct for storing winning bids per bidding sample (a block).
     /// Vector index corresponds to sample number.
     /// Wrapping vector, just added for testing UI components.
-    #[derive(
-        Default,
-        scale::Encode,
-        scale::Decode,
-        PartialEq,
-        Eq,
-        Debug,
-        Clone,
-        SpreadLayout,
-        PackedLayout,
-        SpreadAllocate,
-    )]
+    #[derive(Default, PartialEq, Debug, Clone, scale::Decode, scale::Encode)]
     #[cfg_attr(
         feature = "std",
-        derive(scale_info::TypeInfo, ink_storage::traits::StorageLayout,)
+        derive(ink_storage::traits::StorageLayout, scale_info::TypeInfo)
     )]
     pub struct Bids(Vec<Vec<Option<(AccountId, Balance)>>>);
 
     /// Auction outline.
-    #[derive(
-        scale::Encode,
-        scale::Decode,
-        Eq,
-        PartialEq,
-        Debug,
-        Clone,
-        SpreadLayout,
-        PackedLayout,
-    )]
+    #[derive(PartialEq, Debug, Clone, scale::Decode, scale::Encode)]
     #[cfg_attr(
         feature = "std",
-        derive(scale_info::TypeInfo, ink_storage::traits::StorageLayout,)
+        derive(ink_storage::traits::StorageLayout, scale_info::TypeInfo)
     )]
     pub enum Outline {
         NoWinner,
@@ -85,19 +56,10 @@ mod mother {
     /// Auction statuses.
     /// Logic inspired by
     /// [Parachain Auction](https://github.com/paritytech/polkadot/blob/master/runtime/common/src/traits.rs#L160)
-    #[derive(
-        scale::Encode,
-        scale::Decode,
-        Eq,
-        PartialEq,
-        Debug,
-        Clone,
-        SpreadLayout,
-        PackedLayout,
-    )]
+    #[derive(PartialEq, Debug, Clone, scale::Decode, scale::Encode)]
     #[cfg_attr(
         feature = "std",
-        derive(scale_info::TypeInfo, ink_storage::traits::StorageLayout,)
+        derive(ink_storage::traits::StorageLayout, scale_info::TypeInfo)
     )]
     pub enum Status {
         /// An auction has not started yet.
@@ -115,27 +77,11 @@ mod mother {
         RfDelay(BlockNumber),
     }
 
-    impl SpreadAllocate for Status {
-        #[inline]
-        fn allocate_spread(ptr: &mut KeyPtr) -> Self {
-            ptr.advance_by(<BlockNumber>::FOOTPRINT * 2);
-            Self::NotStarted
-        }
-    }
     /// Struct for storing auction data.
-    #[derive(
-        Debug,
-        PartialEq,
-        scale::Encode,
-        scale::Decode,
-        Clone,
-        SpreadLayout,
-        PackedLayout,
-        SpreadAllocate,
-    )]
+    #[derive(Debug, PartialEq, Clone, scale::Decode, scale::Encode)]
     #[cfg_attr(
         feature = "std",
-        derive(scale_info::TypeInfo, ink_storage::traits::StorageLayout,)
+        derive(ink_storage::traits::StorageLayout, scale_info::TypeInfo)
     )]
     pub struct Auction {
         /// Branded name of the auction event.
@@ -186,7 +132,7 @@ mod mother {
 
     /// Storage of the contract.
     #[ink(storage)]
-    #[derive(Default, SpreadAllocate)]
+    #[derive(Default)]
     pub struct Mother {
         auction: Auction,
         balances: Mapping<AccountId, Balance>,
@@ -195,18 +141,15 @@ mod mother {
     impl Mother {
         #[ink(constructor)]
         pub fn new(auction: Auction) -> Self {
-            initialize_contract(|c: &mut Self| {
-                c.balances = <Mapping<AccountId, Balance>>::default();
-                c.auction = auction;
-            })
+            Self {
+                balances: Default::default(),
+                auction,
+            }
         }
 
         #[ink(constructor)]
         pub fn default() -> Self {
-            initialize_contract(|c: &mut Self| {
-                c.balances = <Mapping<AccountId, Balance>>::default();
-                c.auction = Auction::default();
-            })
+            Default::default()
         }
 
         /// Takes an auction data struct as input and returns it back.