Merge pull request #1577 from Phala-Network/box-ordmap-value

pruntime: Box large value in OrdMap

Author: kvinwang

crates/phactory/src/contracts/support/keeper.rs

@@ -11,7 +11,10 @@ use crate::{
     im_helpers::{ordmap_for_each_mut, OrdMap},
 };
 
-type ContractMap = OrdMap<AccountId, Contract>;
+// size_of::<Contract>() == 1064, if we don't box it, it would exceed the stack capacity
+// when inserting data, even if we have an 8MB stack size. Not sure why the OrdMap::insert
+// increases the size so significantly.
+type ContractMap = OrdMap<AccountId, Box<Contract>>;
 
 #[derive(Default, Serialize, Deserialize, Clone, ::scale_info::TypeInfo)]
 pub struct ContractsKeeper {
@@ -24,19 +27,22 @@ pub struct ContractsKeeper {
 
 impl ContractsKeeper {
     pub fn insert(&mut self, contract: Contract) {
-        self.contracts.insert(contract.address().clone(), contract);
+        self.contracts
+            .insert(contract.address().clone(), Box::new(contract));
     }
 
     pub fn keys(&self) -> impl Iterator<Item = &AccountId> {
         self.contracts.keys()
     }
 
     pub fn get_mut(&mut self, id: &AccountId) -> Option<&mut Contract> {
-        self.contracts.get_mut(id)
+        let boxed = self.contracts.get_mut(id)?;
+        Some(boxed)
     }
 
     pub fn get(&self, id: &AccountId) -> Option<&Contract> {
-        self.contracts.get(id)
+        let boxed = self.contracts.get(id)?;
+        Some(boxed)
     }
 
     #[allow(clippy::len_without_is_empty)]
@@ -56,11 +62,11 @@ impl ContractsKeeper {
         #[allow(clippy::iter_kv_map)]
         std::mem::take(&mut self.contracts)
             .into_iter()
-            .map(|(_, v)| v)
+            .map(|(_, v)| *v)
     }
 
     pub fn iter(&self) -> impl Iterator<Item = (&AccountId, &Contract)> {
-        self.contracts.iter()
+        self.contracts.iter().map(|(k, v)| (k, &**v))
     }
 
     pub fn apply_local_cache_quotas(&self) {
@@ -73,7 +79,7 @@ pub(super) trait ToWeight {
     fn to_weight(&self) -> u32;
 }
 
-impl ToWeight for Contract {
+impl ToWeight for Box<Contract> {
     fn to_weight(&self) -> u32 {
         self.weight
     }

crates/phactory/src/prpc_service.rs

@@ -31,8 +31,8 @@ use phala_types::{
     ChallengeHandlerInfo, EncryptedWorkerKey, HandoverChallenge, SignedContentType,
     VersionedWorkerEndpoints, WorkerEndpointPayload, WorkerPublicKey, WorkerRegistrationInfoV2,
 };
-use pink_loader::types::{AccountId, ExecSideEffects, ExecutionMode};
 use phala_types::{DcapChallengeHandlerInfo, DcapHandoverChallenge};
+use pink_loader::types::{AccountId, ExecSideEffects, ExecutionMode};
 use sp_application_crypto::UncheckedFrom;
 use sp_core::hashing::blake2_256;
 use tracing::{error, info};

crates/phactory/src/system/gk.rs

@@ -639,7 +639,7 @@ pub struct ComputingEconomics<MsgChan> {
     system_events: TypedReceiver<SystemEvent>,
     gatekeeper_events: TypedReceiver<GatekeeperEvent>,
     #[cfg_attr(not(test), codec(skip))]
-    workers: OrdMap<WorkerPublicKey, WorkerInfo>,
+    workers: OrdMap<WorkerPublicKey, Box<WorkerInfo>>,
     #[codec(skip)]
     tokenomic_params: tokenomic::Params,
     #[serde(skip, default)]
@@ -710,12 +710,12 @@ impl<MsgChan: MessageChannel<Signer = Sr25519Signer>> ComputingEconomics<MsgChan
     pub fn dump_workers_state(&self) -> Vec<(WorkerPublicKey, pb::WorkerState)> {
         self.workers
             .values()
-            .map(|info| (info.state.pubkey, info.into()))
+            .map(|info| (info.state.pubkey, (&**info).into()))
             .collect()
     }
 
     pub fn worker_state(&self, pubkey: &WorkerPublicKey) -> Option<pb::WorkerState> {
-        self.workers.get(pubkey).map(Into::into)
+        self.workers.get(pubkey).map(|info| (&**info).into())
     }
 
     pub fn will_process_block(&mut self, block: &BlockInfo<'_>) {
@@ -1019,7 +1019,7 @@ impl<MsgChan: MessageChannel<Signer = Sr25519Signer>> ComputingEconomics<MsgChan
             let _ = self
                 .workers
                 .entry(*pubkey)
-                .or_insert_with(|| WorkerInfo::new(*pubkey));
+                .or_insert_with(|| Box::new(WorkerInfo::new(*pubkey)));
         }
 
         let log_on = log::log_enabled!(log::Level::Debug);