Reload the MoveOS instance automatically for the gas schedule upgrade events. #2432

steelgeek091 · 2024-08-14T07:51:03Z

resolve #2399

vercel · 2024-08-14T07:51:07Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
rooch-portal	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 16, 2024 7:11am

1 Skipped Deployment

Name	Status	Preview	Comments	Updated (UTC)
rooch	⬜️ Ignored (Inspect)	Visit Preview		Aug 16, 2024 7:11am

baichuan3 · 2024-08-14T08:15:45Z

crates/rooch-executor/src/actor/reader_executor.rs

@@ -88,6 +97,26 @@ impl Handler<ExecuteViewFunctionMessage> for ReaderExecutorActor {
        let function_result = self
            .moveos()
            .execute_view_function(self.root.clone(), msg.call);
+
+        if let Some(event_bus) = self.event_bus.clone() {


是不是不应该在 ViewFuntion 里去Reload ReaderEexcutor 的 MoveOS 实例

在 execute_view_function 函数里面吗？

有一个思路，把 moveos reload 放到一个 actor 消息里执行，event bus notify 时候触发，不过怎么在 notify 时触发执行 actor 消息，这个地方还得想想

baichuan3 · 2024-08-14T08:17:18Z

moveos/moveos-eventbus/src/bus.rs

+    pub fn notify<T: 'static + Send + Clone>(&self, event_data: T) {
+        let event_type_id = TypeId::of::<T>();
+        {
+            let senders = self.senders.read().unwrap();


直接 unwrap 容易导致 panic

jolestar · 2024-08-14T08:48:35Z

crates/rooch-executor/src/actor/executor.rs

+                    system_post_execute_functions(),
+                    self.event_bus.clone(),
+                )?;
+            }


既然有订阅机制，应该是从 EventBus push 消息过来，不应该每次都从 event bus 拉取消息。
感觉应该把 EventBus 封装在 actor 里，EventBus actor send Event 给 subscriber，subscriber 实现一个 handle 去处理消息就可以。

好，我修改一下。

尝试用 EventActor 封装消息发送，遇到了一些不好处理的地方：

建立一个 Executor::prepare_load 这个回调函数，注册到 EventBus:

event_bus.subscribe::<GasUpgradeEventMessage, _>("executor", move |_| { let _ = block_on(ExecutorActor::prepare_reload(executor.clone().into())); });

需要处理在闭包中调用 async 函数的问题。

Executor::prepare_load 函数如下：

pub async fn prepare_reload(executor_actor_ref: ActorRef<ExecutorActor>) -> Result<()> { executor_actor_ref.send(GasUpgradeEventMessage {}).await? }

Executor 收到 GasUpgradeEventMessage 类型消息后 reload MoveOS.

如果注册类似与 executor.reload 函数到 EventBus，在这个函数内直接 reload MoveOS，则需要将 Executor 实例使用 Arc<Muext<>> 封装，因为要保存到 EventBus 中，并且保存到 Precessor 中。

目前第一个方案，初步测试无法收到消息，可能 block_on 方式运行有问题。
@jolestar

如果不用 block_on 函数，则需要在闭包中运行 async 函数，类似于 async move || { xxx.await } 这种形式，目前 Rust 还不支持。

不要用回调函数，EventBus Actor 直接把消息通过 actor_ref 转发给订阅者。订阅者订阅的时候也用自己的 actor ref 来订阅。这样就没有闭包的难题。

jolestar · 2024-08-15T02:37:52Z

crates/rooch-event/src/actor.rs

+    where
+        F: Fn(Box<dyn Any + Send>) + Send + Sync + 'static,
+    {
+        self.event_bus.subscribe::<T, F>(subscriber, callback)


这里传递订阅者的 Actor Ref 进来，就不需要 callback 了。

jolestar · 2024-08-15T02:41:56Z

crates/rooch-executor/src/actor/executor.rs

@@ -134,6 +143,13 @@ impl ExecutorActor {
            .moveos_store
            .handle_tx_output(tx_hash, output.clone())?;

+        if self.moveos.cost_table.read().is_none() {
+            if let Some(actor_ref) = self.event_actor_ref.clone() {
+                let _ = block_on(actor_ref.send(GasUpgradeEventMessage {}));


这里可以用 actor_ref.notify 就不需要 block_on 了。

jolestar · 2024-08-15T02:43:44Z

crates/rooch-executor/src/actor/executor.rs

@@ -63,6 +66,7 @@ impl ExecutorActor {
        rooch_store: RoochStore,
        registry: &Registry,
        event_bus: Option<EventBus>,
+        event_actor_ref: Option<ActorRef<EventActor>>,


感觉这里可以要求 ActorRef 必须作为参数传递。另外有了 ActorRef，应该就不需要 event_bus: Option<EventBus> EventBus 参数了。EventBus 应该被封装在 EventActor 中了。

jolestar · 2024-08-15T06:51:25Z

moveos/moveos/src/moveos.rs

 pub struct MoveOS {
    vm: MoveOSVM,
    pub db: MoveOSStore,
    pub cost_table: Arc<RwLock<Option<CostTable>>>,
    system_pre_execute_functions: Vec<FunctionCall>,
    system_post_execute_functions: Vec<FunctionCall>,
+    event_bus: Option<EventBus>,


MoveOS 应该不需要关心 EventBus 吧？

是的，应该从 MoveOS 中移除。

jolestar · 2024-08-15T06:52:11Z

moveos/moveos/src/moveos.rs

+            if let Some(event_bus) = self.event_bus.clone() {
+                event_bus.notify::<GasUpgradeEvent>(GasUpgradeEvent {});
+            }


这里把 gas scheduled updated 信息通过 output 返回就可以了。

crates/rooch-framework-tests/src/binding_test.rs

crates/rooch-event/src/actor.rs

crates/rooch-executor/src/actor/executor.rs

steelgeek091 added 5 commits August 14, 2024 14:16

Reload the MoveOS if gas schedule has upgraded

a62c74d

remove unused code

716c5ea

remove the frequent log info

a967b81

remove the frequent log info

a52984a

cargm fmt

3223272

steelgeek091 requested review from wow-sven, baichuan3, jolestar and popcnt1 as code owners August 14, 2024 07:51

vercel bot deployed to Preview – rooch-portal August 14, 2024 07:52 View deployment

add license info

93c2ed7

vercel bot deployed to Preview – rooch-portal August 14, 2024 07:53 View deployment

use repo of global workspace

8e4ee44

vercel bot deployed to Preview – rooch-portal August 14, 2024 08:02 View deployment

baichuan3 reviewed Aug 14, 2024

View reviewed changes

jolestar reviewed Aug 14, 2024

View reviewed changes

vercel bot deployed to Preview – rooch-portal August 14, 2024 16:15 View deployment

steelgeek091 requested a review from jolestar August 15, 2024 02:26

jolestar reviewed Aug 15, 2024

View reviewed changes

steelgeek091 force-pushed the reload_moveos branch from 605bb62 to 8e4ee44 Compare August 15, 2024 03:33

jolestar reviewed Aug 15, 2024

View reviewed changes

add EventData type

a5d0d38

vercel bot deployed to Preview – rooch-portal August 15, 2024 10:48 View deployment

steelgeek091 added 3 commits August 15, 2024 23:16

store Any type in container

509497d

Refactor error handling in event_bus

ca24561

move subscribing to the another function

f4b9987

vercel bot deployed to Preview – rooch-portal August 16, 2024 04:01 View deployment

Merge branch 'main' into reload_moveos

5630e62

steelgeek091 requested review from jolestar and baichuan3 August 16, 2024 04:02

vercel bot deployed to Preview – rooch-portal August 16, 2024 04:02 View deployment

steelgeek091 commented Aug 16, 2024

View reviewed changes

crates/rooch-framework-tests/src/binding_test.rs Show resolved Hide resolved

adjust the Cargo.toml

7ed0e4d

vercel bot deployed to Preview – rooch-portal August 16, 2024 04:22 View deployment

jolestar reviewed Aug 16, 2024

View reviewed changes

crates/rooch-event/src/actor.rs Outdated Show resolved Hide resolved

crates/rooch-event/src/actor.rs Outdated Show resolved Hide resolved

crates/rooch-executor/src/actor/executor.rs Outdated Show resolved Hide resolved

send the message to performe the subscribing

25bb3dc

vercel bot deployed to Preview – rooch-portal August 16, 2024 07:06 View deployment

remove debug println

6ac854f

steelgeek091 requested a review from jolestar August 16, 2024 07:11

vercel bot deployed to Preview – rooch-portal August 16, 2024 07:11 View deployment

jolestar approved these changes Aug 17, 2024

View reviewed changes

jolestar merged commit 61cbc13 into rooch-network:main Aug 17, 2024
7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Reload the MoveOS instance automatically for the gas schedule upgrade events. #2432

Reload the MoveOS instance automatically for the gas schedule upgrade events. #2432

steelgeek091 commented Aug 14, 2024

vercel bot commented Aug 14, 2024 •

edited

Loading

baichuan3 Aug 14, 2024

steelgeek091 Aug 14, 2024

baichuan3 Aug 14, 2024

baichuan3 Aug 14, 2024

jolestar Aug 14, 2024

steelgeek091 Aug 14, 2024

steelgeek091 Aug 14, 2024 •

edited

Loading

jolestar Aug 15, 2024

jolestar Aug 15, 2024

jolestar Aug 15, 2024

jolestar Aug 15, 2024

jolestar Aug 15, 2024

steelgeek091 Aug 15, 2024

jolestar Aug 15, 2024

Reload the MoveOS instance automatically for the gas schedule upgrade events. #2432

Reload the MoveOS instance automatically for the gas schedule upgrade events. #2432

Conversation

steelgeek091 commented Aug 14, 2024

vercel bot commented Aug 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

steelgeek091 Aug 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vercel bot commented Aug 14, 2024 •

edited

Loading

steelgeek091 Aug 14, 2024 •

edited

Loading