[bitcoin_move] Improve reorg and pending block #2691
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jolestar
requested review from
pause125,
baichuan3,
popcnt1,
wow-sven and
steelgeek091
as code owners
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Skipped Deployment
|
Dependency Review✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.OpenSSF Scorecard
Scanned Manifest Files |
popcnt1
approved these changes
Sep 25, 2024
baichuan3
reviewed
Sep 25, 2024
| @@ -308,6 +311,13 @@ module bitcoin_move::pending_block{ | |||
| }; | |||
| let block_hash = *simple_map::borrow(&store.pending_blocks, &ready_block_height); | |||
| let block_obj = borrow_pending_block(block_hash); | |||
| let prev_block_hash = types::prev_blockhash(&object::borrow(block_obj).header); | |||
| while(exists_pending_block(prev_block_hash)){ | |||
There was a problem hiding this comment.
这段代码是为了确保 penging 区块即使在排序异常的情况下，也能优先处理最早的区块？
There was a problem hiding this comment.
原来的逻辑下，pending 的 block 要恰好比 reorg count 多 1，如果否则就会把后面的块先处理了。
baichuan3
reviewed
Sep 25, 2024
| } | ||
|
|
||
| fun handle_reog(store: &mut PendingStore, reorg_block_height: u64){ | ||
| fun handle_reorg(store: &mut PendingStore, reorg_block_height: u64){ |
There was a problem hiding this comment.
直接 remove private 的 fun，有没有兼容性问题？
There was a problem hiding this comment.
private fun 可以随便改。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
[bitcoin_move] Improve reorg and pending block logic.
[test] Add reorg failed test case
[rpc] Add
rooch_statusAPI to get the rpc service, Rooch, and Bitcoin status.{ "service_status": "active", "rooch_status": { "sequencer_info": { "last_order": "224", "last_accumulator_info": { "accumulator_root": "0x47cf3562c72f93e360017b08374e2bbb8ba319c824c649946a4dfa4511599347", "frozen_subtree_roots": [ "0x3795aa636d75ff68d282b9afad889ba9c0efca46fcd9b93e79ea703d65759a4d", "0x96e1b6e9e0c2bfa2a92bc83db25baf2e1a8789147246898a331f9a9fb4ec31bd", "0xb81ea651ae858bb6522b25a4d2b1617d6be684114f5cf9e71987a339c858543d", "0x65a9391a914f641cf723ea9780f04e9682f10e42fe0f129826e6f5e9cc6a34e8" ], "num_leaves": "225", "num_nodes": "446" } }, "root_state": { "state_root": "0x9df91a21bb06383597f3c422f5767eca7cd1af89fc7ab6ada10c81af16a40576", "size": "57" } }, "bitcoin_status": { "confirmed_block": { "block_height": "106", "block_hash": "77aefde90a4c8dc6786a3c44911cbf1547239118650ef44cd9145aa131226366" }, "pending_block": { "block_height": "106", "block_hash": "77aefde90a4c8dc6786a3c44911cbf1547239118650ef44cd9145aa131226366" } } }relative issue: #2653