Merge branch 'feat/pop-api' into al3mart/query_relay_number

r0gue-io · Mar 4, 2024 · cbb14e4 · cbb14e4
2 parents 5fa282a + 275f487
commit cbb14e4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 309 deletions.
diff --git a/networks/rococo.toml b/networks/rococo.toml
@@ -20,3 +20,6 @@ default_command = "./target/release/pop-node"
 
     [[parachains.collators]]
     name = "pop"
+    command = "./target/release/pop-node"
+    port = 9944
+    args = ["-lruntime::contracts=debug", "-lpopapi::extension=debug"]
diff --git a/pop-api/src/impls/mod.rs b/pop-api/src/impls/mod.rs
diff --git a/pop-api/src/impls/pop_network.rs b/pop-api/src/impls/pop_network.rs
diff --git a/pop-api/src/interfaces/mod.rs b/pop-api/src/interfaces/mod.rs
diff --git a/pop-api/src/interfaces/nfts.rs b/pop-api/src/interfaces/nfts.rs
diff --git a/pop-api/src/lib.rs b/pop-api/src/lib.rs
@@ -1,8 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std, no_main)]
 
-pub mod impls;
-pub mod interfaces;
-
 use pop_api_primitives::storage_keys;
 pub mod v0;
 

diff --git a/runtime/src/extensions/ext_impl/dispatch.rs b/runtime/src/extensions/ext_impl/dispatch.rs
@@ -33,6 +33,15 @@ where
     let len = env.in_len();
     let call: <T as SysConfig>::RuntimeCall = env.read_as_unbounded(len)?;
 
+    // conservative weight estimate for deserializing the input. The actual weight is less and should utilize a custom benchmark
+    let base_weight: Weight = T::DbWeight::get().reads(len.into());
+
+    // weight for dispatching the call
+    let dispatch_weight = call.get_dispatch_info().weight;
+
+    // charge weight for the cost of the deserialization and the dispatch
+    let _ = env.charge_weight(base_weight.saturating_add(dispatch_weight))?;
+
     log::debug!(target:LOG_TARGET, " dispatch inputted RuntimeCall: {:?}", call);
 
     let sender = env.ext().caller();