Update substrate

common/Cargo.toml

@@ -17,14 +17,14 @@ gear-core = { path = "../core" }
 
 # Substrate deps
 
-sp-core = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false }
-sp-io = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false }
-sp-runtime = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false }
-sp-std = { version = "4.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false }
-sp-arithmetic = { version = "5.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false }
-frame-support = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false }
-frame-system = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false, optional = true }
-frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false, optional = true }
+sp-core = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false }
+sp-io = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false }
+sp-runtime = { version = "6.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false }
+sp-std = { version = "4.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false }
+sp-arithmetic = { version = "5.0.0", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false }
+frame-support = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false }
+frame-system = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false, optional = true }
+frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false, optional = true }
 gear-runtime-interface = { path = "../runtime-interface", default-features = false }
 parity-wasm = { version = "0.42.2", default-features = false, optional = true }
 derive_more = "0.99.17"

common/src/lib.rs

@@ -36,7 +36,7 @@ use core::fmt;
 use frame_support::{
     dispatch::{DispatchError, DispatchResult},
     traits::Imbalance,
-    weights::{IdentityFee, WeightToFeePolynomial},
+    weights::{IdentityFee, WeightToFee},
 };
 use gear_core::{
     ids::{CodeId, MessageId, ProgramId},
@@ -134,7 +134,7 @@ pub trait GasPrice {
     /// A price for the `gas` amount of gas.
     /// In general case, this doesn't necessarily has to be constant.
     fn gas_price(gas: u64) -> Self::Balance {
-        IdentityFee::<Self::Balance>::calc(&gas)
+        IdentityFee::<Self::Balance>::weight_to_fee(&gas)
     }
 }
 

common/src/storage/complex/mailbox.rs

@@ -50,7 +50,7 @@ pub trait Mailbox {
     fn remove(key1: Self::Key1, key2: Self::Key2) -> Result<Self::Value, Self::OutputError>;
 
     /// Removes all values from all key's mailboxes.
-    fn remove_all();
+    fn clear();
 }
 
 /// Represents store of mailbox's action callbacks.
@@ -138,8 +138,8 @@ where
         }
     }
 
-    fn remove_all() {
-        T::remove_all()
+    fn clear() {
+        T::clear()
     }
 }
 

common/src/storage/complex/messenger.rs

@@ -161,8 +161,8 @@ pub trait Messenger {
         Self::Sent::reset();
         Self::Dequeued::reset();
         Self::QueueProcessing::allow();
-        Self::Queue::remove_all();
-        Self::Mailbox::remove_all();
-        Self::Waitlist::remove_all();
+        Self::Queue::clear();
+        Self::Mailbox::clear();
+        Self::Waitlist::clear();
     }
 }

common/src/storage/complex/queue.rs

@@ -44,7 +44,7 @@ pub trait Queue {
     fn queue(value: Self::Value) -> Result<(), Self::OutputError>;
 
     /// Removes all values from queue.
-    fn remove_all();
+    fn clear();
 
     /// Inserts given value at the beginning of the queue.
     ///
@@ -87,8 +87,8 @@ where
         T::push_back(key, value).map_err(Into::into)
     }
 
-    fn remove_all() {
-        T::remove_all()
+    fn clear() {
+        T::clear()
     }
 
     fn requeue(value: Self::Value) -> Result<(), Self::OutputError> {

common/src/storage/complex/waitlist.rs

@@ -57,7 +57,7 @@ pub trait Waitlist {
     ) -> Result<(Self::Value, Self::BlockNumber), Self::OutputError>;
 
     /// Removes all values from all key's waitlisted.
-    fn remove_all();
+    fn clear();
 }
 
 /// Represents store of waitlist's action callbacks.
@@ -156,8 +156,8 @@ where
         }
     }
 
-    fn remove_all() {
-        T::remove_all()
+    fn clear() {
+        T::clear()
     }
 }
 

common/src/storage/complicated/dequeue.rs

@@ -58,7 +58,7 @@ pub trait Dequeue {
     fn push_front(key: Self::Key, value: Self::Value) -> Result<(), Self::Error>;
 
     /// Removes all values.
-    fn remove_all();
+    fn clear();
 }
 
 /// Represents store of dequeue's action callbacks.
@@ -77,7 +77,7 @@ pub trait DequeueCallbacks {
     type OnPushBack: Callback<Self::Value>;
     /// Callback on success `push_front`.
     type OnPushFront: Callback<Self::Value>;
-    /// Callback on success `remove_all`.
+    /// Callback on success `clear`.
     type OnRemoveAll: EmptyCallback;
 }
 
@@ -308,10 +308,10 @@ where
         }
     }
 
-    fn remove_all() {
+    fn clear() {
         HVS::kill();
         TVS::kill();
-        MS::remove_all();
+        MS::clear();
         Callbacks::OnRemoveAll::call();
     }
 }

common/src/storage/primitives/double_map.rs

@@ -69,7 +69,7 @@ pub trait DoubleMapStorage {
     fn remove(key1: Self::Key1, key2: Self::Key2);
 
     /// Removes all values.
-    fn remove_all();
+    fn clear();
 
     /// Gets value stored under given keys, if present,
     /// and removes it from storage.
@@ -127,8 +127,8 @@ macro_rules! wrap_storage_double_map {
                 $storage::<T>::remove(key1, key2)
             }
 
-            fn remove_all() {
-                $storage::<T>::remove_all(None);
+            fn clear() {
+                $storage::<T>::clear(u32::MAX, None);
             }
 
             fn take(key1: Self::Key1, key2: Self::Key2) -> Option<Self::Value> {

common/src/storage/primitives/map.rs

@@ -59,7 +59,7 @@ pub trait MapStorage {
     fn remove(key: Self::Key);
 
     /// Removes all values.
-    fn remove_all();
+    fn clear();
 
     /// Gets value stored under given key, if present,
     /// and removes it from storage.
@@ -118,8 +118,8 @@ macro_rules! wrap_storage_map {
                 $storage::<T>::remove(key)
             }
 
-            fn remove_all() {
-                $storage::<T>::remove_all($($rm_arg)?);
+            fn clear() {
+                $storage::<T>::clear(u32::MAX, None);
             }
 
             fn take(key: Self::Key) -> Option<Self::Value> {

core-backend/sandbox/Cargo.toml

@@ -11,7 +11,7 @@ gear-core-errors = { path = "../../core-errors", features = ["codec"] }
 gear-backend-common = { path = "../common" }
 
 parity-wasm = { version = "0.42.2", default-features = false }
-sp-sandbox = { version = "0.10.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-stable", default-features = false, features = ["host-sandbox"] }
+sp-sandbox = { version = "0.10.0-dev", git = "https://github.com/gear-tech/substrate.git", branch = "gear-latest", default-features = false, features = ["host-sandbox"] }
 log = { version = "0.4.17", default-features = false }
 derive_more = "0.99.17"
 codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false }