Merge develop to main

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.3] - 2024-09-09
+
+### Fixed
+
+- Handling verification key updates with proof authorization kind.
+- Block producer incorrectly discarding blocks if staking ledger between best tip and won slot were different.
+
 ## [0.8.2] - 2024-09-06
 
 ### Fixed
@@ -228,7 +235,8 @@ First public release.
 - Alpha version of the node which can connect and syncup to the berkeleynet network, and keep applying new blocks to maintain consensus state and ledger up to date.
 - Web-based frontend for the node.
 
-[Unreleased]: https://github.com/openmina/openmina/compare/v0.8.2...develop
+[Unreleased]: https://github.com/openmina/openmina/compare/v0.8.3...develop
+[0.8.3]: https://github.com/openmina/openmina/releases/tag/v0.8.2...v0.8.3
 [0.8.2]: https://github.com/openmina/openmina/releases/tag/v0.8.1...v0.8.2
 [0.8.1]: https://github.com/openmina/openmina/releases/tag/v0.8.0...v0.8.1
 [0.8.0]: https://github.com/openmina/openmina/releases/tag/v0.7.0...v0.8.0

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cli"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "Apache-2.0"
 

cli/replay_dynamic_effects/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "replay_dynamic_effects"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "Apache-2.0"
 

core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "openmina-core"
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 license = "Apache-2.0"
 

docker-compose.local.producers.yml

@@ -1,7 +1,7 @@
 services:
   local-producer-cluster:
     container_name: local-producer-cluster
-    image: openmina/openmina:0.8.2
+    image: openmina/openmina:0.8.3
     environment:
       - RUST_BACKTRACE=1
     entrypoint: ["openmina-node-testing", "scenarios-generate", "--name", "simulation-small-forever-real-time"]
@@ -12,7 +12,7 @@ services:
 
   frontend:
     container_name: frontend
-    image: openmina/frontend:0.8.2-producer-demo
+    image: openmina/frontend:0.8.3-producer-demo
     # build:
     #   context: .
     #   dockerfile: Dockerfile_FE

frontend/cypress/e2e/block-production/won-slots/table.cy.ts

@@ -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')
@@ -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')
@@ -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')
@@ -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')

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "0.1",
+  "version": "0.8.3",
   "scripts": {
     "install:deps": "npm install",
     "start": "npm install && ng serve --configuration local --open",

frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts

@@ -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,
 

frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.ts

@@ -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 {
@@ -72,6 +72,7 @@ export class BlockProductionWonSlotsCardsComponent extends StoreDispatcher imple
         )
         .map(s => s.coinbaseRewards + s.txFeesRewards).reduce((a, b) => a + b, 0).toFixed(0);
 
+      this.card6.totalRewards = isNaN(+this.card6.totalRewards) ? '0' : this.card6.totalRewards;
       this.detect();
     }, filter(slots => slots.length > 0));
   }

frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html

@@ -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'"

frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts

@@ -33,6 +33,7 @@ export class BlockProductionWonSlotsTableComponent extends MinaTableRustWrapper<
     { name: 'age', sort: 'slotTime' },
     { name: 'height' },
     { name: 'global slot', sort: 'globalSlot' },
+    { name: 'epoch slot', sort: 'slotInEpoch' },
     { name: 'transactions', sort: 'transactionsTotal' },
     { name: 'SNARKs', sort: 'completedWorksCount' },
     { name: 'SNARK fees', sort: 'snarkFees' },
@@ -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;

frontend/src/app/shared/types/block-production/won-slots/block-production-won-slots-slot.type.ts

@@ -5,6 +5,7 @@ export interface BlockProductionWonSlotsSlot {
   age: string;
   slotTime: number;
   globalSlot: number;
+  slotInEpoch: number;
   vrfValueWithThreshold: [number, number];
   active: boolean;
   percentage: number;