mirror of
https://github.com/ton-blockchain/ton
synced 2025-03-09 15:40:10 +00:00
Merge branch 'testnet' into block-generation
# Conflicts: # crypto/block/mc-config.cpp # crypto/block/mc-config.h
This commit is contained in:
commit
e216651112
41 changed files with 1233 additions and 192 deletions
|
|
@ -41,6 +41,7 @@ class ShardStateQ : virtual public ShardState {
|
|||
bool before_split_{false};
|
||||
bool fake_split_{false};
|
||||
bool fake_merge_{false};
|
||||
td::optional<BlockIdExt> master_ref;
|
||||
|
||||
protected:
|
||||
friend class Ref<ShardStateQ>;
|
||||
|
|
@ -80,6 +81,9 @@ class ShardStateQ : virtual public ShardState {
|
|||
LogicalTime get_logical_time() const override {
|
||||
return lt;
|
||||
}
|
||||
td::optional<BlockIdExt> get_master_ref() const override {
|
||||
return master_ref;
|
||||
}
|
||||
td::Status validate_deep() const override;
|
||||
ShardStateQ* make_copy() const override;
|
||||
td::Result<Ref<MessageQueue>> message_queue() const override;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue