Speculative execution support

Cargo.toml

@@ -5,7 +5,8 @@ members = [
   "massa-client",
   "massa-consensus-exports",
   "massa-consensus-worker",
-  "massa-execution",
+  "massa-execution-exports",
+  "massa-execution-worker",
   "massa-graph",
   "massa-hash",
   "massa-logging",
@@ -19,6 +20,7 @@ members = [
   "massa-signature",
   "massa-time",
   "massa-wallet",
+  "massa-ledger"
 ]
 resolver = "2"
 

massa-api/Cargo.toml

@@ -16,7 +16,7 @@ tokio = { version = "1.15", features = ["full"] }
 tracing = "0.1"
 # custom modules
 massa_consensus_exports = { path = "../massa-consensus-exports" }
-massa_execution = { path = "../massa-execution" }
+massa_execution_exports = { path = "../massa-execution-exports" }
 massa_graph = { path = "../massa-graph" }
 massa_hash = { path = "../massa-hash" }
 massa_models = { path = "../massa-models" }
@@ -27,4 +27,4 @@ massa_signature = { path = "../massa-signature" }
 massa_time = { path = "../massa-time" }
 
 [features]
-instrument = ["tokio/tracing", "massa_consensus_exports/instrument", "massa_execution/instrument", "massa_graph/instrument", "massa_models/instrument", "massa_network/instrument", "massa_pool/instrument", "massa_protocol_exports/instrument", "massa_time/instrument"]
+instrument = ["tokio/tracing", "massa_consensus_exports/instrument", "massa_graph/instrument", "massa_models/instrument", "massa_network/instrument", "massa_pool/instrument", "massa_protocol_exports/instrument", "massa_time/instrument"]

massa-api/src/error.rs

@@ -2,7 +2,7 @@
 
 use displaydoc::Display;
 use massa_consensus_exports::error::ConsensusError;
-use massa_execution::ExecutionError;
+use massa_execution_exports::ExecutionError;
 use massa_hash::MassaHashError;
 use massa_models::ModelsError;
 use massa_network::NetworkError;

massa-api/src/lib.rs

@@ -8,7 +8,7 @@ use jsonrpc_core::{BoxFuture, IoHandler, Value};
 use jsonrpc_derive::rpc;
 use jsonrpc_http_server::{CloseHandle, ServerBuilder};
 use massa_consensus_exports::{ConsensusCommandSender, ConsensusConfig};
-use massa_execution::ExecutionCommandSender;
+use massa_execution_exports::ExecutionController;
 use massa_models::api::{
     APISettings, AddressInfo, BlockInfo, BlockSummary, EndorsementInfo, EventFilter, NodeStatus,
     OperationInfo, ReadOnlyExecution, TimeInterval,
@@ -36,7 +36,7 @@ mod public;
 
 pub struct Public {
     pub consensus_command_sender: ConsensusCommandSender,
-    pub execution_command_sender: ExecutionCommandSender,
+    pub execution_controller: Box<dyn ExecutionController>,
     pub pool_command_sender: PoolCommandSender,
     pub consensus_config: ConsensusConfig,
     pub api_settings: &'static APISettings,
@@ -50,7 +50,7 @@ pub struct Public {
 pub struct Private {
     pub consensus_command_sender: ConsensusCommandSender,
     pub network_command_sender: NetworkCommandSender,
-    execution_command_sender: ExecutionCommandSender,
+    pub execution_controller: Box<dyn ExecutionController>,
     pub consensus_config: ConsensusConfig,
     pub api_settings: &'static APISettings,
     pub stop_node_channel: mpsc::Sender<()>,
@@ -116,8 +116,8 @@ pub trait Endpoints {
     #[rpc(name = "execute_read_only_request")]
     fn execute_read_only_request(
         &self,
-        _: ReadOnlyExecution,
-    ) -> BoxFuture<Result<ExecuteReadOnlyResponse, ApiError>>;
+        _: Vec<ReadOnlyExecution>,
+    ) -> BoxFuture<Result<Vec<ExecuteReadOnlyResponse>, ApiError>>;
 
     /// Remove a vec of addresses used to stake.
     /// No confirmation to expect.

massa-api/src/private.rs

@@ -5,7 +5,7 @@ use crate::{Endpoints, Private, RpcServer, StopHandle, API};
 use jsonrpc_core::BoxFuture;
 use jsonrpc_http_server::tokio::sync::mpsc;
 use massa_consensus_exports::{ConsensusCommandSender, ConsensusConfig};
-use massa_execution::ExecutionCommandSender;
+use massa_execution_exports::ExecutionController;
 use massa_models::api::{
     APISettings, AddressInfo, BlockInfo, BlockSummary, EndorsementInfo, EventFilter, NodeStatus,
     OperationInfo, ReadOnlyExecution, TimeInterval,
@@ -24,7 +24,7 @@ impl API<Private> {
     pub fn new(
         consensus_command_sender: ConsensusCommandSender,
         network_command_sender: NetworkCommandSender,
-        execution_command_sender: ExecutionCommandSender,
+        execution_controller: Box<dyn ExecutionController>,
         api_settings: &'static APISettings,
         consensus_settings: ConsensusConfig,
     ) -> (Self, mpsc::Receiver<()>) {
@@ -33,7 +33,7 @@ impl API<Private> {
             API(Private {
                 consensus_command_sender,
                 network_command_sender,
-                execution_command_sender,
+                execution_controller,
                 consensus_config: consensus_settings,
                 api_settings,
                 stop_node_channel,
@@ -76,20 +76,9 @@ impl Endpoints for API<Private> {
 
     fn execute_read_only_request(
         &self,
-        ReadOnlyExecution {
-            max_gas,
-            simulated_gas_price,
-            bytecode,
-            address,
-        }: ReadOnlyExecution,
-    ) -> BoxFuture<Result<ExecuteReadOnlyResponse, ApiError>> {
-        let cmd_sender = self.0.execution_command_sender.clone();
-        let closure = async move || {
-            Ok(cmd_sender
-                .execute_read_only_request(max_gas, simulated_gas_price, bytecode, address)
-                .await?)
-        };
-        Box::pin(closure())
+        _: Vec<ReadOnlyExecution>,
+    ) -> BoxFuture<Result<Vec<ExecuteReadOnlyResponse>, ApiError>> {
+        crate::wrong_api::<Vec<ExecuteReadOnlyResponse>>()
     }
 
     fn remove_staking_addresses(&self, keys: Vec<Address>) -> BoxFuture<Result<(), ApiError>> {

massa-api/src/public.rs

@@ -5,8 +5,12 @@ use crate::{Endpoints, Public, RpcServer, StopHandle, API};
 use futures::{stream::FuturesUnordered, StreamExt};
 use jsonrpc_core::BoxFuture;
 use massa_consensus_exports::{ConsensusCommandSender, ConsensusConfig};
-use massa_execution::ExecutionCommandSender;
+use massa_execution_exports::{
+    ExecutionController, ExecutionStackElement, ReadOnlyExecutionRequest,
+};
 use massa_graph::{DiscardReason, ExportBlockStatus};
+use massa_models::api::SCELedgerInfo;
+use massa_models::execution::ReadOnlyResult;
 use massa_models::{
     api::{
         APISettings, AddressInfo, BlockInfo, BlockInfoContent, BlockSummary, EndorsementInfo,
@@ -23,14 +27,14 @@ use massa_models::{
 };
 use massa_network::{NetworkCommandSender, NetworkSettings};
 use massa_pool::PoolCommandSender;
-use massa_signature::PrivateKey;
+use massa_signature::{derive_public_key, generate_random_private_key, PrivateKey};
 use massa_time::MassaTime;
 use std::net::{IpAddr, SocketAddr};
 
 impl API<Public> {
     pub fn new(
         consensus_command_sender: ConsensusCommandSender,
-        execution_command_sender: ExecutionCommandSender,
+        execution_controller: Box<dyn ExecutionController>,
         api_settings: &'static APISettings,
         consensus_settings: ConsensusConfig,
         pool_command_sender: PoolCommandSender,
@@ -50,7 +54,7 @@ impl API<Public> {
             network_command_sender,
             compensation_millis,
             node_id,
-            execution_command_sender,
+            execution_controller,
         })
     }
 }
@@ -77,9 +81,63 @@ impl Endpoints for API<Public> {
 
     fn execute_read_only_request(
         &self,
-        _: ReadOnlyExecution,
-    ) -> BoxFuture<Result<ExecuteReadOnlyResponse, ApiError>> {
-        crate::wrong_api::<ExecuteReadOnlyResponse>()
+        reqs: Vec<ReadOnlyExecution>,
+    ) -> BoxFuture<Result<Vec<ExecuteReadOnlyResponse>, ApiError>> {
+        if reqs.len() > self.0.api_settings.max_arguments as usize {
+            let closure =
+                async move || Err(ApiError::TooManyArguments("too many arguments".into()));
+            return Box::pin(closure());
+        }
+
+        let mut res: Vec<ExecuteReadOnlyResponse> = Vec::with_capacity(reqs.len());
+        for ReadOnlyExecution {
+            max_gas,
+            address,
+            simulated_gas_price,
+            bytecode,
+        } in reqs
+        {
+            let address = address.unwrap_or_else(|| {
+                // if no addr provided, use a random one
+                Address::from_public_key(&derive_public_key(&generate_random_private_key()))
+            });
+
+            // TODO:
+            // * set a maximum gas value for read-only executions to prevent attacks
+            // * stop mapping request and result, reuse execution's structures
+            // * remove async stuff
+
+            // translate request
+            let req = ReadOnlyExecutionRequest {
+                max_gas,
+                simulated_gas_price,
+                bytecode,
+                call_stack: vec![ExecutionStackElement {
+                    address,
+                    coins: Default::default(),
+                    owned_addresses: vec![address],
+                }],
+            };
+
+            // run
+            let result = self.0.execution_controller.execute_readonly_request(req);
+
+            // map result
+            let result = ExecuteReadOnlyResponse {
+                executed_at: result.as_ref().map_or_else(|_| Slot::new(0, 0), |v| v.slot),
+                result: result.as_ref().map_or_else(
+                    |err| ReadOnlyResult::Error(format!("readonly call failed: {}", err)),
+                    |_| ReadOnlyResult::Ok,
+                ),
+                output_events: result.map_or_else(|_| Default::default(), |v| v.events.export()),
+            };
+
+            res.push(result);
+        }
+
+        // return result
+        let closure = async move || Ok(res);
+        Box::pin(closure())
     }
 
     fn remove_staking_addresses(&self, _: Vec<Address>) -> BoxFuture<Result<(), ApiError>> {
@@ -356,11 +414,37 @@ impl Endpoints for API<Public> {
         let api_cfg = self.0.api_settings;
         let pool_command_sender = self.0.pool_command_sender.clone();
         let compensation_millis = self.0.compensation_millis;
-        let sce_command_sender = self.0.execution_command_sender.clone();
-        let closure = async move || {
-            if addresses.len() as u64 > api_cfg.max_arguments {
-                return Err(ApiError::TooManyArguments("too many arguments".into()));
+
+        // todo make better use of SCE ledger info
+
+        // map SCE ledger info and check for address length
+        let sce_ledger_info = if addresses.len() as u64 > api_cfg.max_arguments {
+            Err(ApiError::TooManyArguments("too many arguments".into()))
+        } else {
+            // get SCE ledger info
+            let mut sce_ledger_info: Map<Address, SCELedgerInfo> =
+                Map::with_capacity_and_hasher(addresses.len(), BuildMap::default());
+            for addr in &addresses {
+                let active_entry = match self
+                    .0
+                    .execution_controller
+                    .get_final_and_active_ledger_entry(addr)
+                    .1
+                {
+                    None => continue,
+                    Some(v) => SCELedgerInfo {
+                        balance: v.parallel_balance,
+                        module: Some(v.bytecode),
+                        datastore: v.datastore.into_iter().collect(),
+                    },
+                };
+                sce_ledger_info.insert(*addr, active_entry);
             }
+            Ok(sce_ledger_info)
+        };
+
+        let closure = async move || {
+            let sce_ledger_info = sce_ledger_info?;
 
             let mut res = Vec::with_capacity(addresses.len());
 
@@ -383,11 +467,10 @@ impl Endpoints for API<Public> {
 
             // roll and balance info
             let states = cmd_sender.get_addresses_info(addresses.iter().copied().collect());
-            let sce_info = sce_command_sender.get_sce_ledger_for_addresses(addresses.clone());
 
             // wait for both simultaneously
-            let (next_draws, states, sce_info) = tokio::join!(next_draws, states, sce_info);
-            let (next_draws, mut states, sce_info) = (next_draws?, states?, sce_info?);
+            let (next_draws, states) = tokio::join!(next_draws, states);
+            let (next_draws, mut states) = (next_draws?, states?);
 
             // operations block and endorsement info
             let mut operations: Map<Address, Set<OperationId>> =
@@ -469,7 +552,7 @@ impl Endpoints for API<Public> {
                         .remove(&address)
                         .ok_or(ApiError::NotFound)?,
                     production_stats: state.production_stats,
-                    sce_ledger_info: sce_info.get(&address).cloned().unwrap_or_default(),
+                    sce_ledger_info: sce_ledger_info.get(&address).cloned().unwrap_or_default(),
                 })
             }
             Ok(res)
@@ -514,18 +597,17 @@ impl Endpoints for API<Public> {
             original_operation_id,
         }: EventFilter,
     ) -> BoxFuture<Result<Vec<SCOutputEvent>, ApiError>> {
-        let execution_command_sender = self.0.execution_command_sender.clone();
-        let closure = async move || {
-            Ok(execution_command_sender
-                .get_filtered_sc_output_event(
-                    start,
-                    end,
-                    emitter_address,
-                    original_caller_address,
-                    original_operation_id,
-                )
-                .await?)
-        };
+        // get events
+        let events = self.0.execution_controller.get_filtered_sc_output_event(
+            start,
+            end,
+            emitter_address,
+            original_caller_address,
+            original_operation_id,
+        );
+
+        // TODO get rid of the async part
+        let closure = async move || Ok(events);
         Box::pin(closure())
     }
 }

massa-bootstrap/Cargo.toml

@@ -15,11 +15,12 @@ rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.15", features = ["full"] }
-tracing = "0.1"
-# custom modules
+parking_lot = "0.12"
+tokio = { version = "1.11", features = ["full"] }
+tracing = "0.1"# custom modules
 massa_consensus_exports = { path = "../massa-consensus-exports" }
-massa_execution = { path = "../massa-execution" }
+massa_ledger = { path = "../massa-ledger" }
+# custom modules
 massa_graph = { path = "../massa-graph" }
 massa_hash = { path = "../massa-hash" }
 massa_logging = { path = "../massa-logging" }
@@ -33,6 +34,8 @@ massa_time = { path = "../massa-time" }
 bitvec = { version = "0.22", features = ["serde"] }
 pretty_assertions = "1.0"
 serial_test = "0.5"
+massa_ledger = { path = "../massa-ledger", features=["testing"] }
+
 
 [features]
-instrument = ["tokio/tracing", "massa_consensus_exports/instrument", "massa_execution/instrument", "massa_graph/instrument", "massa_models/instrument", "massa_network/instrument", "massa_proof_of_stake_exports/instrument", "massa_time/instrument"]
+instrument = ["tokio/tracing", "massa_consensus_exports/instrument", "massa_graph/instrument", "massa_models/instrument", "massa_network/instrument", "massa_proof_of_stake_exports/instrument", "massa_time/instrument"]

massa-bootstrap/src/error.rs

@@ -3,8 +3,8 @@
 use crate::messages::BootstrapMessage;
 use displaydoc::Display;
 use massa_consensus_exports::error::ConsensusError;
-use massa_execution::ExecutionError;
 use massa_hash::MassaHashError;
+use massa_ledger::LedgerError;
 use massa_network::NetworkError;
 use massa_time::TimeError;
 use thiserror::Error;
@@ -30,8 +30,8 @@ pub enum BootstrapError {
     ConsensusError(#[from] ConsensusError),
     /// network error: {0}
     NetworkError(#[from] NetworkError),
-    /// execution error: {0}
-    ExecutionError(#[from] ExecutionError),
+    /// ledger error: {0}
+    LedgerError(#[from] LedgerError),
     /// join error: {0}
     JoinError(#[from] tokio::task::JoinError),
     /// missing private key file