From b252e4f7d445ba4d78b04444ecf1af9145ba8242 Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Mon, 9 Sep 2024 10:02:50 +0300 Subject: [PATCH 01/15] Fix --- .github/workflows/docker.yaml | 2 +- frontend/Dockerfile | 2 +- frontend/package.json | 2 +- .../cards/block-production-won-slots-cards.component.ts | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 716645eaa7..41b3f632cd 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -176,7 +176,7 @@ jobs: - build_configuration: compose tag_suffix: "" - build_configuration: staging - tag_suffix: "-producer-demo" + tag_suffix: "" runs-on: ubuntu-latest needs: - build-openmina-frontend-image diff --git a/frontend/Dockerfile b/frontend/Dockerfile index ece84a24fa..e8684fddba 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ FROM node:18 AS BUILD_IMAGE -ARG BUILD_CONFIGURATION=staging +ARG BUILD_CONFIGURATION=producer WORKDIR /app COPY . . RUN npm install diff --git a/frontend/package.json b/frontend/package.json index 0b2b7c991e..fba516b62e 100644 --- a/frontend/package.json +++ b/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", diff --git a/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.ts b/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.ts index 75e77bd1a0..aed1ae98da 100644 --- a/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.ts +++ b/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.ts @@ -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)); } From bc1845baed84557a91697fb09edb2a6798f74dd3 Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Mon, 9 Sep 2024 10:18:29 +0300 Subject: [PATCH 02/15] Fix Docker --- .github/workflows/docker.yaml | 9 ++++++++- .../table/block-production-won-slots-table.component.ts | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 41b3f632cd..33c6e5b20c 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -191,6 +191,13 @@ 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 @@ -204,7 +211,7 @@ jobs: type=sha,format=short type=semver,pattern={{version}},event=tag type=ref,event=tag - type=raw,value=latest,enable={{is_default_branch}} + type=raw,value=${{ env.VERSION }},enable={{is_default_branch}} - name: Login to Docker Hub uses: docker/login-action@v3 diff --git a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts index 80dd9c36eb..c2965746d5 100644 --- a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts +++ b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.ts @@ -32,7 +32,7 @@ export class BlockProductionWonSlotsTableComponent extends MinaTableRustWrapper< { name: 'status', sort: 'message' }, { name: 'age', sort: 'slotTime' }, { name: 'height' }, - { name: 'global slot', sort: 'globalSlot' }, + { name: 'slot in epoch', sort: 'globalSlot' }, { name: 'transactions', sort: 'transactionsTotal' }, { name: 'SNARKs', sort: 'completedWorksCount' }, { name: 'SNARK fees', sort: 'snarkFees' }, From 8e6e2abf0fe63b57a2bd3d83bb683b43a0f69464 Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Mon, 9 Sep 2024 10:36:31 +0300 Subject: [PATCH 03/15] Docker --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 33c6e5b20c..b254c3dd80 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -194,7 +194,7 @@ jobs: - name: Extract Version from package.json id: extract_version run: | - VERSION=$(jq -r '.version' ./frontend/package.json) + VERSION=$(jq -r '.version' ../../frontend/package.json) echo "VERSION=${VERSION}" >> $GITHUB_ENV echo "Extracted version: ${VERSION}" From 968adf7ed56af9b226105e1146b7345a54b1d5c2 Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Mon, 9 Sep 2024 11:27:08 +0300 Subject: [PATCH 04/15] Frontend --- .github/workflows/docker.yaml | 17 ++++++++++------- .../e2e/block-production/won-slots/table.cy.ts | 8 ++++---- .../block-production-won-slots.service.ts | 1 + ...lock-production-won-slots-cards.component.ts | 2 +- ...ck-production-won-slots-table.component.html | 1 + ...lock-production-won-slots-table.component.ts | 5 +++-- .../block-production-won-slots-slot.type.ts | 1 + 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index b254c3dd80..dd2254d7c7 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -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: @@ -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 diff --git a/frontend/cypress/e2e/block-production/won-slots/table.cy.ts b/frontend/cypress/e2e/block-production/won-slots/table.cy.ts index 1262ddae74..c21afda42e 100644 --- a/frontend/cypress/e2e/block-production/won-slots/table.cy.ts +++ b/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') diff --git a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts b/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts index 99fbd1506c..dd729aeb33 100644 --- a/frontend/src/app/features/block-production/won-slots/block-production-won-slots.service.ts +++ b/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, diff --git a/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.ts b/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.ts index aed1ae98da..56157a3760 100644 --- a/frontend/src/app/features/block-production/won-slots/cards/block-production-won-slots-cards.component.ts +++ b/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 { diff --git a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html index 96e0ae23fe..3e42122963 100644 --- a/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html +++ b/frontend/src/app/features/block-production/won-slots/table/block-production-won-slots-table.component.html @@ -16,6 +16,7 @@ {{ row.age }} {{ row.height ?? '-' }} {{ row.globalSlot }} + {{ row.slotInEpoch ?? '-' }} Date: Mon, 9 Sep 2024 11:38:23 +0300 Subject: [PATCH 05/15] Version --- .github/workflows/docker.yaml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index dd2254d7c7..e4d7554dba 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -181,16 +181,6 @@ 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: @@ -214,7 +204,7 @@ jobs: type=sha,format=short type=semver,pattern={{version}},event=tag type=ref,event=tag - type=raw,value=${{ env.VERSION }},enable={{is_default_branch}} + type=raw,value=latest,enable={{is_default_branch}} - name: Login to Docker Hub uses: docker/login-action@v3 @@ -230,4 +220,5 @@ jobs: - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.REGISTRY_FRONTEND_IMAGE }}:${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.REGISTRY_FRONTEND_IMAGE }}:v0.8.3 +# ${{ steps.meta.outputs.version }} From 1be2f5545e172e00b01519a9100235772ad3620b Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Mon, 9 Sep 2024 11:50:42 +0300 Subject: [PATCH 06/15] DOcker --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index e4d7554dba..7334026995 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -204,7 +204,7 @@ jobs: type=sha,format=short type=semver,pattern={{version}},event=tag type=ref,event=tag - type=raw,value=latest,enable={{is_default_branch}} + type=raw,value=v0.8.3,enable={{is_default_branch}} - name: Login to Docker Hub uses: docker/login-action@v3 From eed4dbbbbe272245b551ccd693bf3474ba87c0ce Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 9 Sep 2024 08:29:49 -0300 Subject: [PATCH 07/15] fix(ledger): Only update VK cache after handling the VK update itself Needs to be this way so that we can verify the VK update against the old VK --- ledger/src/scan_state/transaction_logic.rs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ledger/src/scan_state/transaction_logic.rs b/ledger/src/scan_state/transaction_logic.rs index f48882601f..71c7ef14cb 100644 --- a/ledger/src/scan_state/transaction_logic.rs +++ b/ledger/src/scan_state/transaction_logic.rs @@ -4027,18 +4027,15 @@ pub mod zkapp_command { let mut tbl = HashMap::with_capacity(128); // Keep track of the verification keys that have been set so far // during this transaction. - let mut vks_overridden = HashMap::with_capacity(128); + let mut vks_overridden: HashMap>> = + HashMap::with_capacity(128); let account_updates = account_updates.try_map_to(|p| { let account_id = p.account_id(); - if let SetOrKeep::Set(vk_next) = &p.body.update.verification_key { - vks_overridden.insert(account_id.clone(), Some(vk_next.clone())); - } - check_authorization(p)?; - match (&p.body.authorization_kind, is_failed) { + let result = match (&p.body.authorization_kind, is_failed) { (AuthorizationKind::Proof(vk_hash), false) => { let prioritized_vk = { // only lookup _past_ vk setting, ie exclude the new one we @@ -4071,7 +4068,15 @@ pub mod zkapp_command { _ => { Ok((p.clone(), None)) } + }; + + // NOTE: we only update the overriden map AFTER verifying the update to make sure + // that the verification for the VK update itself is done against the previous VK. + if let SetOrKeep::Set(vk_next) = &p.body.update.verification_key { + vks_overridden.insert(p.account_id().clone(), Some(vk_next.clone())); } + + result })?; Ok(ZkAppCommand { From 84f02b9b5f9cc594dfb7ea13a089ae1d8fbe46e7 Mon Sep 17 00:00:00 2001 From: Zura Benashvili Date: Mon, 9 Sep 2024 11:27:32 +0400 Subject: [PATCH 08/15] fix(block_producer): slot falsely discarded if staking ledger between best tip and a won slot is different, which can happen at epoch boundary --- node/src/block_producer/block_producer_state.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/node/src/block_producer/block_producer_state.rs b/node/src/block_producer/block_producer_state.rs index fe83508dc0..c9f896bccf 100644 --- a/node/src/block_producer/block_producer_state.rs +++ b/node/src/block_producer/block_producer_state.rs @@ -310,7 +310,9 @@ impl BlockProducerCurrentState { return Some(BlockProducerWonSlotDiscardReason::BestTipGlobalSlotHigher); } - if &won_slot.staking_ledger_hash != best_tip.staking_epoch_ledger_hash() { + if &won_slot.staking_ledger_hash != best_tip.staking_epoch_ledger_hash() + && &won_slot.staking_ledger_hash != best_tip.next_epoch_ledger_hash() + { return Some(BlockProducerWonSlotDiscardReason::BestTipStakingLedgerDifferent); } From 6202856be195b04f14beb2dea5f454a413e16b66 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 9 Sep 2024 08:51:27 -0300 Subject: [PATCH 09/15] chore: Update CHANGELOG --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index daab8cbfed..a478a995e8 100644 --- a/CHANGELOG.md +++ b/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 From 0c5c3367cc8a793795e0295c24a1a0b02f670a69 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 9 Sep 2024 08:51:46 -0300 Subject: [PATCH 10/15] chore: Bump version to 0.8.3 --- cli/Cargo.toml | 2 +- cli/replay_dynamic_effects/Cargo.toml | 2 +- core/Cargo.toml | 2 +- fuzzer/Cargo.toml | 2 +- ledger/Cargo.toml | 2 +- macros/Cargo.toml | 2 +- node/Cargo.toml | 2 +- node/account/Cargo.toml | 2 +- node/common/Cargo.toml | 2 +- node/invariants/Cargo.toml | 2 +- node/native/Cargo.toml | 2 +- node/testing/Cargo.toml | 2 +- node/web/Cargo.toml | 2 +- p2p/Cargo.toml | 2 +- p2p/libp2p-rpc-behaviour/Cargo.toml | 2 +- p2p/testing/Cargo.toml | 2 +- producer-dashboard/Cargo.toml | 2 +- snark/Cargo.toml | 2 +- tools/bootstrap-sandbox/Cargo.toml | 2 +- tools/gossipsub-sandbox/Cargo.toml | 2 +- tools/hash-tool/Cargo.toml | 2 +- tools/ledger-tool/Cargo.toml | 2 +- tools/salsa-simple/Cargo.toml | 2 +- tools/transport/Cargo.toml | 2 +- vrf/Cargo.toml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 908b11de69..be799fd59c 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cli" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/cli/replay_dynamic_effects/Cargo.toml b/cli/replay_dynamic_effects/Cargo.toml index 0d11b20e1a..5556dbaa82 100644 --- a/cli/replay_dynamic_effects/Cargo.toml +++ b/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" diff --git a/core/Cargo.toml b/core/Cargo.toml index adba0be8a8..68475e52a8 100644 --- a/core/Cargo.toml +++ b/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" diff --git a/fuzzer/Cargo.toml b/fuzzer/Cargo.toml index fafebde9ec..28ffc53cac 100644 --- a/fuzzer/Cargo.toml +++ b/fuzzer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-fuzzer" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 1a920d3fff..af37196711 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mina-tree" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 92158d505c..1c3abe2499 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-macros" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" authors = [ "Alexander Koptelov " ] diff --git a/node/Cargo.toml b/node/Cargo.toml index 02cc6ba3ad..7e4790373e 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/node/account/Cargo.toml b/node/account/Cargo.toml index ba47e5146c..b2d0506b5d 100644 --- a/node/account/Cargo.toml +++ b/node/account/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-account" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/node/common/Cargo.toml b/node/common/Cargo.toml index e05a4a103f..225ff49e9a 100644 --- a/node/common/Cargo.toml +++ b/node/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-common" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/node/invariants/Cargo.toml b/node/invariants/Cargo.toml index 97159f692b..f59591761d 100644 --- a/node/invariants/Cargo.toml +++ b/node/invariants/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-invariants" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/node/native/Cargo.toml b/node/native/Cargo.toml index 356aa24c0f..7b8db1185a 100644 --- a/node/native/Cargo.toml +++ b/node/native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-native" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/node/testing/Cargo.toml b/node/testing/Cargo.toml index d788319265..c2241a0ce8 100644 --- a/node/testing/Cargo.toml +++ b/node/testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-testing" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/node/web/Cargo.toml b/node/web/Cargo.toml index 3af6f74b45..085b23efc9 100644 --- a/node/web/Cargo.toml +++ b/node/web/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-web" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 16fbdda90c..700a9dfd02 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2p" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/p2p/libp2p-rpc-behaviour/Cargo.toml b/p2p/libp2p-rpc-behaviour/Cargo.toml index a334c1e9b4..0317cdd406 100644 --- a/p2p/libp2p-rpc-behaviour/Cargo.toml +++ b/p2p/libp2p-rpc-behaviour/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libp2p-rpc-behaviour" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/p2p/testing/Cargo.toml b/p2p/testing/Cargo.toml index 8d58d4a0ec..044cf48c67 100644 --- a/p2p/testing/Cargo.toml +++ b/p2p/testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2p-testing" -version = "0.8.2" +version = "0.8.3" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/producer-dashboard/Cargo.toml b/producer-dashboard/Cargo.toml index 358b000be9..5783103001 100644 --- a/producer-dashboard/Cargo.toml +++ b/producer-dashboard/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-producer-dashboard" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/snark/Cargo.toml b/snark/Cargo.toml index a27d7a502d..30aaf69128 100644 --- a/snark/Cargo.toml +++ b/snark/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snark" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" diff --git a/tools/bootstrap-sandbox/Cargo.toml b/tools/bootstrap-sandbox/Cargo.toml index bb573c6c10..7992731d24 100644 --- a/tools/bootstrap-sandbox/Cargo.toml +++ b/tools/bootstrap-sandbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-bootstrap-sandbox" -version = "0.8.2" +version = "0.8.3" edition = "2021" [dependencies] diff --git a/tools/gossipsub-sandbox/Cargo.toml b/tools/gossipsub-sandbox/Cargo.toml index b080836839..d61346d63f 100644 --- a/tools/gossipsub-sandbox/Cargo.toml +++ b/tools/gossipsub-sandbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-gossipsub-sandbox" -version = "0.8.2" +version = "0.8.3" edition = "2021" [dependencies] diff --git a/tools/hash-tool/Cargo.toml b/tools/hash-tool/Cargo.toml index bdfda73104..2bd09d91d6 100644 --- a/tools/hash-tool/Cargo.toml +++ b/tools/hash-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hash-tool" -version = "0.8.2" +version = "0.8.3" edition = "2021" [dependencies] diff --git a/tools/ledger-tool/Cargo.toml b/tools/ledger-tool/Cargo.toml index 92498a6606..d4201e0f89 100644 --- a/tools/ledger-tool/Cargo.toml +++ b/tools/ledger-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ledger-tool" -version = "0.8.2" +version = "0.8.3" edition = "2021" [dependencies] diff --git a/tools/salsa-simple/Cargo.toml b/tools/salsa-simple/Cargo.toml index 7922f98529..f09fdd59cd 100644 --- a/tools/salsa-simple/Cargo.toml +++ b/tools/salsa-simple/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "salsa-simple" -version = "0.8.2" +version = "0.8.3" edition = "2021" [dev-dependencies] diff --git a/tools/transport/Cargo.toml b/tools/transport/Cargo.toml index d2c1dfc895..6c9117dd92 100644 --- a/tools/transport/Cargo.toml +++ b/tools/transport/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mina-transport" -version = "0.8.2" +version = "0.8.3" edition = "2021" [dependencies] diff --git a/vrf/Cargo.toml b/vrf/Cargo.toml index b668a09ac8..c5567b6a3b 100644 --- a/vrf/Cargo.toml +++ b/vrf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vrf" -version = "0.8.2" +version = "0.8.3" edition = "2021" license = "Apache-2.0" From bb256d4f23b6b7baaf776ed33570dfe09ce21a01 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 9 Sep 2024 08:52:04 -0300 Subject: [PATCH 11/15] chore: Update Cargo.lock --- Cargo.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f90e0d45b4..579ba4fa51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1013,7 +1013,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cli" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "bytes", @@ -2412,7 +2412,7 @@ dependencies = [ [[package]] name = "hash-tool" -version = "0.8.2" +version = "0.8.3" dependencies = [ "bs58 0.5.0", "hex", @@ -3010,7 +3010,7 @@ dependencies = [ [[package]] name = "ledger-tool" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "mina-curves", @@ -3336,7 +3336,7 @@ dependencies = [ [[package]] name = "libp2p-rpc-behaviour" -version = "0.8.2" +version = "0.8.3" dependencies = [ "libp2p", "log", @@ -3715,7 +3715,7 @@ dependencies = [ [[package]] name = "mina-transport" -version = "0.8.2" +version = "0.8.3" dependencies = [ "blake2", "hex", @@ -3726,7 +3726,7 @@ dependencies = [ [[package]] name = "mina-tree" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "ark-ec", @@ -4059,7 +4059,7 @@ dependencies = [ [[package]] name = "node" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "derive_more", @@ -4404,7 +4404,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openmina-bootstrap-sandbox" -version = "0.8.2" +version = "0.8.3" dependencies = [ "base64 0.21.7", "binprot", @@ -4429,7 +4429,7 @@ dependencies = [ [[package]] name = "openmina-core" -version = "0.8.2" +version = "0.8.3" dependencies = [ "ark-ff", "binprot", @@ -4456,7 +4456,7 @@ dependencies = [ [[package]] name = "openmina-fuzzer" -version = "0.8.2" +version = "0.8.3" dependencies = [ "lazy_static", "rand 0.8.5", @@ -4467,7 +4467,7 @@ dependencies = [ [[package]] name = "openmina-gossipsub-sandbox" -version = "0.8.2" +version = "0.8.3" dependencies = [ "bs58 0.5.0", "env_logger", @@ -4481,7 +4481,7 @@ dependencies = [ [[package]] name = "openmina-macros" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "openmina-core", @@ -4494,7 +4494,7 @@ dependencies = [ [[package]] name = "openmina-node-account" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "argon2", @@ -4515,7 +4515,7 @@ dependencies = [ [[package]] name = "openmina-node-common" -version = "0.8.2" +version = "0.8.3" dependencies = [ "gloo-timers", "gloo-utils", @@ -4543,7 +4543,7 @@ dependencies = [ [[package]] name = "openmina-node-invariants" -version = "0.8.2" +version = "0.8.3" dependencies = [ "documented", "lazy_static", @@ -4557,7 +4557,7 @@ dependencies = [ [[package]] name = "openmina-node-native" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "bytes", @@ -4591,7 +4591,7 @@ dependencies = [ [[package]] name = "openmina-node-testing" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "axum", @@ -4635,7 +4635,7 @@ dependencies = [ [[package]] name = "openmina-node-web" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "bytes", @@ -4661,7 +4661,7 @@ dependencies = [ [[package]] name = "openmina-producer-dashboard" -version = "0.8.2" +version = "0.8.3" dependencies = [ "bincode", "clap 4.5.2", @@ -4753,7 +4753,7 @@ dependencies = [ [[package]] name = "p2p" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "binprot", @@ -4816,7 +4816,7 @@ dependencies = [ [[package]] name = "p2p-testing" -version = "0.8.2" +version = "0.8.3" dependencies = [ "derive_more", "futures", @@ -5671,7 +5671,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "replay_dynamic_effects" -version = "0.8.2" +version = "0.8.3" dependencies = [ "node", "openmina-node-invariants", @@ -6015,7 +6015,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "salsa-simple" -version = "0.8.2" +version = "0.8.3" dependencies = [ "generic-array", "hex", @@ -6408,7 +6408,7 @@ dependencies = [ [[package]] name = "snark" -version = "0.8.2" +version = "0.8.3" dependencies = [ "ark-ec", "ark-ff", @@ -7591,7 +7591,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrf" -version = "0.8.2" +version = "0.8.3" dependencies = [ "anyhow", "ark-ec", From b85db28a828c0c4716ed5dd70f2c23574647ef46 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 9 Sep 2024 08:52:47 -0300 Subject: [PATCH 12/15] chore: Update version in docker compose files --- docker-compose.local.producers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.local.producers.yml b/docker-compose.local.producers.yml index bdc8bb8b65..36ab249b1f 100644 --- a/docker-compose.local.producers.yml +++ b/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 From be6159832b9898cf326e44d84e86b2c0ee8edfb9 Mon Sep 17 00:00:00 2001 From: Teofil Jolte Date: Mon, 9 Sep 2024 15:02:16 +0300 Subject: [PATCH 13/15] DOcker --- .github/workflows/docker.yaml | 5 ++--- docker-compose.local.producers.yml | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 7334026995..41b3f632cd 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -204,7 +204,7 @@ jobs: type=sha,format=short type=semver,pattern={{version}},event=tag type=ref,event=tag - type=raw,value=v0.8.3,enable={{is_default_branch}} + type=raw,value=latest,enable={{is_default_branch}} - name: Login to Docker Hub uses: docker/login-action@v3 @@ -220,5 +220,4 @@ jobs: - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.REGISTRY_FRONTEND_IMAGE }}:v0.8.3 -# ${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.REGISTRY_FRONTEND_IMAGE }}:${{ steps.meta.outputs.version }} diff --git a/docker-compose.local.producers.yml b/docker-compose.local.producers.yml index 36ab249b1f..a022fc9596 100644 --- a/docker-compose.local.producers.yml +++ b/docker-compose.local.producers.yml @@ -1,7 +1,7 @@ services: local-producer-cluster: container_name: local-producer-cluster - image: openmina/openmina:0.8.3 + image: openmina/openmina:0.8.2 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.3-producer-demo + image: openmina/frontend:0.8.2 # build: # context: . # dockerfile: Dockerfile_FE From b47ccf61711a89ebdd55ae659b6a61350652ee5b Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 9 Sep 2024 09:26:08 -0300 Subject: [PATCH 14/15] chore: Adjust compose files --- docker-compose.local.producers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.local.producers.yml b/docker-compose.local.producers.yml index a022fc9596..36ab249b1f 100644 --- a/docker-compose.local.producers.yml +++ b/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 + image: openmina/frontend:0.8.3-producer-demo # build: # context: . # dockerfile: Dockerfile_FE From 35fd17a1933fdcdfd77302aeca8147a08360f7a3 Mon Sep 17 00:00:00 2001 From: Bruno Deferrari Date: Mon, 9 Sep 2024 09:36:10 -0300 Subject: [PATCH 15/15] chore: Adjust compose files (more reverts) --- .github/workflows/docker.yaml | 2 +- frontend/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 41b3f632cd..716645eaa7 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -176,7 +176,7 @@ jobs: - build_configuration: compose tag_suffix: "" - build_configuration: staging - tag_suffix: "" + tag_suffix: "-producer-demo" runs-on: ubuntu-latest needs: - build-openmina-frontend-image diff --git a/frontend/Dockerfile b/frontend/Dockerfile index e8684fddba..ece84a24fa 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ FROM node:18 AS BUILD_IMAGE -ARG BUILD_CONFIGURATION=producer +ARG BUILD_CONFIGURATION=staging WORKDIR /app COPY . . RUN npm install