From 9690140de8aab7da4442b5168e0160d50b052731 Mon Sep 17 00:00:00 2001 From: mx819812523 Date: Tue, 24 Sep 2024 12:19:53 +0800 Subject: [PATCH] [framework]:add exist_new_events fun and subscriber_info fun --- .../moveos-stdlib/sources/event_queue.move | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/frameworks/moveos-stdlib/sources/event_queue.move b/frameworks/moveos-stdlib/sources/event_queue.move index 4cbe63ea0..82aaef05a 100644 --- a/frameworks/moveos-stdlib/sources/event_queue.move +++ b/frameworks/moveos-stdlib/sources/event_queue.move @@ -7,7 +7,7 @@ module moveos_std::event_queue { use std::string::String; use moveos_std::timestamp; use moveos_std::event; - use moveos_std::object::{Self, Object, ObjectID}; + use moveos_std::object::{Self, Object, ObjectID, borrow_object}; const EVENT_EXPIRE_TIME: u64 = 1000 * 60 * 60 * 24 * 31; // 31 days const REMOVE_EXPIRED_EVENT_BATCH_SIZE: u64 = 10; @@ -175,7 +175,38 @@ module moveos_std::event_queue { let event_queue_obj = borrow_mut_queue(queue_id); internal_remove_expired_events(event_queue_obj); } - + + + public fun subscriber_info(subscriber_obj: &Object>):(u64, u64, u64) { + let subscriber = object::borrow(subscriber_obj); + let subscriber_sequence_number = subscriber.sequence_number; + // If the subscriber_obj is exsited, the queue must be existed + let event_queue_obj = borrow_object>(subscriber.queue_id); + let head_sequence_number = object::borrow(event_queue_obj).head_sequence_number; + let tail_sequence_number = object::borrow(event_queue_obj).tail_sequence_number; + (subscriber_sequence_number, head_sequence_number, tail_sequence_number) + } + + public fun exist_new_events(subscriber_obj: &Object>): bool { + let subscriber = object::borrow(subscriber_obj); + let subscriber_sequence_number = subscriber.sequence_number; + // If the subscriber_obj is exsited, the queue must be existed + let event_queue_obj = borrow_object>(subscriber.queue_id); + let head_sequence_number = object::borrow(event_queue_obj).head_sequence_number; + let tail_sequence_number = object::borrow(event_queue_obj).tail_sequence_number; + if(head_sequence_number == tail_sequence_number){ + return false + }; + if (subscriber_sequence_number >= head_sequence_number) { + return false + }; + subscriber_sequence_number = if (tail_sequence_number > subscriber_sequence_number) { + tail_sequence_number + } else { + subscriber_sequence_number + }; + return object::contains_field(event_queue_obj, subscriber_sequence_number) + } fun internal_remove_expired_events(event_queue_obj: &mut Object>){ let head_sequence_number = object::borrow(event_queue_obj).head_sequence_number; let tail_sequence_number = object::borrow(event_queue_obj).tail_sequence_number;