Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,16 @@ jobs:
needs:
- build-openmina-frontend-image
steps:
- name: Git checkout
uses: actions/checkout@v3

- name: Extract Version from package.json
id: extract_version
run: |
VERSION=$(jq -r '.version' ../../frontend/package.json)
echo "VERSION=${VERSION}" >> $GITHUB_ENV
echo "Extracted version: ${VERSION}"

- name: Download digests
uses: actions/download-artifact@v4
with:
Expand All @@ -191,13 +201,6 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Extract Version from package.json
id: extract_version
run: |
VERSION=$(jq -r '.version' ../../frontend/package.json)
echo "VERSION=${VERSION}" >> $GITHUB_ENV
echo "Extracted version: ${VERSION}"

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
Expand Down
8 changes: 4 additions & 4 deletions frontend/cypress/e2e/block-production/won-slots/table.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ describe('BLOCK PRODUCTION WON SLOTS TABLE', () => {
}));

it('sort by transactions', () => execute(() => {
cy.get('mina-block-production-won-slots-table .head > span:nth-child(5)')
cy.get('mina-block-production-won-slots-table .head > span:nth-child(6)')
.click()
.window()
.its('store')
Expand All @@ -135,7 +135,7 @@ describe('BLOCK PRODUCTION WON SLOTS TABLE', () => {
}));

it('sort by snark fees', () => execute(() => {
cy.get('mina-block-production-won-slots-table .head > span:nth-child(7)')
cy.get('mina-block-production-won-slots-table .head > span:nth-child(8)')
.click()
.window()
.its('store')
Expand All @@ -148,7 +148,7 @@ describe('BLOCK PRODUCTION WON SLOTS TABLE', () => {
}));

it('sort by snark coinbase rewards', () => execute(() => {
cy.get('mina-block-production-won-slots-table .head > span:nth-child(8)')
cy.get('mina-block-production-won-slots-table .head > span:nth-child(9)')
.click()
.window()
.its('store')
Expand All @@ -161,7 +161,7 @@ describe('BLOCK PRODUCTION WON SLOTS TABLE', () => {
}));

it('sort by snark tx fees rewards', () => execute(() => {
cy.get('mina-block-production-won-slots-table .head > span:nth-child(9)')
cy.get('mina-block-production-won-slots-table .head > span:nth-child(10)')
.click()
.window()
.its('store')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export class BlockProductionWonSlotsService {
age: this.calculateTimeAgo(attempt),
slotTime: attempt.won_slot.slot_time,
globalSlot: attempt.won_slot.global_slot,
slotInEpoch: attempt.won_slot.global_slot % 7140,
vrfValueWithThreshold: attempt.won_slot.value_with_threshold,
active: attempt.active,

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class';
import { BlockProductionWonSlotsSelectors } from '@block-production/won-slots/block-production-won-slots.state';
import { lastItem, ONE_BILLION, ONE_MILLION, ONE_THOUSAND } from '@openmina/shared';
import { lastItem, ONE_BILLION, ONE_MILLION, ONE_THOUSAND, toReadableDate } from '@openmina/shared';
import { getTimeDiff } from '@shared/helpers/date.helper';
import { filter } from 'rxjs';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<span>{{ row.age }}</span>
<span>{{ row.height ?? '-' }}</span>
<span>{{ row.globalSlot }}</span>
<span>{{ row.slotInEpoch ?? '-' }}</span>
<span
[tooltipDisabled]="true"
[tooltip]="row.payments + ' payments, ' + row.delegations + ' delegations, ' + row.zkapps + ' zkapps'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ export class BlockProductionWonSlotsTableComponent extends MinaTableRustWrapper<
{ name: 'status', sort: 'message' },
{ name: 'age', sort: 'slotTime' },
{ name: 'height' },
{ name: 'slot in epoch', sort: 'globalSlot' },
{ name: 'global slot', sort: 'globalSlot' },
{ name: 'epoch slot', sort: 'slotInEpoch' },
{ name: 'transactions', sort: 'transactionsTotal' },
{ name: 'SNARKs', sort: 'completedWorksCount' },
{ name: 'SNARK fees', sort: 'snarkFees' },
Expand All @@ -56,7 +57,7 @@ export class BlockProductionWonSlotsTableComponent extends MinaTableRustWrapper<
}

protected override setupTable(): void {
this.table.gridTemplateColumns = [210, 140, 110, 120, 120, 120, 120, 150, 150];
this.table.gridTemplateColumns = [210, 140, 90, 110, 120, 120, 120, 120, 150, 150];
this.table.propertyForActiveCheck = 'globalSlot';
this.table.thGroupsTemplate = this.thGroupsTemplate;
this.table.sortAction = BlockProductionWonSlotsActions.sort;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export interface BlockProductionWonSlotsSlot {
age: string;
slotTime: number;
globalSlot: number;
slotInEpoch: number;
vrfValueWithThreshold: [number, number];
active: boolean;
percentage: number;
Expand Down
Loading