refactor(node): Benchmark tasks and reduce GasAllowance accordingly (#…

…2797)

Cargo.toml

@@ -371,15 +371,15 @@ demo-calc-hash-in-one-block = { path = "examples/calc-hash/in-one-block" }
 demo-calc-hash-over-blocks = { path = "examples/calc-hash/over-blocks" }
 demo-custom = { path = "examples/custom" }
 demo-compose = { path = "examples/compose" }
-demo-constructor = { path = "examples/constructor" }
+demo-constructor = { path = "examples/constructor", default-features = false }
 demo-delayed-sender = { path = "examples/delayed-sender" }
 demo-distributor = { path = "examples/distributor" }
 demo-futures-unordered = { path = "examples/futures-unordered", features = ["debug"] }
 demo-gas-burned = { path = "examples/gas-burned" }
 demo-fungible-token = { path = "examples/fungible-token" }
 demo-incomplete-async-payloads = { path = "examples/incomplete-async-payloads" }
 demo-init-fail-sender = { path = "examples/init-fail-sender" }
-demo-init-wait = { path = "examples/init-wait" }
+demo-init-wait = { path = "examples/init-wait", default-features = false }
 demo-init-wait-reply-exit = { path = "examples/init-wait-reply-exit" }
 demo-messager = { path = "examples/messager" }
 demo-meta-io = { path = "examples/new-meta/io" }
@@ -396,15 +396,15 @@ demo-proxy-relay = { path = "examples/proxy-relay" }
 demo-proxy-reservation-with-gas = { path = "examples/proxy-reservation-with-gas" }
 demo-read-big-state = { path = "examples/read-big-state", default-features = false }
 demo-reservation-manager = { path = "examples/reservation-manager" }
-demo-reserve-gas = { path = "examples/reserve-gas" }
+demo-reserve-gas = { path = "examples/reserve-gas", default-features = false }
 demo-rwlock = { path = "examples/rwlock" }
 demo-send-from-reservation = { path = "examples/send-from-reservation" }
 demo-signal-entry = { path = "examples/signal-entry" }
 demo-state-rollback = { path = "examples/state-rollback" }
 demo-sync-duplicate = { path = "examples/sync-duplicate" }
 demo-vec = { path = "examples/vec" }
 demo-wait = { path = "examples/wait" }
-demo-waiter = { path = "examples/waiter" }
+demo-waiter = { path = "examples/waiter", default-features = false }
 demo-wait-timeout = { path = "examples/wait-timeout" }
 demo-wait-wake = { path = "examples/wait_wake" }
 demo-waiting-proxy = { path = "examples/waiting-proxy" }

common/src/lib.rs

@@ -73,6 +73,9 @@ pub use gas_provider::{
     LockId, LockableTree, Provider as GasProvider, ReservableTree, Tree as GasTree,
 };
 
+/// Type alias for gas entity.
+pub type Gas = u64;
+
 pub trait Origin: Sized {
     fn into_origin(self) -> H256;
     fn from_origin(val: H256) -> Self;
@@ -228,18 +231,6 @@ impl<BlockNumber: Copy + Saturating> Program<BlockNumber> {
             })
         )
     }
-
-    pub fn is_uninitialized(&self) -> Option<MessageId> {
-        if let Program::Active(ActiveProgram {
-            state: ProgramState::Uninitialized { message_id },
-            ..
-        }) = self
-        {
-            Some(*message_id)
-        } else {
-            None
-        }
-    }
 }
 
 #[derive(Clone, Debug, derive_more::Display)]

common/src/scheduler/task.rs

@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::paused_program_storage::SessionId;
+use crate::{paused_program_storage::SessionId, Gas};
 use frame_support::{
     codec::{self, Decode, Encode, MaxEncodedLen},
     scale_info::{self, TypeInfo},
@@ -85,7 +85,7 @@ pub enum ScheduledTask<AccountId> {
 }
 
 impl<AccountId> ScheduledTask<AccountId> {
-    pub fn process_with(self, handler: &mut impl TaskHandler<AccountId>) {
+    pub fn process_with(self, handler: &mut impl TaskHandler<AccountId>) -> Gas {
         use ScheduledTask::*;
 
         match self {
@@ -117,32 +117,36 @@ pub trait TaskHandler<AccountId> {
     // Rent charging section.
     // -----
     /// Pause program action.
-    fn pause_program(&mut self, program_id: ProgramId);
+    fn pause_program(&mut self, program_id: ProgramId) -> Gas;
     /// Remove code action.
-    fn remove_code(&mut self, code_id: CodeId);
+    fn remove_code(&mut self, code_id: CodeId) -> Gas;
     /// Remove from mailbox action.
-    fn remove_from_mailbox(&mut self, user_id: AccountId, message_id: MessageId);
+    fn remove_from_mailbox(&mut self, user_id: AccountId, message_id: MessageId) -> Gas;
     /// Remove from waitlist action.
-    fn remove_from_waitlist(&mut self, program_id: ProgramId, message_id: MessageId);
+    fn remove_from_waitlist(&mut self, program_id: ProgramId, message_id: MessageId) -> Gas;
     /// Remove paused program action.
-    fn remove_paused_program(&mut self, program_id: ProgramId);
+    fn remove_paused_program(&mut self, program_id: ProgramId) -> Gas;
 
     // Time chained section.
     // -----
     /// Wake message action.
-    fn wake_message(&mut self, program_id: ProgramId, message_id: MessageId);
+    fn wake_message(&mut self, program_id: ProgramId, message_id: MessageId) -> Gas;
 
     // Send delayed message to program action.
-    fn send_dispatch(&mut self, stashed_message_id: MessageId);
+    fn send_dispatch(&mut self, stashed_message_id: MessageId) -> Gas;
 
     // Send delayed message to user action.
-    fn send_user_message(&mut self, stashed_message_id: MessageId, to_mailbox: bool);
+    fn send_user_message(&mut self, stashed_message_id: MessageId, to_mailbox: bool) -> Gas;
 
     /// Remove gas reservation action.
-    fn remove_gas_reservation(&mut self, program_id: ProgramId, reservation_id: ReservationId);
+    fn remove_gas_reservation(
+        &mut self,
+        program_id: ProgramId,
+        reservation_id: ReservationId,
+    ) -> Gas;
 
     /// Remove data created by resume program session.
-    fn remove_resume_session(&mut self, session_id: SessionId);
+    fn remove_resume_session(&mut self, session_id: SessionId) -> Gas;
 }
 
 #[test]

examples/constructor/Cargo.toml

@@ -7,6 +7,7 @@ license.workspace = true
 workspace = "../../"
 
 [dependencies]
+gcore.workspace = true
 gstd.workspace = true
 parity-scale-codec = { workspace = true, features = ["derive"] }
 hex.workspace = true
@@ -16,5 +17,6 @@ gear-wasm-builder.workspace = true
 
 [features]
 debug = ["gstd/debug"]
-std = []
+wasm-wrapper = []
+std = ["wasm-wrapper"]
 default = ["std"]

examples/constructor/build.rs

@@ -16,6 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use gear_wasm_builder::WasmBuilder;
+
 fn main() {
-    gear_wasm_builder::build();
+    WasmBuilder::new()
+        .exclude_features(vec!["std", "wasm-wrapper"])
+        .build();
 }

examples/constructor/src/arg.rs

@@ -90,7 +90,7 @@ impl From<&'static str> for Arg<bool> {
     }
 }
 
-#[cfg(not(feature = "std"))]
+#[cfg(not(feature = "wasm-wrapper"))]
 mod wasm {
     use super::*;
 

examples/constructor/src/call.rs

@@ -44,7 +44,7 @@ pub enum Call {
     Loop,
 }
 
-#[cfg(not(feature = "std"))]
+#[cfg(not(feature = "wasm-wrapper"))]
 mod wasm {
     use super::*;
     use crate::DATA;

examples/constructor/src/lib.rs

@@ -16,22 +16,22 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-#![no_std]
+#![cfg_attr(not(feature = "std"), no_std)]
 
 extern crate alloc;
 
-#[cfg(not(feature = "std"))]
+#[cfg(not(feature = "wasm-wrapper"))]
 mod wasm;
 
-#[cfg(not(feature = "std"))]
+#[cfg(not(feature = "wasm-wrapper"))]
 pub(crate) use wasm::DATA;
 
-#[cfg(feature = "std")]
+#[cfg(feature = "wasm-wrapper")]
 mod code {
     include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "wasm-wrapper")]
 pub use code::WASM_BINARY_OPT as WASM_BINARY;
 
 mod arg;

examples/constructor/src/scheme/demo_proxy_with_gas.rs

@@ -1,5 +1,5 @@
 use crate::{Arg, Call, Calls, Scheme};
-use gstd::errors::{ReplyCode, SuccessReplyReason};
+use gcore::errors::{ReplyCode, SuccessReplyReason};
 use parity_scale_codec::Encode;
 
 pub const PROXIED_MESSAGE: &[u8] = b"proxied message";

examples/delayed-sender/Cargo.toml

@@ -14,5 +14,6 @@ gear-wasm-builder.workspace = true
 
 [features]
 debug = ["gstd/debug"]
-std = [ ]
+wasm-wrapper = []
+std = ["wasm-wrapper"]
 default = ["std"]

examples/delayed-sender/build.rs

@@ -16,6 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use gear_wasm_builder::WasmBuilder;
+
 fn main() {
-    gear_wasm_builder::build();
+    WasmBuilder::new()
+        .exclude_features(vec!["std", "wasm-wrapper"])
+        .build();
 }

examples/delayed-sender/src/code.rs

@@ -1,3 +1,21 @@
+// This file is part of Gear.
+
+// Copyright (C) Gear Technologies Inc.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 use gstd::{msg, MessageId, exec};
 
 static mut MID: Option<MessageId> = None;

examples/delayed-sender/src/lib.rs

@@ -15,17 +15,18 @@
 
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 #![no_std]
 
-#[cfg(feature = "std")]
+#[cfg(feature = "wasm-wrapper")]
 mod code {
     include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "wasm-wrapper")]
 pub use code::WASM_BINARY_OPT as WASM_BINARY;
 
-#[cfg(not(feature = "std"))]
+#[cfg(not(feature = "wasm-wrapper"))]
 mod wasm {
     include! {"./code.rs"}
 }

examples/init-wait/Cargo.toml

@@ -2,8 +2,8 @@
 name = "demo-init-wait"
 version = "0.1.0"
 authors.workspace = true
-edition = "2021"
-license = "GPL-3.0"
+edition.workspace = true
+license.workspace = true
 workspace = "../../"
 
 [dependencies]
@@ -12,9 +12,8 @@ gstd.workspace = true
 [build-dependencies]
 gear-wasm-builder.workspace = true
 
-[lib]
-
 [features]
 debug = ["gstd/debug"]
-std = []
+wasm-wrapper = []
+std = ["wasm-wrapper"]
 default = ["std"]

examples/init-wait/build.rs

@@ -16,6 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+use gear_wasm_builder::WasmBuilder;
+
 fn main() {
-    gear_wasm_builder::build();
+    WasmBuilder::new()
+        .exclude_features(vec!["std", "wasm-wrapper"])
+        .build();
 }

examples/init-wait/src/code.rs

@@ -1,3 +1,21 @@
+// This file is part of Gear.
+
+// Copyright (C) 2021-2023 Gear Technologies Inc.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 use gstd::{exec, msg, collections::BTreeMap, MessageId};
 
 #[derive(PartialEq, Debug)]

examples/init-wait/src/lib.rs

@@ -1,14 +1,32 @@
+// This file is part of Gear.
+
+// Copyright (C) 2021-2023 Gear Technologies Inc.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(feature = "std")]
+#[cfg(feature = "wasm-wrapper")]
 mod code {
     include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "wasm-wrapper")]
 pub use code::WASM_BINARY_OPT as WASM_BINARY;
 
-#[cfg(not(feature = "std"))]
+#[cfg(not(feature = "wasm-wrapper"))]
 mod wasm {
     include! {"./code.rs"}
 }

examples/reserve-gas/Cargo.toml

@@ -18,5 +18,6 @@ gtest.workspace = true
 
 [features]
 debug = ["gstd/debug"]
-std = []
+wasm-wrapper = []
+std = ["wasm-wrapper", "parity-scale-codec/std"]
 default = ["std"]