From fd418b5a2b0b3d9372176f0eeb943b76c3488f89 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Tue, 2 Jul 2024 08:32:01 +0800 Subject: [PATCH] Add option to disable V increasing --- crates/phactory/src/system/gk.rs | 127 +++++++++++++++++++++-- crates/phala-types/src/lib.rs | 1 + pallets/phala/src/compute/computation.rs | 15 +++ 3 files changed, 133 insertions(+), 10 deletions(-) diff --git a/crates/phactory/src/system/gk.rs b/crates/phactory/src/system/gk.rs index b51f6fc55..c168f4261 100644 --- a/crates/phactory/src/system/gk.rs +++ b/crates/phactory/src/system/gk.rs @@ -433,6 +433,9 @@ where GatekeeperEvent::_RepairV | GatekeeperEvent::_PhalaLaunched | GatekeeperEvent::_UnrespFix => unreachable!(), + GatekeeperEvent::SetStaticV { .. } => { + // Handled by ComputingEconomics + } } } @@ -1178,6 +1181,11 @@ impl> ComputingEconomics unreachable!(), + GatekeeperEvent::SetStaticV { enabled } => { + if origin.is_pallet() { + self.tokenomic_params.set_static_v(enabled); + } + } } } @@ -1185,7 +1193,7 @@ impl> ComputingEconomics for Params { - fn from(params: TokenomicParameters) -> Self { + impl Params { + pub fn update(&mut self, params: TokenomicParameters) { let treasury_ration = FixedPoint::from_bits(params.treasury_ratio); let payout_ration = fp!(1) - treasury_ration; - Params { + *self = Params { rho: FixedPoint::from_bits(params.rho), slash_rate: FixedPoint::from_bits(params.slash_rate), budget_per_block: FixedPoint::from_bits(params.budget_per_block), @@ -1364,7 +1375,12 @@ mod tokenomic { treasury_ration, payout_ration, heartbeat_window: params.heartbeat_window, - } + static_v: self.static_v, + }; + } + + pub fn set_static_v(&mut self, enabled: bool) { + self.static_v = enabled; } } @@ -1379,6 +1395,7 @@ mod tokenomic { treasury_ration: fp!(0.2), payout_ration: fp!(0.8), heartbeat_window: 10, + static_v: false, } } @@ -1393,6 +1410,9 @@ mod tokenomic { /// case1: Idle, no event pub fn update_v_idle(&mut self, params: &Params) { + if params.static_v { + return; + } let cost_idle = params.cost_k * self.p_bench + params.cost_b; let perf_multiplier = if self.p_bench == fp!(0) { fp!(1) @@ -1418,7 +1438,7 @@ mod tokenomic { if sum_share == fp!(0) { return NO_UPDATE; } - if self.v_deductible == fp!(0) { + if !params.static_v && self.v_deductible == fp!(0) { return NO_UPDATE; } if block_number <= self.v_update_block { @@ -1434,10 +1454,11 @@ mod tokenomic { let actual_payout = budget * params.payout_ration; let actual_treasury = budget * params.treasury_ration; - let actual_v_deduct = self.v_deductible.clamp(fp!(0), actual_payout); - self.v -= actual_v_deduct; - - self.v_deductible = fp!(0); + if !params.static_v { + let actual_v_deduct = self.v_deductible.clamp(fp!(0), actual_payout); + self.v -= actual_v_deduct; + self.v_deductible = fp!(0); + } self.v_update_at = now_ms; self.v_update_block = block_number; @@ -1894,6 +1915,92 @@ pub mod tests { ); } + #[test] + fn static_v_works() { + let mut r = Roles::test_roles(); + let mut block_number = 1; + + r.gk.tokenomic_params.set_static_v(true); + + // Register worker + with_block(block_number, |block| { + let mut worker0 = r.for_worker(0); + worker0.pallet_say(msg::WorkerEvent::Registered(msg::WorkerInfo { + confidence_level: 2, + })); + r.gk.test_process_messages(block); + }); + + // Start computing & send heartbeat challenge + block_number += 1; + with_block(block_number, |block| { + let mut worker0 = r.for_worker(0); + worker0.pallet_say(msg::WorkerEvent::Started { + session_id: 1, + init_v: fp!(100).to_bits(), + init_p: 200, + }); + r.gk.test_process_messages(block); + }); + + block_number += 1; + + // Normal Idle state, no event + let v_snap = r.get_worker(0).tokenomic.v; + r.gk.egress.clear(); + with_block(block_number, |block| { + r.gk.test_process_messages(block); + }); + + assert!(!r.get_worker(0).unresponsive, "Worker should be online"); + assert_eq!( + r.gk.egress.drain_working_info_update_event().len(), + 0, + "Should not report any event" + ); + + assert!( + v_snap == r.get_worker(0).tokenomic.v, + "Worker V should not increase" + ); + + // Once again. + let v_snap = r.get_worker(0).tokenomic.v; + r.gk.egress.clear(); + with_block(block_number, |block| { + r.gk.test_process_messages(block); + }); + + assert!(!r.get_worker(0).unresponsive, "Worker should be online"); + assert_eq!( + r.gk.egress.drain_working_info_update_event().len(), + 0, + "Should not report any event" + ); + assert!( + v_snap == r.get_worker(0).tokenomic.v, + "Worker V should not increase" + ); + + block_number += 1; + with_block(block_number, |block| { + let mut worker0 = r.for_worker(0); + worker0.challenge(); + r.gk.test_process_messages(block); + }); + + block_number += 1; + with_block(block_number, |block| { + let mut worker0 = r.for_worker(0); + worker0.heartbeat(1, block_number - 1, 1000000000); + r.gk.test_process_messages(block); + }); + let egress = r.gk.egress.drain_working_info_update_event(); + assert_eq!(egress.len(), 1, "Should payout"); + let payout = FixedPoint::from_bits(egress[0].settle[0].payout); + assert_eq!(payout, fp!(285.4000288551775845473)); + } + #[test] fn gk_should_report_payout_for_normal_heartbeats_case2() { let mut r = Roles::test_roles(); diff --git a/crates/phala-types/src/lib.rs b/crates/phala-types/src/lib.rs index 2c9580015..0bd43eb5e 100644 --- a/crates/phala-types/src/lib.rs +++ b/crates/phala-types/src/lib.rs @@ -392,6 +392,7 @@ pub mod messaging { /// Fix the payout duration problem in unresponsive state. /// Dropped in Phala. The index is reserved here for Khala+pruntime-v0 compatibility. _UnrespFix, + SetStaticV { enabled: bool }, } impl GatekeeperEvent { diff --git a/pallets/phala/src/compute/computation.rs b/pallets/phala/src/compute/computation.rs index abb9519f7..f7b1758f4 100644 --- a/pallets/phala/src/compute/computation.rs +++ b/pallets/phala/src/compute/computation.rs @@ -436,6 +436,9 @@ pub mod pallet { nonce: u64, budget: u128, }, + StaticVChanged { + enabled: bool, + }, } #[pallet::error] @@ -632,6 +635,18 @@ pub mod pallet { ContractAccount::::put(account_id); Ok(()) } + + /// Enable static V. + /// + /// When enabled, the V of a worker doesn't increase on IDLE. + #[pallet::call_index(9)] + #[pallet::weight(Weight::from_parts(1, 0))] + pub fn set_static_v(origin: OriginFor, enabled: bool) -> DispatchResult { + T::GovernanceOrigin::ensure_origin(origin)?; + Self::push_message(GatekeeperEvent::SetStaticV { enabled }); + Self::deposit_event(Event::::StaticVChanged { enabled }); + Ok(()) + } } #[pallet::hooks]