Skip to content

Commit 37fd0cf

Browse files
authored
Merge pull request #661 from openmina/develop
Merge `develop` to `main`
2 parents 8869f17 + 35fd17a commit 37fd0cf

File tree

37 files changed

+87
-67
lines changed

37 files changed

+87
-67
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.8.3] - 2024-09-09
11+
12+
### Fixed
13+
14+
- Handling verification key updates with proof authorization kind.
15+
- Block producer incorrectly discarding blocks if staking ledger between best tip and won slot were different.
16+
1017
## [0.8.2] - 2024-09-06
1118

1219
### Fixed
@@ -228,7 +235,8 @@ First public release.
228235
- 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.
229236
- Web-based frontend for the node.
230237

231-
[Unreleased]: https://github.com/openmina/openmina/compare/v0.8.2...develop
238+
[Unreleased]: https://github.com/openmina/openmina/compare/v0.8.3...develop
239+
[0.8.3]: https://github.com/openmina/openmina/releases/tag/v0.8.2...v0.8.3
232240
[0.8.2]: https://github.com/openmina/openmina/releases/tag/v0.8.1...v0.8.2
233241
[0.8.1]: https://github.com/openmina/openmina/releases/tag/v0.8.0...v0.8.1
234242
[0.8.0]: https://github.com/openmina/openmina/releases/tag/v0.7.0...v0.8.0

Cargo.lock

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

cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cli"
3-
version = "0.8.2"
3+
version = "0.8.3"
44
edition = "2021"
55
license = "Apache-2.0"
66

cli/replay_dynamic_effects/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "replay_dynamic_effects"
3-
version = "0.8.2"
3+
version = "0.8.3"
44
edition = "2021"
55
license = "Apache-2.0"
66

core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "openmina-core"
3-
version = "0.8.2"
3+
version = "0.8.3"
44
edition = "2021"
55
license = "Apache-2.0"
66

docker-compose.local.producers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
local-producer-cluster:
33
container_name: local-producer-cluster
4-
image: openmina/openmina:0.8.2
4+
image: openmina/openmina:0.8.3
55
environment:
66
- RUST_BACKTRACE=1
77
entrypoint: ["openmina-node-testing", "scenarios-generate", "--name", "simulation-small-forever-real-time"]
@@ -12,7 +12,7 @@ services:
1212

1313
frontend:
1414
container_name: frontend
15-
image: openmina/frontend:0.8.2-producer-demo
15+
image: openmina/frontend:0.8.3-producer-demo
1616
# build:
1717
# context: .
1818
# dockerfile: Dockerfile_FE

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ describe('BLOCK PRODUCTION WON SLOTS TABLE', () => {
122122
}));
123123

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

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

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

163163
it('sort by snark tx fees rewards', () => execute(() => {
164-
cy.get('mina-block-production-won-slots-table .head > span:nth-child(9)')
164+
cy.get('mina-block-production-won-slots-table .head > span:nth-child(10)')
165165
.click()
166166
.window()
167167
.its('store')

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "frontend",
3-
"version": "0.1",
3+
"version": "0.8.3",
44
"scripts": {
55
"install:deps": "npm install",
66
"start": "npm install && ng serve --configuration local --open",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export class BlockProductionWonSlotsService {
3636
age: this.calculateTimeAgo(attempt),
3737
slotTime: attempt.won_slot.slot_time,
3838
globalSlot: attempt.won_slot.global_slot,
39+
slotInEpoch: attempt.won_slot.global_slot % 7140,
3940
vrfValueWithThreshold: attempt.won_slot.value_with_threshold,
4041
active: attempt.active,
4142

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
22
import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class';
33
import { BlockProductionWonSlotsSelectors } from '@block-production/won-slots/block-production-won-slots.state';
4-
import { lastItem, ONE_BILLION, ONE_MILLION, ONE_THOUSAND } from '@openmina/shared';
4+
import { lastItem, ONE_BILLION, ONE_MILLION, ONE_THOUSAND, toReadableDate } from '@openmina/shared';
55
import { getTimeDiff } from '@shared/helpers/date.helper';
66
import { filter } from 'rxjs';
77
import {
@@ -72,6 +72,7 @@ export class BlockProductionWonSlotsCardsComponent extends StoreDispatcher imple
7272
)
7373
.map(s => s.coinbaseRewards + s.txFeesRewards).reduce((a, b) => a + b, 0).toFixed(0);
7474

75+
this.card6.totalRewards = isNaN(+this.card6.totalRewards) ? '0' : this.card6.totalRewards;
7576
this.detect();
7677
}, filter(slots => slots.length > 0));
7778
}

0 commit comments

Comments
 (0)