feat: add gas limit

Cargo.toml

@@ -46,6 +46,19 @@ polkavm-derive = { path = "vendor/polkavm/crates/polkavm-derive", default-featur
 
 # polkadot-sdk
 sp-api = { path = "vendor/polkadot-sdk/substrate/primitives/api", default-features = false }
+frame = { package = "polkadot-sdk-frame", path = "vendor/polkadot-sdk/substrate/frame", default-features = false }
+pallet-balances = { path = "vendor/polkadot-sdk/substrate/frame/balances", default-features = false }
+pallet-assets = { path = "vendor/polkadot-sdk/substrate/frame/assets", default-features = false }
+pallet-sudo = { path = "vendor/polkadot-sdk/substrate/frame/sudo", default-features = false }
+pallet-timestamp = { path = "vendor/polkadot-sdk/substrate/frame/timestamp", default-features = false }
+pallet-transaction-payment = { path = "vendor/polkadot-sdk/substrate/frame/transaction-payment", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { path = "vendor/polkadot-sdk/substrate/frame/transaction-payment/rpc/runtime-api", default-features = false }
+
+# genesis builder that allows us to interacto with runtime genesis config
+sp-genesis-builder = { path = "vendor/polkadot-sdk/substrate/primitives/genesis-builder", default-features = false }
+
+# wasm builder
+substrate-wasm-builder = { version = "22.0.1" }
 
 # nostd
 parity-scale-codec = { version = "3.6.12", default-features = false, features = [

poc/runtime/Cargo.toml

@@ -6,34 +6,31 @@ edition = "2021"
 [dependencies]
 parity-scale-codec = { workspace = true }
 scale-info = { workspace = true }
-# this is a frame-based runtime, thus importing `frame` with runtime feature enabled.
-frame = { version = "0.2.0", package = "polkadot-sdk-frame", default-features = false, features = [
-    "experimental",
-    "runtime",
-] }
+frame = { workspace = true, features = ["experimental", "runtime"] }
 
 # pallets that we want to use
-pallet-balances = { version = "34.0.0", default-features = false }
-pallet-assets = { version = "34.0.0", default-features = false }
-pallet-sudo = { version = "33.0.0", default-features = false }
-pallet-timestamp = { version = "32.0.0", default-features = false }
-pallet-transaction-payment = { version = "33.0.0", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { version = "33.0.0", default-features = false }
+pallet-balances = { workspace = true }
+pallet-assets = { workspace = true }
+pallet-sudo = { workspace = true }
+pallet-timestamp = { workspace = true }
+pallet-transaction-payment = { workspace = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 
 # genesis builder that allows us to interacto with runtime genesis config
-sp-genesis-builder = { version = "0.12.0", default-features = false }
+sp-genesis-builder = { workspace = true }
 
 pvq-executor = { workspace = true }
 pvq-extension = { workspace = true }
 pvq-extension-core = { workspace = true }
 pvq-extension-fungibles = { workspace = true }
 pvq-primitives = { workspace = true }
+pvq-runtime-api = { workspace = true }
 
 [dev-dependencies]
 hex = "0.4"
 
 [build-dependencies]
-substrate-wasm-builder = { version = "22.0.1", optional = true }
+substrate-wasm-builder = { workspace = true, optional = true }
 
 [features]
 default = ["std"]

poc/runtime/src/lib.rs

@@ -13,24 +13,23 @@ use frame::{
     },
     prelude::*,
     runtime::{
-        apis::{
-            self, impl_runtime_apis, ApplyExtrinsicResult, CheckInherentsResult, ExtrinsicInclusionMode, OpaqueMetadata,
-        },
+        apis::{self, impl_runtime_apis},
         prelude::*,
     },
-    traits::AsEnsureOriginWithArg,
 };
 
+use std::borrow::Cow;
+
 #[runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
-    spec_name: create_runtime_str!("pvq-poc"),
-    impl_name: create_runtime_str!("pvq-poc"),
+    spec_name: Cow::Borrowed("pvq-poc"),
+    impl_name: Cow::Borrowed("pvq-poc"),
     authoring_version: 1,
     spec_version: 0,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,
-    state_version: 1,
+    system_version: 1,
 };
 
 /// The version information used to identify this runtime when compiled natively.
@@ -110,6 +109,8 @@ type RuntimeExecutive = Executive<Runtime, Block, frame_system::ChainContext<Run
 
 use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
 
+const ONE_SECOND_IN_GAS: i64 = 100000;
+
 impl_runtime_apis! {
     impl apis::Core<Block> for Runtime {
         fn version() -> RuntimeVersion {
@@ -225,9 +226,10 @@ impl_runtime_apis! {
         }
     }
 
-    impl pvq::PvqApi<Block> for Runtime {
-        fn execute_query(query: Vec<u8>, input: Vec<u8>) -> pvq::PvqResult {
-            pvq::execute_query(&query, &input)
+    impl pvq_runtime_api::PvqApi<Block> for Runtime {
+        fn execute_query(program: Vec<u8>, args: Vec<u8>, gas_limit: Option<i64>) -> pvq_primitives::PvqResult {
+            // Set a default gas limit of 2 seconds
+            pvq::execute_query(&program, &args, gas_limit.unwrap_or(ONE_SECOND_IN_GAS * 2))
         }
         fn metadata() -> Vec<u8> {
             pvq::metadata().encode()

poc/runtime/src/pvq.rs

@@ -1,18 +1,8 @@
 #[allow(unused_imports)]
 use frame::deps::scale_info::prelude::{format, string::String};
-use frame::deps::sp_api::decl_runtime_apis;
-use frame::prelude::*;
 
 use pvq_extension::metadata::Metadata;
-pub use pvq_primitives::PvqResult;
-
 use pvq_extension::{extensions_impl, ExtensionsExecutor, InvokeSource};
-decl_runtime_apis! {
-    pub trait PvqApi {
-        fn execute_query(query: Vec<u8>, input: Vec<u8>) -> PvqResult;
-        fn metadata() -> Vec<u8>;
-    }
-}
 
 #[extensions_impl]
 pub mod extensions {
@@ -42,9 +32,9 @@ pub mod extensions {
     }
 }
 
-pub fn execute_query(query: &[u8], input: &[u8]) -> PvqResult {
+pub fn execute_query(program: &[u8], args: &[u8], gas_limit: i64) -> pvq_primitives::PvqResult {
     let mut executor = ExtensionsExecutor::<extensions::Extensions, ()>::new(InvokeSource::RuntimeAPI);
-    let (result, _) = executor.execute_method(query, input, None);
+    let (result, _) = executor.execute(program, args, Some(gas_limit));
     result
 }
 

pvq-executor/src/executor.rs

@@ -37,7 +37,6 @@ impl<Ctx: PvqExecutorContext> PvqExecutor<Ctx> {
             Err(_) => return (Err(PvqExecutorError::InvalidProgramFormat), gas_limit),
         };
 
-        // TODO: make this configurable
         let mut module_config = ModuleConfig::new();
         module_config.set_aux_data_size(args.len() as u32);
         if gas_limit.is_some() {

pvq-extension/src/executor.rs

@@ -27,7 +27,6 @@ impl<C: CallDataTuple, P: PermissionController> ExtensionsExecutor<C, P> {
         Self { executor }
     }
 
-    /// Execute a method on an extension
     ///
     /// # Arguments
     ///
@@ -37,7 +36,7 @@ impl<C: CallDataTuple, P: PermissionController> ExtensionsExecutor<C, P> {
     /// # Returns
     ///
     /// The result of the execution or an error
-    pub fn execute_method(&mut self, program: &[u8], args: &[u8], gas_limit: Option<i64>) -> (PvqResult, Option<i64>) {
+    pub fn execute(&mut self, program: &[u8], args: &[u8], gas_limit: Option<i64>) -> (PvqResult, Option<i64>) {
         let (result, gas_remaining) = self.executor.execute(program, args, gas_limit);
         (result.map_err(PvqError::from), gas_remaining)
     }

pvq-primitives/src/lib.rs

@@ -6,6 +6,8 @@ use alloc::vec::Vec;
 use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 
+pub type PvqResult = Result<PvqResponse, PvqError>;
+
 pub type PvqResponse = Vec<u8>;
 
 #[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, TypeInfo)]
@@ -18,5 +20,3 @@ pub enum PvqError {
     HostCallError,
     Other,
 }
-
-pub type PvqResult = Result<PvqResponse, PvqError>;

pvq-runtime-api/src/lib.rs

@@ -7,11 +7,12 @@ use pvq_primitives::PvqResult;
 use sp_api::decl_runtime_apis;
 
 // The runtime API for the PVQ module.
-// query: the query to be executed, written in polkavm. i.e. query balance of given accounts and sum them up
-// input: the input data for the query. i.e. accounts to be queried
+//   - `program`: PVQ binary.
+//   - `args`: Query arguments that is SCALE-encoded.
+//   - `gas_limit`: Optional gas limit for query execution. When set to `None`, execution is constrained by the default time boundary.
 decl_runtime_apis! {
     pub trait PvqApi {
-        fn execute_query(query: Vec<u8>, input: Vec<u8>) -> PvqResult;
+        fn execute_query(program: Vec<u8>, args: Vec<u8>, gas_limit: Option<i64>) -> PvqResult;
         fn metadata() -> Vec<u8>;
     }
 }

pvq-test-runner/src/lib.rs

@@ -71,12 +71,8 @@ impl TestRunner {
         input_data
     }
 
-    pub fn execute_program(
-        &mut self,
-        program_blob: &[u8],
-        input_data: &[u8],
-    ) -> Result<Vec<u8>, pvq_primitives::PvqError> {
-        let (result, _) = self.executor.execute_method(program_blob, input_data, None);
+    pub fn execute_program(&mut self, program_blob: &[u8], input_data: &[u8]) -> pvq_primitives::PvqResult {
+        let (result, _) = self.executor.execute(program_blob, input_data, None);
         result
     }
 }