Skip to content

Commit 28b0a73

Browse files
authored
Merge pull request #1123 from openmina/feat/grapqhl-adonagy
[GraphQL] Add daemonStatus endpoint + fix account loading
2 parents 2dd3d26 + c7e9c56 commit 28b0a73

File tree

32 files changed

+1612
-273
lines changed

32 files changed

+1612
-273
lines changed

Cargo.lock

Lines changed: 222 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/block/block_with_hash.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ impl<T: AsRef<Block>> BlockWithHash<T> {
6161
global_slot(self.header())
6262
}
6363

64+
pub fn slot(&self) -> u32 {
65+
slot(self.header())
66+
}
67+
6468
pub fn global_slot_since_genesis(&self) -> u32 {
6569
global_slot_since_genesis(self.header())
6670
}
@@ -180,6 +184,10 @@ impl<T: AsRef<BlockHeader>> BlockHeaderWithHash<T> {
180184
global_slot(self.header())
181185
}
182186

187+
pub fn slot(&self) -> u32 {
188+
slot(self.header())
189+
}
190+
183191
pub fn global_slot_since_genesis(&self) -> u32 {
184192
global_slot_since_genesis(self.header())
185193
}
@@ -251,6 +259,15 @@ fn global_slot(header: &BlockHeader) -> u32 {
251259
consensus_state(header).global_slot()
252260
}
253261

262+
fn slot(header: &BlockHeader) -> u32 {
263+
let slot_struct = &consensus_state(header).curr_global_slot_since_hard_fork;
264+
slot_struct
265+
.slot_number
266+
.as_u32()
267+
.checked_rem(slot_struct.slots_per_epoch.as_u32())
268+
.expect("division by zero")
269+
}
270+
254271
fn global_slot_since_genesis(header: &BlockHeader) -> u32 {
255272
consensus_state(header).global_slot_since_genesis.as_u32()
256273
}

0 commit comments

Comments
 (0)