diff --git a/.drone.yml b/.drone.yml index ed34bb4ea..9e1107ed0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -304,7 +304,7 @@ steps: DOCKER_BUILDKIT: "0" commands: - COMMIT_SHORT_SHA=$(echo $DRONE_COMMIT_SHA | cut -c 1-7) - - docker build --no-cache -t openmina/rust-fe:$COMMIT_SHORT_SHA -f Dockerfile_FE . + - docker build --no-cache -t openmina/frontend:$COMMIT_SHORT_SHA -f Dockerfile_FE . volumes: - name: docker_sock path: /var/run/docker.sock @@ -319,7 +319,7 @@ steps: - build - name: frontend-server - image: openmina/rust-fe:${DRONE_COMMIT_SHA:0:7} + image: openmina/frontend:${DRONE_COMMIT_SHA:0:7} pull: if-not-exists detach: true privileged: true @@ -449,7 +449,7 @@ steps: image: docker:latest commands: - echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin - - docker push openmina/rust-fe:${DRONE_COMMIT_SHA:0:7} + - docker push openmina/frontend:${DRONE_COMMIT_SHA:0:7} volumes: - name: docker_sock path: /var/run/docker.sock diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af0cc1ca0..b55b520c2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,18 +47,6 @@ jobs: rustup override set 1.77 rustup component add clippy rustfmt - # - name: Check - # uses: actions-rs/cargo@v1 - # with: - # command: check - - # - name: Clippy - # uses: actions-rs/cargo@v1 - # with: - # command: clippy - # # don't fail the job until clippy is fixed - # continue-on-error: true - - name: Setup Rust Cache uses: Swatinem/rust-cache@v2 with: @@ -74,9 +62,26 @@ jobs: name: bin path: target/release/openmina + build-tests: + runs-on: ubuntu-20.04 + steps: + - name: Git checkout + uses: actions/checkout@v4 + + - name: Setup Rust + run: | + rustup install 1.77 + rustup override set 1.77 + rustup component add clippy rustfmt + + - name: Setup Rust Cache + uses: Swatinem/rust-cache@v2 + with: + prefix-key: "ver-0" + - name: Build tests run: | - mkdir target/release/tests + mkdir -p target/release/tests cargo build --release --features=scenario-generators --package=openmina-node-testing --tests cargo build --release --features=scenario-generators --package=openmina-node-testing --tests --message-format=json > cargo-build-test.json @@ -102,7 +107,7 @@ jobs: path: tests.tar p2p-tests: - needs: [ build ] + needs: [ build-tests ] runs-on: ubuntu-20.04 container: image: minaprotocol/mina-daemon:2.0.0berkeley-rc1-1551e2f-focal-berkeley @@ -131,7 +136,7 @@ jobs: ./${{ env.TEST }} --nocapture --test-threads=1 scenario-tests: - needs: [ build ] + needs: [ build-tests ] runs-on: ubuntu-20.04 container: image: minaprotocol/mina-daemon:2.0.0berkeley-rc1-1551e2f-focal-berkeley @@ -158,3 +163,56 @@ jobs: - name: Run the test run: | ./${{ matrix.test }} --nocapture --test-threads=1 + + + bootstrap-test: + needs: [ build ] + runs-on: ubuntu-20.04 + steps: + - name: Download binary + uses: actions/download-artifact@v4 + with: + name: bin + + - name: Prepare peers list + run: | + cat > peers.txt < [u8; 32] { psk_fixed.copy_from_slice(hash.as_ref()); psk_fixed } + +pub use log::ActionEvent; +pub use openmina_macros::*; diff --git a/core/src/log.rs b/core/src/log.rs index cb1db0d83..15ec29349 100644 --- a/core/src/log.rs +++ b/core/src/log.rs @@ -73,4 +73,71 @@ macro_rules! error { }; } +pub const ACTION_TRACE_TARGET: &str = "openmina_core::log::action"; + +#[macro_export] +macro_rules! action_event { + ($level:expr, $context:expr, $($tts:tt)*) => { + $crate::log::inner::event!(target: { $crate::log::ACTION_TRACE_TARGET }, $level, time = $context.time(), kind = $context.kind(), node_id = $context.node_id(), $($tts)*) + }; + ($level:expr, $context:expr) => { + $crate::log::inner::event!(target: { $crate::log::ACTION_TRACE_TARGET }, $level, time = $context.time(), kind = $context.kind(), node_id = $context.node_id()) + }; + } + +#[macro_export] +macro_rules! action_warn { + ($context:expr, $($tts:tt)*) => { + $crate::action_event!($crate::log::inner::Level::WARN, $context, $($tts)*) + }; + ($context:expr) => { + $crate::action_event!($crate::log::inner::Level::WARN, $context) + }; +} + +#[macro_export] +macro_rules! action_info { + ($context:expr, $($tts:tt)*) => { + $crate::action_event!($crate::log::inner::Level::INFO, $context, $($tts)*) + }; + ($context:expr) => { + $crate::action_event!($crate::log::inner::Level::INFO, $context) + }; +} + +#[macro_export] +macro_rules! action_debug { + ($context:expr, $($tts:tt)*) => { + $crate::action_event!($crate::log::inner::Level::DEBUG, $context, $($tts)*) + }; + ($context:expr) => { + $crate::action_event!($crate::log::inner::Level::DEBUG, $context) + }; +} + +#[macro_export] +macro_rules! action_trace { + ($context:expr, $($tts:tt)*) => { + $crate::action_event!($crate::log::inner::Level::TRACE, $context, $($tts)*) + }; + ($context:expr) => { + $crate::action_event!($crate::log::inner::Level::TRACE, $context) + }; +} + +pub trait EventContext { + fn timestamp(&self) -> redux::Timestamp; + fn time(&self) -> &'_ dyn Value; + fn node_id(&self) -> &'_ dyn Value; + fn kind(&self) -> &'_ dyn Value; +} + +pub trait ActionEvent { + fn action_event(&self, context: &T) + where + T: EventContext; +} + +use tracing::Value; + pub use crate::{debug, error, info, trace, warn}; diff --git a/core/src/snark/snark_job_commitment.rs b/core/src/snark/snark_job_commitment.rs index b071e1d34..ab02ee115 100644 --- a/core/src/snark/snark_job_commitment.rs +++ b/core/src/snark/snark_job_commitment.rs @@ -10,9 +10,7 @@ use super::SnarkJobId; #[derive(BinProtWrite, BinProtRead, Serialize, Deserialize, Debug, Clone)] pub struct SnarkJobCommitment { - /// Timestamp in milliseconds. - /// TODO(binier): have to use i64, because binprot doesn't support u64. - timestamp: i64, + timestamp: u64, pub job_id: SnarkJobId, pub fee: CurrencyFeeStableV1, pub snarker: NonZeroCurvePoint, @@ -27,7 +25,7 @@ impl SnarkJobCommitment { snarker: NonZeroCurvePoint, ) -> Self { Self { - timestamp: timestamp as i64, + timestamp, job_id, fee, snarker, diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 000000000..b3b67113e --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,29 @@ +version: '3.8' + +services: + openmina_node: + build: + context: ./ + dockerfile: Dockerfile + command: [ "node" ] + ports: + - "3000:3000" + environment: + - MINA_SNARK_WORKER_TAG=0.0.9 + networks: + - app-network + + frontend: + build: + context: ./ + dockerfile: Dockerfile_FE + args: + BUILD_CONFIGURATION: local + ports: + - "8070:80" + networks: + - app-network + +networks: + app-network: + driver: bridge \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b3b67113e..2b0e78a5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,29 +1,15 @@ version: '3.8' services: - openmina_node: - build: - context: ./ - dockerfile: Dockerfile + openmina-node: + image: openmina/openmina:${OPENMINA_TAG:-latest} command: [ "node" ] ports: - "3000:3000" environment: - MINA_SNARK_WORKER_TAG=0.0.9 - networks: - - app-network frontend: - build: - context: ./ - dockerfile: Dockerfile_FE - args: - BUILD_CONFIGURATION: local + image: openmina/frontend:${OPENMINA_FRONTEND_TAG:-latest} ports: - "8070:80" - networks: - - app-network - -networks: - app-network: - driver: bridge \ No newline at end of file diff --git a/frontend/.drone.yml b/frontend/.drone.yml index 4b1172d9f..8409395ed 100644 --- a/frontend/.drone.yml +++ b/frontend/.drone.yml @@ -17,7 +17,7 @@ steps: DOCKER_BUILDKIT: "0" commands: - COMMIT_SHORT_SHA=$(echo $DRONE_COMMIT_SHA | cut -c 1-7) - - docker build --no-cache -t directcuteo/rust-fe:$COMMIT_SHORT_SHA -f Dockerfile . + - docker build --no-cache -t openmina/frontend:$COMMIT_SHORT_SHA -f Dockerfile . volumes: - name: docker_sock path: /var/run/docker.sock @@ -28,7 +28,7 @@ steps: image: docker:latest commands: - echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin - - docker push directcuteo/rust-fe:${DRONE_COMMIT_SHA:0:7} + - docker push openmina/frontend:${DRONE_COMMIT_SHA:0:7} volumes: - name: docker_sock path: /var/run/docker.sock diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 7bbadae87..4e8593606 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -50,14 +50,15 @@ #COPY nginx.conf . #RUN cat nginx.conf - FROM node:18 AS BUILD_IMAGE +ARG BUILD_CONFIGURATION=production WORKDIR /app -COPY dist/ ./dist/ -COPY nginx.conf . -#RUN npm install -#RUN node_modules/.bin/ng build --configuration production -#RUN npm prune --production +COPY . . +RUN npm install +RUN node_modules/.bin/ng build --configuration ${BUILD_CONFIGURATION} +RUN npm prune --production +RUN [ -f nginx.${BUILD_CONFIGURATION}.conf ] && cp nginx.${BUILD_CONFIGURATION}.conf nginx.conf + FROM nginx:alpine RUN pwd RUN ls -l diff --git a/frontend/angular.json b/frontend/angular.json index 0ebb71e50..ee99e3d1e 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -81,6 +81,15 @@ } ], "outputHashing": "all" + }, + "compose": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.compose.ts" + } + ], + "outputHashing": "all" } }, "defaultConfiguration": "production" diff --git a/frontend/nginx.compose.conf b/frontend/nginx.compose.conf new file mode 100644 index 000000000..2b6e34154 --- /dev/null +++ b/frontend/nginx.compose.conf @@ -0,0 +1,47 @@ +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + + server { + location / { + root /usr/share/nginx/html; + try_files $uri $uri/ /index.html; + index index.html index.htm; + error_page 404 /usr/share/nginx/html/index.html; + } + + location /openmina-node { + rewrite_log on; + rewrite ^/openmina-node/(.*) /$1 break; + proxy_pass http://openmina-node:3000; + } + } + + include /etc/nginx/mime.types; + default_type application/octet-stream; + large_client_header_buffers 4 32k; + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + # include /etc/nginx/conf.d/*.conf; +} diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8f7bb4485..9263e3353 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -22,7 +22,7 @@ "@ngrx/effects": "^16.2.0", "@ngrx/router-store": "^16.2.0", "@ngrx/store": "^16.2.0", - "@openmina/shared": "^0.66.0", + "@openmina/shared": "^0.71.0", "d3": "^7.8.4", "eigen": "^0.2.2", "mathjs": "^12.3.0", @@ -3692,27 +3692,27 @@ } }, "node_modules/@openmina/shared": { - "version": "0.66.0", - "resolved": "https://registry.npmjs.org/@openmina/shared/-/shared-0.66.0.tgz", - "integrity": "sha512-c9JNU/qPVj9Rchcs0Hhd8Ddj5l7RZSQeK5GytQm1SN/4HxbqMOpvlSh9kZG2xK/zo/QOsvXf93IXK54w3QQGRg==", - "dependencies": { - "tslib": "^2.3.0" - }, - "peerDependencies": { - "@angular/animations": "^16.2.11", - "@angular/common": "^16.2.11", - "@angular/core": "^16.2.11", - "@angular/forms": "^16.2.11", - "@angular/material": "^16.2.10", - "@ngneat/until-destroy": "^10.0.0", - "@ngrx/effects": "^16.2.0", - "@ngrx/router-store": "^16.2.0", - "@ngrx/store": "^16.2.0", - "@ngrx/store-devtools": "^16.2.0", - "d3": "^7.8.4", - "ngx-json-viewer": "^3.2.1", - "rxjs": "~7.8.0", - "zone.js": "~0.13.0" + "version": "0.71.0", + "resolved": "https://registry.npmjs.org/@openmina/shared/-/shared-0.71.0.tgz", + "integrity": "sha512-hxpExaYDLat2wB/wldLm6z0lc7BP4rUROVcU74+b1b0e7UVq5x3LGQJFbbpiwuEuLGHKaeggMZrAF2v/jpaIjg==", + "dependencies": { + "tslib": ">=2.3.0" + }, + "peerDependencies": { + "@angular/animations": ">=16.2.11", + "@angular/common": ">=16.2.11", + "@angular/core": ">=16.2.11", + "@angular/forms": ">=16.2.11", + "@angular/material": ">=16.2.10", + "@ngneat/until-destroy": ">=10.0.0", + "@ngrx/effects": ">=16.2.0", + "@ngrx/router-store": ">=16.2.0", + "@ngrx/store": ">=16.2.0", + "@ngrx/store-devtools": ">=16.2.0", + "d3": ">=7.8.4", + "ngx-json-viewer": ">=3.2.1", + "rxjs": ">=7.8.0", + "zone.js": ">=0.13.0" } }, "node_modules/@pkgjs/parseargs": { diff --git a/frontend/package.json b/frontend/package.json index 79a7f0393..7a7bfd6ff 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,7 +10,7 @@ "watch": "ng build --watch --configuration development", "tests": "npx cypress open --config baseUrl=http://localhost:4200", "tests:headless": "npx cypress run --headless --config baseUrl=http://localhost:4200", - "docker": "npm run build:prod && docker buildx build --platform linux/amd64 -t directcuteo/rust-fe:latest . && docker push directcuteo/rust-fe:latest" + "docker": "npm run build:prod && docker buildx build --platform linux/amd64 -t openmina/frontend:latest . && docker push openmina/frontend:latest" }, "private": true, "dependencies": { @@ -28,7 +28,7 @@ "@ngrx/effects": "^16.2.0", "@ngrx/router-store": "^16.2.0", "@ngrx/store": "^16.2.0", - "@openmina/shared": "^0.66.0", + "@openmina/shared": "^0.71.0", "d3": "^7.8.4", "eigen": "^0.2.2", "mathjs": "^12.3.0", diff --git a/frontend/src/app/app.actions.ts b/frontend/src/app/app.actions.ts index 14170e082..c6cb69263 100644 --- a/frontend/src/app/app.actions.ts +++ b/frontend/src/app/app.actions.ts @@ -1,10 +1,11 @@ import { FeatureAction } from '@openmina/shared'; -import { MinaNode } from '@shared/types/core/environment/mina-env.type'; +import { FeaturesConfig, MinaNode } from '@shared/types/core/environment/mina-env.type'; enum AppActionTypes { APP_INIT = 'APP_INIT', APP_INIT_SUCCESS = 'APP_INIT_SUCCESS', APP_CHANGE_ACTIVE_NODE = 'APP_CHANGE_ACTIVE_NODE', + APP_DELETE_NODE = 'APP_DELETE_NODE', APP_ADD_NODE = 'APP_ADD_NODE', APP_CHANGE_MENU_COLLAPSING = 'APP_CHANGE_MENU_COLLAPSING', APP_CHANGE_SUB_MENUS = 'APP_CHANGE_SUB_MENUS', @@ -15,6 +16,7 @@ enum AppActionTypes { export const APP_INIT = AppActionTypes.APP_INIT; export const APP_INIT_SUCCESS = AppActionTypes.APP_INIT_SUCCESS; export const APP_CHANGE_ACTIVE_NODE = AppActionTypes.APP_CHANGE_ACTIVE_NODE; +export const APP_DELETE_NODE = AppActionTypes.APP_DELETE_NODE; export const APP_ADD_NODE = AppActionTypes.APP_ADD_NODE; export const APP_CHANGE_MENU_COLLAPSING = AppActionTypes.APP_CHANGE_MENU_COLLAPSING; export const APP_CHANGE_SUB_MENUS = AppActionTypes.APP_CHANGE_SUB_MENUS; @@ -41,10 +43,16 @@ export class AppChangeActiveNode implements AppAction { constructor(public payload: MinaNode) { } } +export class AppDeleteNode implements AppAction { + readonly type = APP_DELETE_NODE; + + constructor(public payload: MinaNode) { } +} + export class AppAddNode implements AppAction { readonly type = APP_ADD_NODE; - constructor(public payload: string) { } + constructor(public payload: MinaNode) { } } export class AppChangeMenuCollapsing implements AppAction { @@ -74,6 +82,7 @@ export type AppActions = | AppInitSuccess | AppAddNode | AppChangeActiveNode + | AppDeleteNode | AppChangeMenuCollapsing | AppChangeSubMenus | AppToggleMobile diff --git a/frontend/src/app/app.component.scss b/frontend/src/app/app.component.scss index 8fb06ed3d..89dedd166 100644 --- a/frontend/src/app/app.component.scss +++ b/frontend/src/app/app.component.scss @@ -66,10 +66,10 @@ mat-sidenav-content { $toolbar: 56px; $subMenus: 56px; height: calc(100% - #{$toolbar} - #{$subMenus}); - } - &.no-submenus { - height: calc(100% - #{$toolbar}); + &.no-submenus { + height: calc(100% - #{$toolbar}); + } } } diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 9937e7fd3..f0337190f 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -9,7 +9,7 @@ import { HorizontalMenuComponent, NgrxRouterStoreModule, OpenminaEagerSharedModule, - THEME_PROVIDER + THEME_PROVIDER, } from '@openmina/shared'; import { CommonModule, registerLocaleData } from '@angular/common'; import localeFr from '@angular/common/locales/fr'; @@ -29,6 +29,8 @@ import { EffectsModule } from '@ngrx/effects'; import { AppEffects } from '@app/app.effects'; import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { HttpClientModule } from '@angular/common/http'; +import { NewNodeComponent } from './layout/new-node/new-node.component'; +import { ReactiveFormsModule } from '@angular/forms'; registerLocaleData(localeFr, 'fr'); registerLocaleData(localeEn, 'en'); @@ -53,6 +55,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { ServerStatusComponent, SubmenuTabsComponent, NodePickerComponent, + NewNodeComponent, ], imports: [ CommonModule, @@ -75,12 +78,13 @@ export class AppGlobalErrorhandler implements ErrorHandler { MatSidenavModule, OpenminaEagerSharedModule, HorizontalMenuComponent, + ReactiveFormsModule, ], providers: [ THEME_PROVIDER, { provide: ErrorHandler, useClass: AppGlobalErrorhandler, deps: [GlobalErrorHandlerService] }, { provide: LOCALE_ID, useValue: 'en' }, ], - bootstrap: [AppComponent] + bootstrap: [AppComponent], }) export class AppModule {} diff --git a/frontend/src/app/app.reducer.ts b/frontend/src/app/app.reducer.ts index 27246516b..699dfa5b0 100644 --- a/frontend/src/app/app.reducer.ts +++ b/frontend/src/app/app.reducer.ts @@ -1,7 +1,7 @@ import { APP_ADD_NODE, APP_CHANGE_ACTIVE_NODE, - APP_CHANGE_MENU_COLLAPSING, + APP_CHANGE_MENU_COLLAPSING, APP_DELETE_NODE, APP_INIT, APP_INIT_SUCCESS, APP_TOGGLE_MENU_OPENING, @@ -10,7 +10,6 @@ import { import { AppState } from '@app/app.state'; import { MinaNode } from '@shared/types/core/environment/mina-env.type'; - const initialState: AppState = { menu: { collapsed: JSON.parse(localStorage.getItem('menu_collapsed')) || false, @@ -78,22 +77,22 @@ export function appReducer(state: AppState = initialState, action: any): AppStat } case APP_ADD_NODE: { - const newNode: MinaNode = { - features: {//todo: add this - // overview: ['nodes', 'topology'], - // explorer: ['blocks', 'transactions', 'snark-pool', 'scan-state', 'snark-traces'], - // resources: ['system'], - // network: ['messages', 'connections', 'blocks', 'blocks-ipc'], - // tracing: ['overview', 'blocks'], - // benchmarks: ['wallets'], - // 'web-node': ['wallet', 'peers', 'logs', 'state'], - }, - url: action.payload, - name: action.payload.split('/')[action.payload.split('/').length - 1] || ('custom-node' + ++state.nodes.filter(n => n.name.includes('custom-node')).length), + const customNodes = localStorage.getItem('custom_nodes') ? JSON.parse(localStorage.getItem('custom_nodes')) : []; + localStorage.setItem('custom_nodes', JSON.stringify([action.payload, ...customNodes])); + return { + ...state, + nodes: [action.payload, ...state.nodes], }; + } + + case APP_DELETE_NODE: { + const customNodes = localStorage.getItem('custom_nodes') ? JSON.parse(localStorage.getItem('custom_nodes')) : []; + localStorage.setItem('custom_nodes', JSON.stringify(customNodes.filter((node: MinaNode) => node.name !== action.payload.name))); + const nodes = state.nodes.filter(node => node.name !== action.payload.name); return { ...state, - nodes: [newNode, ...state.nodes], + nodes, + activeNode: state.activeNode?.name === action.payload.name ? nodes[0] : state.activeNode, }; } diff --git a/frontend/src/app/app.routing.ts b/frontend/src/app/app.routing.ts index 7098f2971..a0d68848a 100644 --- a/frontend/src/app/app.routing.ts +++ b/frontend/src/app/app.routing.ts @@ -11,6 +11,7 @@ export const NODES_TITLE: string = APP_TITLE + ' - Nodes'; export const STATE_TITLE: string = APP_TITLE + ' - State'; export const SNARKS_TITLE: string = APP_TITLE + ' - Snarks'; export const TESTING_TOOL_TITLE: string = APP_TITLE + ' - Testing Tool'; +export const BLOCK_PRODUCTION_TITLE: string = APP_TITLE + ' - Block Production'; const routes: Routes = [ @@ -50,6 +51,11 @@ const routes: Routes = [ loadChildren: () => import('@testing-tool/testing-tool.module').then(m => m.TestingToolModule), title: TESTING_TOOL_TITLE, }, + { + path: 'block-production', + loadChildren: () => import('./features/block-production/block-production.module').then(m => m.BlockProductionModule), + title: BLOCK_PRODUCTION_TITLE, + }, { path: '**', redirectTo: getFirstFeature(), diff --git a/frontend/src/app/app.service.ts b/frontend/src/app/app.service.ts index 7506b4afa..44e325dc4 100644 --- a/frontend/src/app/app.service.ts +++ b/frontend/src/app/app.service.ts @@ -16,6 +16,9 @@ export class AppService { } getNodes(): Observable { - return of(CONFIG.configs); + return of([ + ...CONFIG.configs, + ...(localStorage.getItem('custom_nodes') ? JSON.parse(localStorage.getItem('custom_nodes')) : []), + ]); } } diff --git a/frontend/src/app/features/block-production/block-production.component.html b/frontend/src/app/features/block-production/block-production.component.html new file mode 100644 index 000000000..0680b43f9 --- /dev/null +++ b/frontend/src/app/features/block-production/block-production.component.html @@ -0,0 +1 @@ + diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component.scss b/frontend/src/app/features/block-production/block-production.component.scss similarity index 100% rename from frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component.scss rename to frontend/src/app/features/block-production/block-production.component.scss diff --git a/frontend/src/app/features/block-production/block-production.component.ts b/frontend/src/app/features/block-production/block-production.component.ts new file mode 100644 index 000000000..a772c4879 --- /dev/null +++ b/frontend/src/app/features/block-production/block-production.component.ts @@ -0,0 +1,11 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; + +@Component({ + selector: 'mina-block-production', + templateUrl: './block-production.component.html', + styleUrls: ['./block-production.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class BlockProductionComponent { + +} diff --git a/frontend/src/app/features/block-production/block-production.module.ts b/frontend/src/app/features/block-production/block-production.module.ts new file mode 100644 index 000000000..171c80a24 --- /dev/null +++ b/frontend/src/app/features/block-production/block-production.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { BlockProductionRouting } from './block-production.routing'; +import { BlockProductionComponent } from './block-production.component'; + + +@NgModule({ + declarations: [ + BlockProductionComponent, + ], + imports: [ + CommonModule, + BlockProductionRouting, + ], +}) +export class BlockProductionModule {} diff --git a/frontend/src/app/features/block-production/block-production.routing.ts b/frontend/src/app/features/block-production/block-production.routing.ts new file mode 100644 index 000000000..52aa8ae93 --- /dev/null +++ b/frontend/src/app/features/block-production/block-production.routing.ts @@ -0,0 +1,34 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { BlockProductionComponent } from './block-production.component'; +import { BLOCK_PRODUCTION_TITLE } from '@app/app.routing'; + +const routes: Routes = [ + { + path: '', + component: BlockProductionComponent, + title: BLOCK_PRODUCTION_TITLE, + children: [ + { + path: 'overview', + loadChildren: () => import('./overview/block-production-overview.module').then(m => m.BlockProductionOverviewModule), + }, + { + path: '', + pathMatch: 'full', + redirectTo: 'overview', + }, + ], + }, + { + path: '**', + redirectTo: '', + pathMatch: 'full', + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class BlockProductionRouting {} diff --git a/frontend/src/app/features/block-production/overview/block-production-overview.component.html b/frontend/src/app/features/block-production/overview/block-production-overview.component.html new file mode 100644 index 000000000..d655972ae --- /dev/null +++ b/frontend/src/app/features/block-production/overview/block-production-overview.component.html @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-peer-details/network-node-dht-peer-details.component.scss b/frontend/src/app/features/block-production/overview/block-production-overview.component.scss similarity index 100% rename from frontend/src/app/features/network/node-dht/network-node-dht-peer-details/network-node-dht-peer-details.component.scss rename to frontend/src/app/features/block-production/overview/block-production-overview.component.scss diff --git a/frontend/src/app/features/block-production/overview/block-production-overview.component.ts b/frontend/src/app/features/block-production/overview/block-production-overview.component.ts new file mode 100644 index 000000000..c13d8ea7a --- /dev/null +++ b/frontend/src/app/features/block-production/overview/block-production-overview.component.ts @@ -0,0 +1,20 @@ +import { ChangeDetectionStrategy, Component, ElementRef, OnInit } from '@angular/core'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { + BlockProductionOverviewService, +} from '@app/features/block-production/overview/block-production-overview.service'; + +@Component({ + selector: 'mina-block-production-overview', + templateUrl: './block-production-overview.component.html', + styleUrls: ['./block-production-overview.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class BlockProductionOverviewComponent extends StoreDispatcher implements OnInit { + + constructor(protected el: ElementRef) {super();} + + ngOnInit(): void { + + } +} diff --git a/frontend/src/app/features/block-production/overview/block-production-overview.module.ts b/frontend/src/app/features/block-production/overview/block-production-overview.module.ts new file mode 100644 index 000000000..c5bcaf3eb --- /dev/null +++ b/frontend/src/app/features/block-production/overview/block-production-overview.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { BlockProductionOverviewRouting } from './block-production-overview.routing'; +import { BlockProductionOverviewComponent } from './block-production-overview.component'; +import { BlockProductionSlotsComponent } from './block-production-slots/block-production-slots.component'; +import { HorizontalResizableContainerComponent } from '@openmina/shared'; + + +@NgModule({ + declarations: [ + BlockProductionOverviewComponent, + BlockProductionSlotsComponent, + ], + imports: [ + CommonModule, + BlockProductionOverviewRouting, + HorizontalResizableContainerComponent, + ], +}) +export class BlockProductionOverviewModule {} diff --git a/frontend/src/app/features/block-production/overview/block-production-overview.routing.ts b/frontend/src/app/features/block-production/overview/block-production-overview.routing.ts new file mode 100644 index 000000000..000e1a32e --- /dev/null +++ b/frontend/src/app/features/block-production/overview/block-production-overview.routing.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { + BlockProductionOverviewComponent, +} from '@app/features/block-production/overview/block-production-overview.component'; +import { BLOCK_PRODUCTION_TITLE } from '@app/app.routing'; + +const routes: Routes = [ + { + path: '', + component: BlockProductionOverviewComponent, + title: BLOCK_PRODUCTION_TITLE, + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class BlockProductionOverviewRouting {} diff --git a/frontend/src/app/features/block-production/overview/block-production-overview.service.ts b/frontend/src/app/features/block-production/overview/block-production-overview.service.ts new file mode 100644 index 000000000..0912a287f --- /dev/null +++ b/frontend/src/app/features/block-production/overview/block-production-overview.service.ts @@ -0,0 +1,62 @@ +import { Injectable } from '@angular/core'; +import { BlockProductionModule } from '@app/features/block-production/block-production.module'; +import { Observable, of } from 'rxjs'; + +export interface BlockProductionSlot { + height: number; + time: number; + finished: boolean; + canonical: boolean; + orphaned: boolean; + missed: boolean; + missedRights: boolean; + futureRights: boolean; + active: boolean; +} + +@Injectable({ + providedIn: BlockProductionModule, +}) +export class BlockProductionOverviewService { + + constructor() { } + + getSlots(): Observable { + return of(this.generateRandomSlots()); + } + + private generateRandomSlots(): BlockProductionSlot[] { + // generate slots interval 6732–7300 + // with random values + // height is the index starting from 6732 + const slots = []; + for (let i = 6732; i < 11000; i++) { + slots.push({ + height: i, + time: Math.floor(Math.random() * 100), + finished: true, + canonical: Math.random() > 0.95, + orphaned: Math.random() > 0.95, + missed: Math.random() > 0.95, + missedRights: Math.random() > 0.99, + futureRights: false, + active: i === 10999, + }); + } + // rest push only slots where only futureRights can be true + for (let i = 10000; i < 14010; i++) { + slots.push({ + height: i, + time: Math.floor(Math.random() * 100), + finished: false, + canonical: false, + orphaned: false, + missed: false, + missedRights: false, + futureRights: Math.random() > 0.98, + active: false, + }); + } + return slots; + } +} diff --git a/frontend/src/app/features/block-production/overview/block-production-slots/block-production-slots.component.html b/frontend/src/app/features/block-production/overview/block-production-slots/block-production-slots.component.html new file mode 100644 index 000000000..b65156be6 --- /dev/null +++ b/frontend/src/app/features/block-production/overview/block-production-slots/block-production-slots.component.html @@ -0,0 +1,6 @@ +
+ + diff --git a/frontend/src/app/features/block-production/overview/block-production-slots/block-production-slots.component.scss b/frontend/src/app/features/block-production/overview/block-production-slots/block-production-slots.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/frontend/src/app/features/block-production/overview/block-production-slots/block-production-slots.component.ts b/frontend/src/app/features/block-production/overview/block-production-slots/block-production-slots.component.ts new file mode 100644 index 000000000..1f2c9d793 --- /dev/null +++ b/frontend/src/app/features/block-production/overview/block-production-slots/block-production-slots.component.ts @@ -0,0 +1,123 @@ +import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { + BlockProductionOverviewService, BlockProductionSlot, +} from '@app/features/block-production/overview/block-production-overview.service'; +import * as d3 from 'd3'; + +@Component({ + selector: 'mina-block-production-slots', + templateUrl: './block-production-slots.component.html', + styleUrls: ['./block-production-slots.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'flex-column h-100' }, +}) +export class BlockProductionSlotsComponent extends StoreDispatcher implements AfterViewInit { + @ViewChild('graph') private graph: ElementRef; + @ViewChild('tooltip') private tooltipRef: ElementRef; + private tooltip: d3.Selection; + + // Define margins as a property of the class + private margin = { top: 0, right: 0, bottom: 0, left: 0 }; + private width: number; + private height: number; + private slots: BlockProductionSlot[] = []; + + constructor(private service: BlockProductionOverviewService) { super(); } + + ngAfterViewInit(): void { + this.service.getSlots().subscribe(slots => { + this.slots = slots; + this.initSlots(); + }); + } + + private initSlots(): void { + this.width = this.graph.nativeElement.clientWidth; + this.height = this.graph.nativeElement.clientHeight; + this.tooltip = d3.select(this.tooltipRef.nativeElement); + + const svg = d3.select(this.graph.nativeElement) + .append('svg') + .attr('width', this.width + this.margin.left + this.margin.right) + .attr('height', this.height + this.margin.top + this.margin.bottom); + + const slotsGroup = svg.append('g'); + const slotWidth = 8; + const slotHeight = 8; + const slotMargin = 1; + const slotsPerRow = Math.floor(this.width / (slotWidth + slotMargin)); + const slotGroup = slotsGroup.selectAll('rect') + .data(this.slots) + .enter() + .append('rect') + .attr('width', slotWidth) + .attr('height', slotHeight) + .attr('x', (d, i) => { + return (i % slotsPerRow) * (slotWidth + slotMargin); + }) + .attr('y', (d, i) => { + const rowIndex = Math.floor(i / slotsPerRow); + return rowIndex * (slotHeight + slotMargin); + }) + + .attr('fill', d => { + const prefix = 'var(--'; + const suffix = ')'; + let color = 'base-container'; + if (d.finished) { + color = 'selected-tertiary'; + } + + if (d.canonical) { + color = 'success-primary'; + } else if (d.orphaned) { + color = 'special-selected-alt-1-primary'; + } else if (d.missedRights) { + color = 'warn-primary'; + } else if (d.futureRights) { + color = 'base-secondary'; + } else if (d.missed) { + return undefined; + } else if (!d.finished) { + color = 'base-container'; + } + + if (d.active) { + color = 'selected-primary'; + } + return `${prefix}${color}${suffix}`; + }) + // add tooltip on hover with color + .on('mouseover', (event: MouseEvent & { + target: HTMLElement + }, d: BlockProductionSlot) => this.mouseOverHandle(event, d)) + .on('mouseout', (event: MouseEvent & { + target: HTMLElement + }, d: BlockProductionSlot) => this.mouseOutHandler(event, d)); + } + + private mouseOverHandle(event: MouseEvent & { target: HTMLElement }, d: BlockProductionSlot): void { + const color = event.target.getAttribute('fill'); + const selection = this.tooltip.html(` +
+
${d.height}
+
+ `) + .style('display', 'block'); + + const nodeRect = event.target.getBoundingClientRect(); + const tooltipWidth = selection.node().getBoundingClientRect().width; + + const chartLeft = this.graph.nativeElement.getBoundingClientRect().left; + let desiredLeft = Math.min(nodeRect.left + nodeRect.width / 2 - tooltipWidth / 2, chartLeft + this.width - tooltipWidth); + desiredLeft = Math.max(desiredLeft, chartLeft); + selection + .style('left', `${desiredLeft}px`) + .style('top', `${nodeRect.bottom + window.scrollY + 12}px`); + } + + private mouseOutHandler(event: MouseEvent & { target: HTMLElement }, d: BlockProductionSlot): void { + this.tooltip.style('display', 'none'); + } +} diff --git a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.html b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.html index b886e0349..3c9edc61b 100644 --- a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.html +++ b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.html @@ -1,8 +1,6 @@
-
- Last 290 blocks -
+
Last 290 blocks
{{ syncProgress }}
diff --git a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.ts b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.ts index 1f371f34b..5ef7aaf2c 100644 --- a/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.ts +++ b/frontend/src/app/features/dashboard/dashboard-blocks-sync/dashboard-blocks-sync.component.ts @@ -62,7 +62,7 @@ export class DashboardBlocksSyncComponent extends StoreDispatcher implements OnI this.root = lastItem(blocks).height; this.rootText = this.calculateProgressTime(lastItem(blocks).applyEnd); if (blocks[0].status === NodesOverviewNodeBlockStatus.APPLIED) { - this.bestTipBlockSyncedText = SYNCED + ' ' + this.bestTipBlockSyncedText; + this.bestTipBlockSyncedText = SYNCED + ' ' + this.bestTipBlockSyncedText.slice(7); } } else { this.root = null; @@ -80,12 +80,9 @@ export class DashboardBlocksSyncComponent extends StoreDispatcher implements OnI if (!timestamp) { return 'Pending'; } - timestamp = timestamp / ONE_MILLION; - // const timestampDate = new Date(timestamp); - const timezoneOffset = 0; //timestampDate.getTimezoneOffset(); - - const millisecondsAgo = Date.now() - timestamp - timezoneOffset * 60 * 1000; - const minutesAgo = Math.floor(millisecondsAgo / 60000); + timestamp = Math.ceil(timestamp / ONE_MILLION); + const millisecondsAgo = Date.now() - timestamp; + const minutesAgo = Math.floor(millisecondsAgo / 1000 / 60); const hoursAgo = Math.floor(minutesAgo / 60); const daysAgo = Math.floor(hoursAgo / 24); diff --git a/frontend/src/app/features/dashboard/dashboard-errors/dashboard-errors.component.ts b/frontend/src/app/features/dashboard/dashboard-errors/dashboard-errors.component.ts index d52e078f9..28ece4f6e 100644 --- a/frontend/src/app/features/dashboard/dashboard-errors/dashboard-errors.component.ts +++ b/frontend/src/app/features/dashboard/dashboard-errors/dashboard-errors.component.ts @@ -1,13 +1,13 @@ -import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core'; -import {StoreDispatcher} from '@shared/base-classes/store-dispatcher.class'; -import {selectDashboardNodes} from '@dashboard/dashboard.state'; -import {NodesOverviewNode} from '@shared/types/nodes/dashboard/nodes-overview-node.type'; -import {ONE_MILLION} from '@openmina/shared'; -import {filter} from 'rxjs'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { selectDashboardNodes } from '@dashboard/dashboard.state'; +import { NodesOverviewNode } from '@shared/types/nodes/dashboard/nodes-overview-node.type'; +import { ONE_MILLION } from '@openmina/shared'; +import { filter } from 'rxjs'; import { NodesOverviewResync, NodesOverviewResyncKindType, - NodesOverviewResyncUI + NodesOverviewResyncUI, } from '@shared/types/nodes/dashboard/nodes-overview-resync.type'; const descriptionMap = { @@ -54,12 +54,9 @@ export class DashboardErrorsComponent extends StoreDispatcher implements OnInit } private calculateProgressTime(timestamp: number): string { - timestamp = timestamp / ONE_MILLION; - const timestampDate = new Date(timestamp); - const timezoneOffset = 0;// timestampDate.getTimezoneOffset(); - - const millisecondsAgo = Date.now() - timestamp - timezoneOffset * 60 * 1000; - const minutesAgo = Math.floor(millisecondsAgo / 60000); + timestamp = Math.ceil(timestamp / ONE_MILLION); + const millisecondsAgo = Date.now() - timestamp; + const minutesAgo = Math.floor(millisecondsAgo / 1000 / 60); const hoursAgo = Math.floor(minutesAgo / 60); const daysAgo = Math.floor(hoursAgo / 24); diff --git a/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.html b/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.html index 963d479dc..def4089c6 100644 --- a/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.html +++ b/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.html @@ -1,6 +1,6 @@
-
Ledgers
+
Ledgers
{{ progress }}
@@ -20,20 +20,8 @@
-
-
-
Snarked - Fetch hashes
-
{{ ledgers.stakingEpoch.snarked.fetchHashesDuration | secDuration: configMap.stakingEpoch }}
-
-
-
Snarked - Fetch accounts
-
{{ ledgers.stakingEpoch.snarked.fetchAccountsDuration | secDuration: configMap.stakingEpoch }}
-
-
+
@@ -46,64 +34,69 @@
-
-
-
- Snarked - Fetch hashes + +
+
+
+ + Snarked ledger at the root +
+
+ {{ rootSnarkedProgress | number: '1.0-0' }}%
-
{{ ledgers.nextEpoch.snarked.fetchHashesDuration | secDuration: configMap.nextEpoch }}
-
-
-
Snarked - Fetch accounts
-
{{ ledgers.nextEpoch.snarked.fetchAccountsDuration | secDuration: configMap.nextEpoch }}
+
+ [ngClass]="ledgers.rootStaged.state">
- - Ledger at the root + + Staged ledger at the root
-
- {{ rootProgress | number: '1.0-0' }}% +
+ {{ rootStagedProgress | number: '1.0-0' }}%
-
Snarked - Fetch hashes
-
{{ ledgers.root.snarked.fetchHashesDuration | secDuration: configMap.root }}
+
Fetch parts
+
{{ ledgers.rootStaged.staged.fetchPartsDuration ?? ledgers.rootStaged.staged.fetchPassedTime | secDuration: configMap.rootStaged }}
-
Snarked - Fetch accounts
-
{{ ledgers.root.snarked.fetchAccountsDuration | secDuration: configMap.root }}
-
-
-
Staged - Fetch parts
-
{{ ledgers.root.staged.fetchPartsDuration | secDuration: configMap.root }}
-
-
-
Staged - Reconstruct
-
{{ ledgers.root.staged.reconstructDuration | secDuration: configMap.root }}
+
Reconstruct
+
{{ ledgers.rootStaged.staged.reconstructDuration ?? ledgers.rootStaged.staged.reconstructPassedTime | secDuration: configMap.rootStaged }}
+ +
+
+
Fetch hashes
+
{{ snarked.fetchHashesDuration ?? snarked.fetchHashesPassedTime | secDuration: config }}
+
+
+
Fetch accounts
+
{{ snarked.fetchAccountsDuration ?? snarked.fetchAccountsPassedTime | secDuration: config }}
+
+
+ + @@ -122,14 +115,6 @@ - - - - {{ time | secDuration: configMap.stakingEpoch }} - - - -
diff --git a/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.scss b/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.scss index 1108ba107..331b09ebc 100644 --- a/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.scss +++ b/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.scss @@ -41,7 +41,6 @@ } } - .group { .steps { position: relative; diff --git a/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.ts b/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.ts index 3bda71e7c..9e405a67f 100644 --- a/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.ts +++ b/frontend/src/app/features/dashboard/dashboard-ledger/dashboard-ledger.component.ts @@ -11,11 +11,13 @@ import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { selectDashboardNodesAndRpcStats } from '@dashboard/dashboard.state'; import { NodesOverviewLedger, + NodesOverviewLedgerEpochStep, NodesOverviewLedgerStepState, + NodesOverviewRootStagedLedgerStep, } from '@shared/types/nodes/dashboard/nodes-overview-ledger.type'; import { filter } from 'rxjs'; import { NodesOverviewNode } from '@shared/types/nodes/dashboard/nodes-overview-node.type'; -import { ONE_MILLION, SecDurationConfig } from '@openmina/shared'; +import { ONE_BILLION, ONE_MILLION, ONE_THOUSAND, SecDurationConfig } from '@openmina/shared'; import { Overlay, OverlayRef } from '@angular/cdk/overlay'; import { TemplatePortal } from '@angular/cdk/portal'; import { DashboardRpcStats } from '@shared/types/dashboard/dashboard-rpc-stats.type'; @@ -23,7 +25,38 @@ import { DashboardRpcStats } from '@shared/types/dashboard/dashboard-rpc-stats.t type LedgerConfigMap = { stakingEpoch: SecDurationConfig, nextEpoch: SecDurationConfig, - root: SecDurationConfig, + rootSnarked: SecDurationConfig, + rootStaged: SecDurationConfig, +}; + +const initialSnarked: NodesOverviewLedgerEpochStep = { + state: NodesOverviewLedgerStepState.PENDING, + snarked: { + fetchHashesStart: 0, + fetchHashesEnd: 0, + fetchAccountsStart: 0, + fetchAccountsEnd: 0, + fetchHashesDuration: null, + fetchAccountsDuration: null, + fetchHashesPassedTime: null, + fetchAccountsPassedTime: null, + }, + totalTime: null, +}; + +const initialStaged: NodesOverviewRootStagedLedgerStep = { + state: NodesOverviewLedgerStepState.PENDING, + staged: { + fetchPartsStart: 0, + fetchPartsEnd: 0, + reconstructStart: 0, + reconstructEnd: 0, + fetchPartsDuration: null, + reconstructDuration: null, + fetchPassedTime: null, + reconstructPassedTime: null, + }, + totalTime: null, }; @Component({ @@ -34,61 +67,25 @@ type LedgerConfigMap = { }) export class DashboardLedgerComponent extends StoreDispatcher implements OnInit, OnDestroy { + protected readonly NodesOverviewLedgerStepState = NodesOverviewLedgerStepState; + ledgers: NodesOverviewLedger = { - stakingEpoch: { - state: NodesOverviewLedgerStepState.PENDING, - snarked: { - fetchHashesStart: 0, - fetchHashesEnd: 0, - fetchAccountsStart: 0, - fetchAccountsEnd: 0, - fetchHashesDuration: null, - fetchAccountsDuration: null, - }, - totalTime: null, - }, - nextEpoch: { - state: NodesOverviewLedgerStepState.PENDING, - snarked: { - fetchHashesStart: 0, - fetchHashesEnd: 0, - fetchAccountsStart: 0, - fetchAccountsEnd: 0, - fetchHashesDuration: null, - fetchAccountsDuration: null, - }, totalTime: null, - }, - root: { - state: NodesOverviewLedgerStepState.PENDING, - snarked: { - fetchHashesStart: 0, - fetchHashesEnd: 0, - fetchAccountsStart: 0, - fetchAccountsEnd: 0, - fetchHashesDuration: null, - fetchAccountsDuration: null, - }, - staged: { - fetchPartsStart: 0, - fetchPartsEnd: 0, - reconstructStart: 0, - reconstructEnd: 0, - fetchPartsDuration: null, - reconstructDuration: null, - }, - synced: null, - totalTime: null, - }, + stakingEpoch: initialSnarked, + nextEpoch: initialSnarked, + rootSnarked: initialSnarked, + rootStaged: initialStaged, }; progress: string; configMap: LedgerConfigMap = { stakingEpoch: this.emptyConfig, nextEpoch: this.emptyConfig, - root: this.emptyConfig, + rootSnarked: this.emptyConfig, + rootStaged: this.emptyConfig, }; stakingProgress: number = 0; nextProgress: number = 0; - rootProgress: number = 0; + rootSnarkedProgress: number = 0; + rootStagedProgress: number = 0; totalProgress: number; @ViewChild('tooltipRef') private tooltipRef: TemplateRef<{ start: number, end: number }>; @@ -113,12 +110,14 @@ export class DashboardLedgerComponent extends StoreDispatcher implements OnInit, this.configMap = { stakingEpoch: getConfig(this.ledgers.stakingEpoch.state), nextEpoch: getConfig(this.ledgers.nextEpoch.state), - root: getConfig(this.ledgers.root.state), + rootSnarked: getConfig(this.ledgers.rootSnarked.state), + rootStaged: getConfig(this.ledgers.rootStaged.state), }; this.setProgressTime(); this.stakingProgress = rpcStats.stakingLedger?.fetched / rpcStats.stakingLedger?.estimation * 100 || 0; this.nextProgress = rpcStats.nextLedger?.fetched / rpcStats.nextLedger?.estimation * 100 || 0; - this.rootProgress = rpcStats.rootLedger?.fetched / rpcStats.rootLedger?.estimation * 100 || 0; + this.rootSnarkedProgress = rpcStats.rootLedger?.fetched / rpcStats.rootLedger?.estimation * 100 || 0; + this.rootStagedProgress = this.ledgers.rootStaged.staged.fetchPartsEnd ? 50 : 0; if (this.ledgers.stakingEpoch.state === NodesOverviewLedgerStepState.SUCCESS) { this.stakingProgress = 100; @@ -126,10 +125,13 @@ export class DashboardLedgerComponent extends StoreDispatcher implements OnInit, if (this.ledgers.nextEpoch.state === NodesOverviewLedgerStepState.SUCCESS) { this.nextProgress = 100; } - if (this.ledgers.root.state === NodesOverviewLedgerStepState.SUCCESS) { - this.rootProgress = 100; + if (this.ledgers.rootSnarked.state === NodesOverviewLedgerStepState.SUCCESS) { + this.rootSnarkedProgress = 100; + } + if (this.ledgers.rootStaged.state === NodesOverviewLedgerStepState.SUCCESS) { + this.rootStagedProgress = 100; } - this.totalProgress = (this.stakingProgress + this.nextProgress + this.rootProgress) / 3; + this.totalProgress = (this.stakingProgress + this.nextProgress + this.rootSnarkedProgress + this.rootStagedProgress) / 4; this.detect(); }, filter(n => n[0].length > 0)); } @@ -193,20 +195,17 @@ export class DashboardLedgerComponent extends StoreDispatcher implements OnInit, if (!this.ledgers.stakingEpoch.snarked.fetchHashesStart) { return; } - if (this.ledgers.root.state === NodesOverviewLedgerStepState.SUCCESS) { - this.progress = this.calculateProgressTime(this.ledgers.root.synced, 'finished'); + if (this.ledgers.rootStaged.state === NodesOverviewLedgerStepState.SUCCESS) { + this.progress = this.calculateProgressTime(this.ledgers.rootStaged.staged.reconstructEnd, 'finished'); } else { this.progress = this.calculateProgressTime(this.ledgers.stakingEpoch.snarked.fetchHashesStart, 'started'); } } private calculateProgressTime(timestamp: number, action: string): string { - timestamp = timestamp / ONE_MILLION; - // const timestampDate = new Date(timestamp); - const timezoneOffset = 0;//timestampDate.getTimezoneOffset(); - - const millisecondsAgo = Date.now() - timestamp - timezoneOffset * 60 * 1000; - const minutesAgo = Math.floor(millisecondsAgo / 60000); + timestamp = Math.ceil(timestamp / ONE_MILLION); + const millisecondsAgo = Date.now() - timestamp; + const minutesAgo = Math.floor(millisecondsAgo / 1000 / 60); const hoursAgo = Math.floor(minutesAgo / 60); const daysAgo = Math.floor(hoursAgo / 24); diff --git a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.html b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.html index 27742b4ec..cc24d97e3 100644 --- a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.html +++ b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.html @@ -1,9 +1,18 @@
+ [class.success-primary]="stats.connected"> Network
+
+
Peers
+
+
+
+
+
account_tree - progress_activity + diff --git a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.scss b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.scss index 777b52a6d..818da2c61 100644 --- a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.scss +++ b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.scss @@ -1,3 +1,5 @@ +@import 'openmina'; + :host { max-width: 384px; } @@ -14,3 +16,45 @@ transform: rotate(360deg); } } + + +.progress-bar { + overflow: hidden; + height: 6px; + left: 0; + bottom: 0; + transition: width 0.6s ease-in-out; + min-width: 20px; + + .highlight { + height: 4px; + top: 1px; + left: -50px; + width: 50px; + background: radial-gradient($success-primary, $success-primary, $success-primary, $success-primary, transparent, transparent); + border-radius: 20px; + animation: move 9s linear infinite; + } + + .progress { + height: 2px; + background-color: $success-primary; + top: 2px; + left: 0; + } +} + +@keyframes move { + 0% { + left: -50px; + } + 10% { + left: -50px; + } + 80% { + left: 100%; + } + 100% { + left: 100%; + } +} diff --git a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.ts b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.ts index ff47a7e17..662790b3f 100644 --- a/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.ts +++ b/frontend/src/app/features/dashboard/dashboard-network/dashboard-network.component.ts @@ -3,6 +3,7 @@ import { DashboardPeersStats } from '@shared/types/dashboard/dashboard-peers-sta import { selectDashboardPeersStats } from '@dashboard/dashboard.state'; import { skip } from 'rxjs'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { NodesOverviewLedgerStepState } from '@shared/types/nodes/dashboard/nodes-overview-ledger.type'; @Component({ selector: 'mina-dashboard-network', @@ -29,4 +30,6 @@ export class DashboardNetworkComponent extends StoreDispatcher implements OnInit this.detect(); }, skip(1)); } + + protected readonly NodesOverviewLedgerStepState = NodesOverviewLedgerStepState; } diff --git a/frontend/src/app/features/dashboard/dashboard-transition-frontier/dashboard-transition-frontier.component.html b/frontend/src/app/features/dashboard/dashboard-transition-frontier/dashboard-transition-frontier.component.html index 413b13c8d..e08c9074a 100644 --- a/frontend/src/app/features/dashboard/dashboard-transition-frontier/dashboard-transition-frontier.component.html +++ b/frontend/src/app/features/dashboard/dashboard-transition-frontier/dashboard-transition-frontier.component.html @@ -12,6 +12,6 @@ margin - progress_activity + diff --git a/frontend/src/app/features/dashboard/dashboard-transition-frontier/dashboard-transition-frontier.component.ts b/frontend/src/app/features/dashboard/dashboard-transition-frontier/dashboard-transition-frontier.component.ts index b294274df..e81c5b406 100644 --- a/frontend/src/app/features/dashboard/dashboard-transition-frontier/dashboard-transition-frontier.component.ts +++ b/frontend/src/app/features/dashboard/dashboard-transition-frontier/dashboard-transition-frontier.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { selectDashboardNodes } from '@dashboard/dashboard.state'; -import { NodesOverviewNode } from '@shared/types/nodes/dashboard/nodes-overview-node.type'; +import { NodesOverviewNode, NodesOverviewNodeKindType } from '@shared/types/nodes/dashboard/nodes-overview-node.type'; import { filter } from 'rxjs'; @Component({ @@ -21,7 +21,7 @@ export class DashboardTransitionFrontierComponent extends StoreDispatcher implem private listenToNodesChanges(): void { this.select(selectDashboardNodes, (nodes: NodesOverviewNode[]) => { - this.loading = !nodes[0].ledgers.root.synced; + this.loading = nodes[0].kind !== NodesOverviewNodeKindType.SYNCED; this.detect(); }, filter(n => n.length > 0)); } diff --git a/frontend/src/app/features/network/bootstrap-stats/network-bootstrap-stats.effects.ts b/frontend/src/app/features/network/bootstrap-stats/network-bootstrap-stats.effects.ts index 7657e4cc5..e7e26feaf 100644 --- a/frontend/src/app/features/network/bootstrap-stats/network-bootstrap-stats.effects.ts +++ b/frontend/src/app/features/network/bootstrap-stats/network-bootstrap-stats.effects.ts @@ -2,16 +2,19 @@ import { Injectable } from '@angular/core'; import { MinaState, selectMinaState } from '@app/app.setup'; import { Actions, createEffect, ofType } from '@ngrx/effects'; import { Effect } from '@openmina/shared'; -import { filter, map, switchMap, tap } from 'rxjs'; +import { EMPTY, filter, map, switchMap, tap } from 'rxjs'; import { catchErrorAndRepeat } from '@shared/constants/store-functions'; import { MinaErrorType } from '@shared/types/error-preview/mina-error-type.enum'; import { Store } from '@ngrx/store'; import { MinaRustBaseEffect } from '@shared/base-classes/mina-rust-base.effect'; import { + NETWORK_BOOTSTRAP_STATS_CLOSE, NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS, NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS_SUCCESS, NETWORK_BOOTSTRAP_STATS_INIT, NetworkBootstrapStatsActions, + NetworkBootstrapStatsClose, + NetworkBootstrapStatsGetBootstrapStats, } from '@network/bootstrap-stats/network-bootstrap-stats.actions'; import { NetworkBootstrapStatsService } from '@network/bootstrap-stats/network-bootstrap-stats.service'; import { @@ -39,17 +42,23 @@ export class NetworkBootstrapStatsEffects extends MinaRustBaseEffect this.actions$.pipe( - ofType(NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS), - filter(() => !this.pendingRequest), - tap(() => this.pendingRequest = true), - switchMap(() => this.service.getDhtBootstrapStats()), + ofType(NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS, NETWORK_BOOTSTRAP_STATS_CLOSE), + this.latestActionState(), + filter(({ action }) => action.type === NETWORK_BOOTSTRAP_STATS_CLOSE || !this.pendingRequest), + tap(({ action }) => { + this.pendingRequest = action.type === NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS; + }), + switchMap(({ action }) => + action.type === NETWORK_BOOTSTRAP_STATS_CLOSE + ? EMPTY + : this.service.getDhtBootstrapStats(), + ), map((payload: NetworkBootstrapStatsRequest[]) => ({ type: NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS_SUCCESS, payload, })), tap(() => this.pendingRequest = false), - //todo: review catch error payload - catchErrorAndRepeat(MinaErrorType.RUST, NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS_SUCCESS, {}), + catchErrorAndRepeat(MinaErrorType.RUST, NETWORK_BOOTSTRAP_STATS_GET_BOOTSTRAP_STATS_SUCCESS, []), )); } diff --git a/frontend/src/app/features/network/bootstrap-stats/network-bootstrap-stats.service.ts b/frontend/src/app/features/network/bootstrap-stats/network-bootstrap-stats.service.ts index a731e33bb..fcc031e8e 100644 --- a/frontend/src/app/features/network/bootstrap-stats/network-bootstrap-stats.service.ts +++ b/frontend/src/app/features/network/bootstrap-stats/network-bootstrap-stats.service.ts @@ -5,7 +5,7 @@ import { NetworkBootstrapPeerType, NetworkBootstrapStatsRequest, } from '@shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type'; -import { ONE_MILLION } from '@openmina/shared'; +import { ONE_BILLION } from '@openmina/shared'; @Injectable({ providedIn: 'root', @@ -21,12 +21,13 @@ export class NetworkBootstrapStatsService { } private mapBootstrapStats(response: BootstrapStatsResponse): NetworkBootstrapStatsRequest[] { + console.log(response.requests[0].finish, response.requests[0].start); return response.requests.map((request: BootstrapStatsRequest) => ({ type: request.type, address: request.address, start: request.start, finish: request.finish, - duration: request.finish ? (request.finish - request.start) / ONE_MILLION : undefined, + durationInSecs: request.finish ? Math.ceil((request.finish - request.start) / ONE_BILLION) : undefined, peerId: request.peer_id, error: request.error, existingPeers: request.closest_peers?.filter(([, type]: [string, NetworkBootstrapPeerType]) => type === NetworkBootstrapPeerType.EXISTING).length || 0, diff --git a/frontend/src/app/features/network/bootstrap-stats/side-panel/network-bootstrap-stats-side-panel.component.html b/frontend/src/app/features/network/bootstrap-stats/side-panel/network-bootstrap-stats-side-panel.component.html index 38c019204..27593a824 100644 --- a/frontend/src/app/features/network/bootstrap-stats/side-panel/network-bootstrap-stats-side-panel.component.html +++ b/frontend/src/app/features/network/bootstrap-stats/side-panel/network-bootstrap-stats-side-panel.component.html @@ -4,41 +4,55 @@ (click)="closeSidePanel()">close
-
-
- - -
+
- - -
-
- +
+ + +
+
+ + +
+
+
+ +
+
{{ peer[1] }}
+
+
+ No peers found +
-
{{ peer[1] }}
-
-
- No peers found -
- - -
- - - - -
-
- -
+ + +
+ + + + +
+
+ +
+ - +
+
+
+
diff --git a/frontend/src/app/features/network/bootstrap-stats/side-panel/network-bootstrap-stats-side-panel.component.ts b/frontend/src/app/features/network/bootstrap-stats/side-panel/network-bootstrap-stats-side-panel.component.ts index 52b6ecac4..a03625288 100644 --- a/frontend/src/app/features/network/bootstrap-stats/side-panel/network-bootstrap-stats-side-panel.component.ts +++ b/frontend/src/app/features/network/bootstrap-stats/side-panel/network-bootstrap-stats-side-panel.component.ts @@ -1,13 +1,6 @@ import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; -import { NetworkNodeDhtPeer } from '@shared/types/network/node-dht/network-node-dht.type'; -import { - selectNetworkNodeDhtActiveBootstrapRequest, - selectNetworkNodeDhtActivePeer, -} from '@network/node-dht/network-node-dht.state'; -import { NetworkNodeDhtSetActivePeer, NetworkNodeDhtToggleSidePanel } from '@network/node-dht/network-node-dht.actions'; -import { ExpandTracking, MinaJsonViewerComponent, downloadJson } from '@openmina/shared'; -import { delay, mergeMap, of } from 'rxjs'; +import { downloadJson, ExpandTracking, MinaJsonViewerComponent } from '@openmina/shared'; import { NetworkBootstrapStatsRequest, } from '@shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type'; @@ -19,6 +12,8 @@ import { } from '@network/bootstrap-stats/network-bootstrap-stats.actions'; import { Routes } from '@shared/enums/routes.enum'; import { Router } from '@angular/router'; +import { selectActiveNode } from '@app/app.state'; +import { isSubFeatureEnabled } from '@shared/constants/config'; @Component({ selector: 'mina-network-bootstrap-stats-side-panel', @@ -33,6 +28,7 @@ export class NetworkBootstrapStatsSidePanelComponent extends StoreDispatcher imp expandingTracking: ExpandTracking = {}; jsonString: string; activeTab: number = 1; + hasNodeDhtEnabled: boolean; @ViewChild(MinaJsonViewerComponent) private minaJsonViewer: MinaJsonViewerComponent; @@ -40,9 +36,10 @@ export class NetworkBootstrapStatsSidePanelComponent extends StoreDispatcher imp ngOnInit(): void { this.listenToActiveNode(); + this.listenToActiveRequest(); } - private listenToActiveNode(): void { + private listenToActiveRequest(): void { this.select(selectNetworkBootstrapStatsActiveBootstrapRequest, (request: NetworkBootstrapStatsRequest) => { this.request = { ...request }; if (!this.request.error) { @@ -50,13 +47,19 @@ export class NetworkBootstrapStatsSidePanelComponent extends StoreDispatcher imp } if (!this.request.finish) { delete this.request.finish; - delete this.request.duration; + delete this.request.durationInSecs; } this.jsonString = JSON.stringify(request); this.detect(); }); } + private listenToActiveNode(): void { + this.select(selectActiveNode, (node) => { + this.hasNodeDhtEnabled = isSubFeatureEnabled(node, 'network', 'bootstrap-stats'); + }); + } + downloadJson(): void { downloadJson(this.jsonString, 'bootstrap-request.json'); } @@ -77,4 +80,8 @@ export class NetworkBootstrapStatsSidePanelComponent extends StoreDispatcher imp selectTab(number: number): void { this.activeTab = number; } + + goToNodeDht(): void { + this.router.navigate([Routes.NETWORK, Routes.NODE_DHT, this.request.peerId], { queryParamsHandling: 'merge' }); + } } diff --git a/frontend/src/app/features/network/bootstrap-stats/table/network-bootstrap-stats-table.component.html b/frontend/src/app/features/network/bootstrap-stats/table/network-bootstrap-stats-table.component.html index 87d0a94f9..0a7eac9ce 100644 --- a/frontend/src/app/features/network/bootstrap-stats/table/network-bootstrap-stats-table.component.html +++ b/frontend/src/app/features/network/bootstrap-stats/table/network-bootstrap-stats-table.component.html @@ -1,7 +1,7 @@ - {{ row.start | readableDate }} + {{ row.finish | readableDate }} {{ row.type }}{{ row.error ? (' - ' + row.error) : '' }} - {{ row.duration | secDuration: config }} + {{ row.durationInSecs | secDuration: config }} diff --git a/frontend/src/app/features/network/bootstrap-stats/table/network-bootstrap-stats-table.component.ts b/frontend/src/app/features/network/bootstrap-stats/table/network-bootstrap-stats-table.component.ts index d90e37a9b..c156102f8 100644 --- a/frontend/src/app/features/network/bootstrap-stats/table/network-bootstrap-stats-table.component.ts +++ b/frontend/src/app/features/network/bootstrap-stats/table/network-bootstrap-stats-table.component.ts @@ -14,10 +14,8 @@ import { NetworkBootstrapStatsSetActiveBootstrapRequest, NetworkBootstrapStatsSort, } from '@network/bootstrap-stats/network-bootstrap-stats.actions'; -import { NodesOverviewSetActiveNode } from '@nodes/overview/nodes-overview.actions'; import { Routes } from '@shared/enums/routes.enum'; import { Router } from '@angular/router'; -import { DashboardPeerStatus } from '@shared/types/dashboard/dashboard.peer'; @Component({ selector: 'mina-network-bootstrap-stats-table', @@ -34,9 +32,9 @@ export class NetworkBootstrapStatsTableComponent extends MinaTableRustWrapper = [ - { name: 'datetime', sort: 'start' }, + { name: 'datetime', sort: 'finish' }, { name: 'result', sort: 'type' }, - { name: 'duration' }, + { name: 'duration', sort: 'durationInSecs' }, { name: 'peerId' }, { name: 'address' }, { name: 'existing peers', sort: 'existingPeers' }, @@ -103,6 +101,4 @@ export class NetworkBootstrapStatsTableComponent extends MinaTableRustWrapper peer.binaryDistance.length) { return; } @@ -38,33 +37,33 @@ export class EqualDistanceAlgorithm { peer.binaryDistance[level - 1] === '1' && parentOfNode.children[0] && parentOfNode.children[0].children.length === 0 - && parentOfNode.children[0].binaryDistance !== '-' + && parentOfNode.children[0].peer.binaryDistance !== '-' && node.children.length === 0 - && parentOfNode.children[0].binaryDistance.slice(0, level - 1) === peer.binaryDistance.slice(0, level - 1) + && parentOfNode.children[0].peer.binaryDistance.slice(0, level - 1) === peer.binaryDistance.slice(0, level - 1) && this.peers.slice(this.peers.indexOf(peer) + 1).every(p => p.binaryDistance.slice(0, level - 1) !== peer.binaryDistance.slice(0, level - 1)) ) { - node.binaryDistance = peer.binaryDistance; + node.peer = peer; node.children = []; node.id = this.id++; node.prevBranch = parentOfNode.children.indexOf(node) as 0 | 1; return; } node.children[direction] = { - binaryDistance: peer.binaryDistance, + peer, children: [], id: this.id++, prevBranch: direction, }; node.children[1 - direction] = node.children[1 - direction] || { - binaryDistance: '-', + peer: { binaryDistance: '-' } as NetworkNodeDhtPeer, children: [], id: this.id++, prevBranch: 1 - direction as 0 | 1, }; - } else if (node.children[direction].binaryDistance !== '-') { - const existingNodePeer = this.peers.find(p => p.binaryDistance === node.children[direction].binaryDistance); + } else if (node.children[direction].peer.binaryDistance !== '-') { + const existingNodePeer = this.peers.find(p => p.binaryDistance === node.children[direction].peer.binaryDistance); node.children[direction] = { - binaryDistance: '-', + peer: { binaryDistance: '-' } as NetworkNodeDhtPeer, children: [], id: this.id++, prevBranch: direction as 0 | 1, @@ -81,12 +80,12 @@ export class EqualDistanceAlgorithm { * it's sibling is binaryDistance: '-' and its parent's binaryDistance is '-' then * we set the parent's binaryDistance to the node's binaryDistance and remove all children underneath it */ - private static cleanUpTree(node: TreeNode): TreeNode { + private static cleanUpTree(node: DhtGraphNode): DhtGraphNode { if (node.children.length === 0) { return node; } - if (node.children[0].binaryDistance === '-' && node.children[1].binaryDistance !== '-') { - node.binaryDistance = node.children[1].binaryDistance; + if (node.children[0].peer.binaryDistance === '-' && node.children[1].peer.binaryDistance !== '-') { + node.peer = node.children[1].peer; node.children = []; return node; } @@ -95,7 +94,7 @@ export class EqualDistanceAlgorithm { return node; } - private static findMaxDistance(node: TreeNode, distance: number): void { + private static findMaxDistance(node: DhtGraphNode, distance: number): void { if (node.children.length === 0) { this.maxDistance = Math.max(this.maxDistance, distance); return; @@ -110,22 +109,22 @@ export class EqualDistanceAlgorithm { * * @private */ - private static makeEqualDistancesForAllNodes(node: TreeNode, parentNode: TreeNode, distance: number): void { + private static makeEqualDistancesForAllNodes(node: DhtGraphNode, parentNode: DhtGraphNode, distance: number): void { if (distance === this.maxDistance) { return; } if (distance < this.maxDistance) { if (node.children.length === 0) { // check the next digit in the binary distance based on current distance - if (node.binaryDistance[distance] === '0') { - node.children[0] = { binaryDistance: node.binaryDistance, children: [], prevBranch: 0 }; + if (node.peer.binaryDistance[distance] === '0') { + node.children[0] = { peer: node.peer, children: [], prevBranch: 0 }; // node.children[1] = { binaryDistance: '-', children: [] }; - node.binaryDistance = '-'; - } else if (node.binaryDistance[distance] === '1') { + node.peer = { binaryDistance: '-' } as NetworkNodeDhtPeer; + } else if (node.peer.binaryDistance[distance] === '1') { // node.children[0] = { binaryDistance: '-', children: [] }; - node.children[0] = { binaryDistance: node.binaryDistance, children: [], prevBranch: 1 }; - node.binaryDistance = '-'; - } else if (node.binaryDistance === '-') { + node.children[0] = { peer: node.peer, children: [], prevBranch: 1 }; + node.peer = { binaryDistance: '-' } as NetworkNodeDhtPeer; + } else if (node.peer.binaryDistance === '-') { // parentNode.children = parentNode.children.filter(n => n !== node); // node.binaryDistance = null; return; @@ -144,11 +143,11 @@ export class EqualDistanceAlgorithm { } } - private static removeEmptyNodes(node: TreeNode, parentNode: TreeNode): void { + private static removeEmptyNodes(node: DhtGraphNode, parentNode: DhtGraphNode): void { if (!node) { return; } - if (node.children.length === 0 && node.binaryDistance === '-') { + if (node.children.length === 0 && node.peer.binaryDistance === '-') { const index = parentNode.children.indexOf(node); if (index !== -1) { parentNode.children.splice(index, 1); diff --git a/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/minimum-distance-algorithm.ts b/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/minimum-distance-algorithm.ts index 25fe8ea2d..351ee1b88 100644 --- a/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/minimum-distance-algorithm.ts +++ b/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/minimum-distance-algorithm.ts @@ -1,15 +1,15 @@ import { NetworkNodeDhtPeer } from '@shared/types/network/node-dht/network-node-dht.type'; -import { TreeNode } from '@network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component'; +import { DhtGraphNode } from '@network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component'; export class MinimumDistanceAlgorithm { static peers: NetworkNodeDhtPeer[]; - static createBinaryTree(peers: NetworkNodeDhtPeer[]): TreeNode { + static createBinaryTree(peers: NetworkNodeDhtPeer[]): DhtGraphNode { if (peers.length === 0) { return null; } - const root: TreeNode = { - binaryDistance: peers[0].binaryDistance, + const root: DhtGraphNode = { + peer: peers[0], children: [], }; for (let i = 1; i < peers.length; i++) { @@ -18,7 +18,7 @@ export class MinimumDistanceAlgorithm { return this.cleanUpTree(root); } - private static insertPeer(node: TreeNode, peer: NetworkNodeDhtPeer, parentOfNode: TreeNode, level: number = 0): void { + private static insertPeer(node: DhtGraphNode, peer: NetworkNodeDhtPeer, parentOfNode: DhtGraphNode, level: number = 0): void { if (level > peer.binaryDistance.length) { return; } @@ -29,24 +29,24 @@ export class MinimumDistanceAlgorithm { peer.binaryDistance[level - 1] === '1' && parentOfNode.children[0] && parentOfNode.children[0].children.length === 0 - && parentOfNode.children[0].binaryDistance !== '-' + && parentOfNode.children[0].peer.binaryDistance !== '-' && node.children.length === 0 - && parentOfNode.children[0].binaryDistance.slice(0, level - 1) === peer.binaryDistance.slice(0, level - 1) + && parentOfNode.children[0].peer.binaryDistance.slice(0, level - 1) === peer.binaryDistance.slice(0, level - 1) && this.peers.slice(this.peers.indexOf(peer) + 1).every(p => p.binaryDistance.slice(0, level - 1) !== peer.binaryDistance.slice(0, level - 1)) ) { - node.binaryDistance = peer.binaryDistance; + node.peer = peer; node.children = []; return; } - node.children[direction] = { binaryDistance: peer.binaryDistance, children: [] }; + node.children[direction] = { peer, children: [] }; node.children[1 - direction] = node.children[1 - direction] || { - binaryDistance: '-', + peer: { binaryDistance: '-' } as NetworkNodeDhtPeer, children: [], }; - } else if (node.children[direction].binaryDistance !== '-') { - const existingNodePeer = this.peers.find(p => p.binaryDistance === node.children[direction].binaryDistance); + } else if (node.children[direction].peer.binaryDistance !== '-') { + const existingNodePeer = this.peers.find(p => p.binaryDistance === node.children[direction].peer.binaryDistance); node.children[direction] = { - binaryDistance: '-', + peer: { binaryDistance: '-' } as NetworkNodeDhtPeer, children: [], }; this.insertPeer(node.children[direction], existingNodePeer, node, level + 1); @@ -61,12 +61,12 @@ export class MinimumDistanceAlgorithm { * it's sibling is binaryDistance: '-' and its parent's binaryDistance is '-' then * we set the parent's binaryDistance to the node's binaryDistance and remove all children underneath it */ - private static cleanUpTree(node: TreeNode): TreeNode { + private static cleanUpTree(node: DhtGraphNode): DhtGraphNode { if (node.children.length === 0) { return node; } - if (node.children[0].binaryDistance === '-' && node.children[1].binaryDistance !== '-') { - node.binaryDistance = node.children[1].binaryDistance; + if (node.children[0].peer.binaryDistance === '-' && node.children[1].peer.binaryDistance !== '-') { + node.peer = node.children[1].peer; node.children = []; return node; } diff --git a/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.html b/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.html index 88393d5ea..7c155463c 100644 --- a/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.html +++ b/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.html @@ -1,2 +1,2 @@ -
diff --git a/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.scss b/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.scss index e69de29bb..230f876bd 100644 --- a/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.scss +++ b/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.scss @@ -0,0 +1,4 @@ +:host ::ng-deep .node circle { + stroke-width: 2px; + cursor: pointer; +} diff --git a/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.ts b/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.ts index e3805fa48..849b1189c 100644 --- a/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.ts +++ b/frontend/src/app/features/network/dht-graph/network-dht-graph-binary-tree/network-dht-graph-binary-tree.component.ts @@ -3,58 +3,19 @@ import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, ViewChil import * as d3 from 'd3'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { NetworkNodeDhtService } from '@network/node-dht/network-node-dht.service'; -import { NetworkNodeDhtPeer } from '@shared/types/network/node-dht/network-node-dht.type'; +import { + NetworkNodeDhtPeer, + NetworkNodeDhtPeerConnectionType, +} from '@shared/types/network/node-dht/network-node-dht.type'; import { EqualDistanceAlgorithm } from '@network/dht-graph/network-dht-graph-binary-tree/equal-distance-algorithm'; -import { MinimumDistanceAlgorithm } from '@network/dht-graph/network-dht-graph-binary-tree/minimum-distance-algorithm'; -export type TreeNode = { - binaryDistance: string; - children: TreeNode[]; +export type DhtGraphNode = { + peer: NetworkNodeDhtPeer; + children: DhtGraphNode[]; prevBranch?: 0 | 1; id?: number; }; -const binaryTree: TreeNode = { - binaryDistance: 1, - children: [ - { - binaryDistance: 2, - children: [ - { - binaryDistance: 4, - children: [], - }, - { - binaryDistance: 5, - children: [], - }, - ], - }, - { - binaryDistance: 3, - children: [ - { - binaryDistance: 6, - children: [], - }, - { - binaryDistance: 7, - children: [], - }, - ], - }, - ], -}; - -// class TreeNode2 { -// peer: NetworkNodeDhtPeer; -// children: TreeNode2[] = []; -// -// constructor(peer: NetworkNodeDhtPeer) { -// this.peer = { binaryDistance: peer.binaryDistance }; -// } -// } - @Component({ selector: 'mina-network-dht-graph-binary-tree', templateUrl: './network-dht-graph-binary-tree.component.html', @@ -66,13 +27,14 @@ export class NetworkDhtGraphBinaryTreeComponent extends StoreDispatcher implemen @ViewChild('graph') private graph: ElementRef; // Define margins as a property of the class - private margin = { top: 150, right: 20, bottom: 20, left: 20 }; + private margin = { top: 0, right: 0, bottom: 0, left: 0 }; private width: number; private height: number; private data = null; - private nodeWidth = 60; - private nodeHeight = 30; + private nodeWidth = 25; + private nodeHeight = 25; + private radius = 8; private peers: NetworkNodeDhtPeer[] = []; constructor(private nodeDhtService: NetworkNodeDhtService) { super(); } @@ -114,16 +76,23 @@ export class NetworkDhtGraphBinaryTreeComponent extends StoreDispatcher implemen .attr('width', this.width + this.margin.left + this.margin.right) .attr('height', this.height + this.margin.top + this.margin.bottom); - const linksG = svg.append('g') - .attr('class', 'links') - .attr('transform', `translate(${this.margin.left + (this.width / 2)},${this.margin.top})`); - const nodesG = svg.append('g') - .attr('class', 'nodes') - .attr('transform', `translate(${this.margin.left + (this.width / 2)},${this.margin.top})`); + const svgG = svg.append('g'); + + const zoom = d3.zoom() + .scaleExtent([0.1, 10]) + .on('zoom', (ev) => svgG.attr('transform', ev.transform)); + svgG.call(zoom); + + const linksG = svgG.append('g') + .attr('class', 'links'); + // .attr('transform', `translate(${this.margin.left + (this.width / 2)},${this.margin.top})`); + const nodesG = svgG.append('g') + .attr('class', 'nodes'); + // .attr('transform', `translate(${this.margin.left + (this.width / 2)},${this.margin.top})`); const node = nodesG.selectAll('.node') .data(root.descendants() - .filter(d => d.data.binaryDistance !== '-'), + .filter(d => d.data.peer.binaryDistance !== '-'), ) .enter() .append('g') @@ -150,14 +119,58 @@ export class NetworkDhtGraphBinaryTreeComponent extends StoreDispatcher implemen .attr('class', 'link') .attr('fill', 'none') .attr('stroke', 'var(--base-tertiary)') - .attr('d', d => d3.line() - .x(d => d.x) - .y(d => d.y)([d.source, d.target])); + .attr('stroke-dasharray', d => d.source.x === d.target.x ? '5,5' : undefined) + .attr('d', d => { + const source = d.source; + const target = d.target; + + // Calculate the intersection points between the circle and the line connecting source and target + const dx = target.x - source.x; + const dy = target.y - source.y; + const dr = Math.sqrt(dx * dx + dy * dy); + + let offsetX = 0; + let offsetY = 0; + let sourceX = source.x; + let sourceY = source.y; + let targetX = target.x; + let targetY = target.y; + + // If the source or target is a leaf node, we need to move the line to the edge of the circle + if (d.source.data.peer.binaryDistance !== '-') { + offsetX = (dx / dr) * 8; + offsetY = (dy / dr) * 8; + sourceX = source.x + offsetX; + sourceY = source.y + offsetY; + } else if (d.target.data.peer.binaryDistance !== '-') { + offsetX = (dx / dr) * 8; + offsetY = (dy / dr) * 8; + targetX = target.x - offsetX; + targetY = target.y - offsetY; + } + + return `M${sourceX},${sourceY}L${targetX},${targetY}`; + }); node.append('circle') - .attr('fill', 'var(--base-surface)') - .attr('stroke', 'var(--base-tertiary)') - .attr('r', 16); + .attr('fill', (d) => { + if (this.isOrigin(d)) { + return 'var(--base-surface)'; + } + switch (d.data.peer.connection) { + case NetworkNodeDhtPeerConnectionType.Connected: + return 'var(--success-primary)'; + case NetworkNodeDhtPeerConnectionType.CanConnect: + case NetworkNodeDhtPeerConnectionType.NotConnected: + return 'var(--base-tertiary)'; + case NetworkNodeDhtPeerConnectionType.CannotConnect: + return 'var(--warn-primary)'; + default: + return 'var(--base-secondary)'; + } + }) + .attr('stroke', d => this.isOrigin(d) ? 'var(--special-selected-alt-1-primary)' : undefined) + .attr('r', this.radius); // node.append('text') // .attr('dy', '.35em') @@ -182,15 +195,13 @@ export class NetworkDhtGraphBinaryTreeComponent extends StoreDispatcher implemen // Add numbers above the horizontal lines to indicate left (0) or right (1) side const linkText = linksG.selectAll('.link-text') - .data(root.descendants().slice(1)) + .data(root.descendants().slice(1).filter(d => d.x !== d.parent.x)) .enter() .append('text') .attr('class', 'link-text') - .attr('fill', 'var(--base-primary)') + .attr('fill', 'var(--base-tertiary)') .attr('font-size', '10px') .attr('text-anchor', 'middle') - // .attr('x', d => (d.x + d.parent.x) / 2) - // .attr('y', d => d.y - this.nodeHeight - 7) .attr('x', d => { if (d.x === d.parent.x) { return d.data.prevBranch === 0 ? d.x - 10 : d.x + 10; @@ -205,15 +216,25 @@ export class NetworkDhtGraphBinaryTreeComponent extends StoreDispatcher implemen }) .text(d => d.data.prevBranch); - const zoom = d3.zoom() - .scaleExtent([0.1, 10]) - .on('zoom', (ev) => svg.attr('transform', ev.transform)); - // svg.call(zoom); - - //center the tree as it is not fully balanced left-right - // const treeWidth = linksG.node().getBBox().width; - // const svgWidth = this.width + this.margin.left + this.margin.right; - // nodesG.attr('transform', `translate(${(svgWidth - treeWidth) / 2},${this.margin.top})`); - // linksG.attr('transform', `translate(${(svgWidth - treeWidth) / 2},${this.margin.top})`); + const bounds = nodesG.node().getBBox(); + const { width, height } = bounds; + + const scale = Math.min( + (this.width) / (width), + (this.height) / (height), + ); + + const translateX = ((this.width - width * scale) / 2) + width / 2 * scale; + const translateY = (this.height - height * scale) / 2; + + svgG.call( + zoom.transform, + d3.zoomIdentity.translate(translateX, translateY).scale(scale * 0.9), + ); + + } + + private isOrigin(d): boolean { + return d.data.peer.key === this.peers[0].key; } } diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component.html b/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component.html deleted file mode 100644 index bf78720f5..000000000 --- a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component.html +++ /dev/null @@ -1,12 +0,0 @@ - -
- - - - -
-
- -
- diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component.ts b/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component.ts deleted file mode 100644 index ae4c78496..000000000 --- a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core'; -import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; -import { downloadJson, ExpandTracking, MinaJsonViewerComponent } from '@openmina/shared'; -import { selectNetworkNodeDhtActiveBootstrapRequest } from '@network/node-dht/network-node-dht.state'; -import { delay, mergeMap, of } from 'rxjs'; - -@Component({ - selector: 'mina-network-node-dht-bootstrap-details', - templateUrl: './network-node-dht-bootstrap-details.component.html', - styleUrls: ['./network-node-dht-bootstrap-details.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class NetworkNodeDhtBootstrapDetailsComponent extends StoreDispatcher implements OnInit { - - request: any; - expandingTracking: ExpandTracking = {}; - jsonString: string; - - @ViewChild(MinaJsonViewerComponent) private minaJsonViewer: MinaJsonViewerComponent; - - ngOnInit(): void { - this.listenToActiveNode(); - } - - private listenToActiveNode(): void { - this.select(selectNetworkNodeDhtActiveBootstrapRequest, (request: any) => { - this.request = request; - this.jsonString = JSON.stringify(request); - this.detect(); - }, mergeMap((request: any) => of(request).pipe(delay(request ? 0 : 300)))); - } - - downloadJson(): void { - downloadJson(this.jsonString, 'bootstrap-request.json'); - } - - expandEntireJSON(): void { - this.expandingTracking = this.minaJsonViewer.toggleAll(true); - } - - collapseEntireJSON(): void { - this.expandingTracking = this.minaJsonViewer.toggleAll(false); - } -} diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.html b/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.html deleted file mode 100644 index 652675ff4..000000000 --- a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
- -
{{ request.type }}
-
-
- chevron_right -
-
- - - - - -
- error -
- - - progress_activity - - -
- task_alt -
- - - diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.scss b/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.scss deleted file mode 100644 index 502ddc5a0..000000000 --- a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.scss +++ /dev/null @@ -1,14 +0,0 @@ - -.loading-icon { - animation: spin 2s linear infinite; -} - -@keyframes spin { - 0% { - transform: rotate(0); - } - 100% { - transform: rotate(360deg); - } -} - diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.ts b/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.ts deleted file mode 100644 index 185991c6a..000000000 --- a/frontend/src/app/features/network/node-dht/network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; -import { selectNetworkNodeDhtBootstrapStats } from '@network/node-dht/network-node-dht.state'; -import { NetworkNodeDhtSetActiveBootstrapRequest } from '@network/node-dht/network-node-dht.actions'; -import { - NetworkBootstrapStatsRequest, -} from '@shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type'; - -@Component({ - selector: 'mina-network-node-dht-bootstrap-stats', - templateUrl: './network-node-dht-bootstrap-stats.component.html', - styleUrls: ['./network-node-dht-bootstrap-stats.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class NetworkNodeDhtBootstrapStatsComponent extends StoreDispatcher implements OnInit { - - bootstrapStats: NetworkBootstrapStatsRequest[] = []; - - readonly trackStats = (_: number, stat: NetworkBootstrapStatsRequest) => stat.type; - - ngOnInit(): void { - this.listenToBootstrapStats(); - } - - private listenToBootstrapStats(): void { - this.select(selectNetworkNodeDhtBootstrapStats, (stats: NetworkBootstrapStatsRequest[]) => { - this.bootstrapStats = stats; - this.detect(); - }); - } - - setActiveBootstrapRequest(request: any): void { - this.dispatch(NetworkNodeDhtSetActiveBootstrapRequest, request); - } -} diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-line/network-node-dht-line.component.html b/frontend/src/app/features/network/node-dht/network-node-dht-line/network-node-dht-line.component.html index b46575e6c..2e98386e8 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht-line/network-node-dht-line.component.html +++ b/frontend/src/app/features/network/node-dht/network-node-dht-line/network-node-dht-line.component.html @@ -1,4 +1,4 @@ -
+
{{ points.length }} Peers in {{ bucketPoints.length }} Buckets
Bucket {{ i }}
Peers
{{ buckets[i].peers }}
-
Max. Capacity 20
+
Max. Capacity 20
@@ -23,12 +23,4 @@ [class.origin]="point.isOrigin" [style.left.px]="point.left">
- - - -
diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-line/network-node-dht-line.component.ts b/frontend/src/app/features/network/node-dht/network-node-dht-line/network-node-dht-line.component.ts index aeff65aa8..2b8d975e9 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht-line/network-node-dht-line.component.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht-line/network-node-dht-line.component.ts @@ -4,8 +4,8 @@ import { selectNetworkNodeDhtActivePeer, selectNetworkNodeDhtKeyPeersBucketsOpenSidePanel, } from '@network/node-dht/network-node-dht.state'; -import { debounceTime, filter, fromEvent, skip, tap } from 'rxjs'; -import { NetworkNodeDhtSetActivePeer, NetworkNodeDhtToggleSidePanel } from '@network/node-dht/network-node-dht.actions'; +import { filter, fromEvent, skip, tap } from 'rxjs'; +import { NetworkNodeDhtSetActivePeer } from '@network/node-dht/network-node-dht.actions'; import { NetworkNodeDhtBucket } from '@shared/types/network/node-dht/network-node-dht-bucket.type'; import { NetworkNodeDhtPeer, @@ -36,8 +36,8 @@ export class NetworkNodeDhtLineComponent extends StoreDispatcher implements Afte points: DhtPoint[] = []; bucketPoints: DhtPoint[] = []; openSidePanel: boolean; - buckets: NetworkNodeDhtBucket[]; + private thisKey: string; private peers: NetworkNodeDhtPeer[] = []; private lastKnownWidth: number; @@ -75,10 +75,6 @@ export class NetworkNodeDhtLineComponent extends StoreDispatcher implements Afte ).subscribe(); } - toggleSidePanel(): void { - this.dispatch(NetworkNodeDhtToggleSidePanel); - } - private listenToNodeDhtPeers(): void { this.select(selectNetworkNodeDhtKeyPeersBucketsOpenSidePanel, ([key, peers, buckets, openSidePanel]: [string, NetworkNodeDhtPeer[], NetworkNodeDhtBucket[], boolean]) => { this.openSidePanel = openSidePanel; diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-peer-details/network-node-dht-peer-details.component.html b/frontend/src/app/features/network/node-dht/network-node-dht-peer-details/network-node-dht-peer-details.component.html deleted file mode 100644 index f5f490d38..000000000 --- a/frontend/src/app/features/network/node-dht/network-node-dht-peer-details/network-node-dht-peer-details.component.html +++ /dev/null @@ -1,12 +0,0 @@ - -
- - - - -
-
- -
- diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-peer-details/network-node-dht-peer-details.component.ts b/frontend/src/app/features/network/node-dht/network-node-dht-peer-details/network-node-dht-peer-details.component.ts deleted file mode 100644 index b5393893b..000000000 --- a/frontend/src/app/features/network/node-dht/network-node-dht-peer-details/network-node-dht-peer-details.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core'; -import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; -import { NetworkNodeDhtPeer } from '@shared/types/network/node-dht/network-node-dht.type'; -import { selectNetworkNodeDhtActivePeer } from '@network/node-dht/network-node-dht.state'; -import { downloadJson, ExpandTracking, MinaJsonViewerComponent } from '@openmina/shared'; -import { delay, mergeMap, of } from 'rxjs'; - -@Component({ - selector: 'mina-network-node-dht-peer-details', - templateUrl: './network-node-dht-peer-details.component.html', - styleUrls: ['./network-node-dht-peer-details.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class NetworkNodeDhtPeerDetailsComponent extends StoreDispatcher implements OnInit { - - activePeer: NetworkNodeDhtPeer; - expandingTracking: ExpandTracking = {}; - jsonString: string; - - @ViewChild(MinaJsonViewerComponent) private minaJsonViewer: MinaJsonViewerComponent; - - ngOnInit(): void { - this.listenToActiveNode(); - } - - private listenToActiveNode(): void { - this.select(selectNetworkNodeDhtActivePeer, (peer: NetworkNodeDhtPeer) => { - this.activePeer = peer; - this.jsonString = JSON.stringify(peer); - this.detect(); - }, mergeMap((peer: NetworkNodeDhtPeer) => of(peer).pipe(delay(peer ? 0 : 300)))); - } - - downloadJson(): void { - downloadJson(this.jsonString, 'dht-peer.json'); - } - - expandEntireJSON(): void { - this.expandingTracking = this.minaJsonViewer.toggleAll(true); - } - - collapseEntireJSON(): void { - this.expandingTracking = this.minaJsonViewer.toggleAll(false); - } -} diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-side-panel/network-node-dht-side-panel.component.html b/frontend/src/app/features/network/node-dht/network-node-dht-side-panel/network-node-dht-side-panel.component.html index c3270f7ee..160429879 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht-side-panel/network-node-dht-side-panel.component.html +++ b/frontend/src/app/features/network/node-dht/network-node-dht-side-panel/network-node-dht-side-panel.component.html @@ -1,44 +1,30 @@ - - - -
-
FIND_NODE
- -
- - - - -
-
- arrow_back - -
Peer Detail
+
+ Peer Detail + close + +
+
+
+
+ + + + +
+
+
-
- - - - -
-
- arrow_back +
+
- +
- - - - - - +
diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-side-panel/network-node-dht-side-panel.component.ts b/frontend/src/app/features/network/node-dht/network-node-dht-side-panel/network-node-dht-side-panel.component.ts index a1ae4b163..c070be0c4 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht-side-panel/network-node-dht-side-panel.component.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht-side-panel/network-node-dht-side-panel.component.ts @@ -1,11 +1,14 @@ -import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; import { NetworkNodeDhtPeer } from '@shared/types/network/node-dht/network-node-dht.type'; -import { - selectNetworkNodeDhtActiveBootstrapRequest, - selectNetworkNodeDhtActivePeer, -} from '@network/node-dht/network-node-dht.state'; -import { NetworkNodeDhtSetActivePeer, NetworkNodeDhtToggleSidePanel } from '@network/node-dht/network-node-dht.actions'; +import { selectNetworkNodeDhtActivePeer } from '@network/node-dht/network-node-dht.state'; +import { NetworkNodeDhtSetActivePeer } from '@network/node-dht/network-node-dht.actions'; +import { downloadJson, ExpandTracking, MinaJsonViewerComponent } from '@openmina/shared'; +import { delay, mergeMap, of } from 'rxjs'; +import { Routes } from '@shared/enums/routes.enum'; +import { Router } from '@angular/router'; +import { selectActiveNode } from '@app/app.state'; +import { isSubFeatureEnabled } from '@shared/constants/config'; @Component({ selector: 'mina-network-node-dht-side-panel', @@ -17,45 +20,51 @@ import { NetworkNodeDhtSetActivePeer, NetworkNodeDhtToggleSidePanel } from '@net export class NetworkNodeDhtSidePanelComponent extends StoreDispatcher implements OnInit { activePeer: NetworkNodeDhtPeer; - activeStep: number = 0; + expandingTracking: ExpandTracking = {}; + jsonString: string; + hasBootstrapStatsEnabled: boolean; + + @ViewChild(MinaJsonViewerComponent) private minaJsonViewer: MinaJsonViewerComponent; + + constructor(private router: Router) { super(); } ngOnInit(): void { this.listenToActiveNode(); - this.listenToActiveBoostrapRequest(); + this.listenToActivePeer(); } - private listenToActiveNode(): void { + private listenToActivePeer(): void { this.select(selectNetworkNodeDhtActivePeer, (peer: NetworkNodeDhtPeer) => { this.activePeer = peer; - if (this.activePeer) { - this.activeStep = 1; - } else { - this.activeStep = 0; - } + this.jsonString = JSON.stringify(peer); this.detect(); }); } - private listenToActiveBoostrapRequest(): void { - this.select(selectNetworkNodeDhtActiveBootstrapRequest, (request: any) => { - if (request) { - this.activeStep = 2; - } else { - this.activeStep = 0; - } - this.detect(); + private listenToActiveNode(): void { + this.select(selectActiveNode, (node) => { + this.hasBootstrapStatsEnabled = isSubFeatureEnabled(node, 'network', 'bootstrap-stats'); }); } - removeActivePeer(): void { - this.dispatch(NetworkNodeDhtSetActivePeer); + downloadJson(): void { + downloadJson(this.jsonString, 'dht-peer.json'); + } + + expandEntireJSON(): void { + this.expandingTracking = this.minaJsonViewer.toggleAll(true); + } + + collapseEntireJSON(): void { + this.expandingTracking = this.minaJsonViewer.toggleAll(false); } - toggleSidePanel(): void { - this.dispatch(NetworkNodeDhtToggleSidePanel); + closeSidePanel(): void { + this.dispatch(NetworkNodeDhtSetActivePeer, undefined); + this.router.navigate([Routes.NETWORK, Routes.NODE_DHT], { queryParamsHandling: 'merge' }); } - backToStep0(): void { - this.activeStep = 0; + goToBootstrapStats(): void { + this.router.navigate([Routes.NETWORK, Routes.BOOTSTRAP_STATS, this.activePeer.peerId], { queryParamsHandling: 'merge' }); } } diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-table/network-node-dht-table.component.scss b/frontend/src/app/features/network/node-dht/network-node-dht-table/network-node-dht-table.component.scss index e9b2ebc08..65ae20acd 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht-table/network-node-dht-table.component.scss +++ b/frontend/src/app/features/network/node-dht/network-node-dht-table/network-node-dht-table.component.scss @@ -2,7 +2,7 @@ .circle { width: 10px; - height: 10px; + height: 10px !important; border-radius: 12px; background-color: $base-tertiary; diff --git a/frontend/src/app/features/network/node-dht/network-node-dht-table/network-node-dht-table.component.ts b/frontend/src/app/features/network/node-dht/network-node-dht-table/network-node-dht-table.component.ts index fe038df1a..04c3f0592 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht-table/network-node-dht-table.component.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht-table/network-node-dht-table.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { MinaTableRustWrapper } from '@shared/base-classes/mina-table-rust-wrapper.class'; -import { TableColumnList } from '@openmina/shared'; +import { getMergedRoute, MergedRoute, TableColumnList } from '@openmina/shared'; import { Router } from '@angular/router'; import { NetworkNodeDhtPeer, @@ -8,6 +8,14 @@ import { } from '@shared/types/network/node-dht/network-node-dht.type'; import { selectNetworkNodeDhtActivePeer, selectNetworkNodeDhtPeers } from '@network/node-dht/network-node-dht.state'; import { NetworkNodeDhtSetActivePeer } from '@network/node-dht/network-node-dht.actions'; +import { filter, take } from 'rxjs'; +import { + NetworkBootstrapStatsRequest, +} from '@shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type'; +import { + NetworkBootstrapStatsSetActiveBootstrapRequest, +} from '@network/bootstrap-stats/network-bootstrap-stats.actions'; +import { Routes } from '@shared/enums/routes.enum'; @Component({ @@ -19,6 +27,7 @@ import { NetworkNodeDhtSetActivePeer } from '@network/node-dht/network-node-dht. }) export class NetworkNodeDhtTableComponent extends MinaTableRustWrapper implements OnInit { + protected readonly NetworkNodeDhtPeerConnectionType = NetworkNodeDhtPeerConnectionType; protected readonly tableHeads: TableColumnList = [ { name: 'connection' }, { name: 'peerId' }, @@ -32,10 +41,13 @@ export class NetworkNodeDhtTableComponent extends MinaTableRustWrapper { await super.ngOnInit(); + this.listenToRouteChange(); this.listenToNetworkConnectionsChanges(); this.listenToActiveRowChange(); } @@ -45,12 +57,21 @@ export class NetworkNodeDhtTableComponent extends MinaTableRustWrapper { + if (route.params['id'] && this.table.rows.length === 0) { + this.idFromRoute = route.params['id']; + } + }, take(1)); + } + private listenToNetworkConnectionsChanges(): void { this.select(selectNetworkNodeDhtPeers, (rows: NetworkNodeDhtPeer[]) => { this.rows = rows; this.table.rows = rows; this.table.detect(); - }); + this.scrollToElement(); + }, filter(rows => rows.length > 0)); } private listenToActiveRowChange(): void { @@ -61,9 +82,22 @@ export class NetworkNodeDhtTableComponent extends MinaTableRustWrapper request.peerId === this.idFromRoute); + this.setActiveRow(this.table.rows.find(request => request.peerId === this.idFromRoute)); + delete this.idFromRoute; + } + } + protected override onRowClick(row: NetworkNodeDhtPeer): void { - this.dispatch(NetworkNodeDhtSetActivePeer, row); + if (this.table.activeRow?.peerId !== row?.peerId) { + this.setActiveRow(row); + this.router.navigate([Routes.NETWORK, Routes.NODE_DHT, row.peerId], { queryParamsHandling: 'merge' }); + } } - protected readonly NetworkNodeDhtPeerConnectionType = NetworkNodeDhtPeerConnectionType; + private setActiveRow(row: NetworkNodeDhtPeer): void { + this.dispatch(NetworkNodeDhtSetActivePeer, row); + } } diff --git a/frontend/src/app/features/network/node-dht/network-node-dht.actions.ts b/frontend/src/app/features/network/node-dht/network-node-dht.actions.ts index 22a5bb2e7..8db411067 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht.actions.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht.actions.ts @@ -8,25 +8,17 @@ import { enum NetworkNodeDhtActionTypes { NETWORK_NODE_DHT_INIT = 'NETWORK_NODE_DHT_INIT', NETWORK_NODE_DHT_CLOSE = 'NETWORK_NODE_DHT_CLOSE', - NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS = 'NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS', - NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS = 'NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS', - NETWORK_NODE_DHT_SET_ACTIVE_BOOTSTRAP_REQUEST = 'NETWORK_NODE_DHT_SET_ACTIVE_BOOTSTRAP_REQUEST', NETWORK_NODE_DHT_GET_PEERS = 'NETWORK_NODE_DHT_GET_PEERS', NETWORK_NODE_DHT_GET_PEERS_SUCCESS = 'NETWORK_NODE_DHT_GET_PEERS_SUCCESS', NETWORK_NODE_DHT_SET_ACTIVE_PEER = 'NETWORK_NODE_DHT_SET_ACTIVE_PEER', - NETWORK_NODE_DHT_TOGGLE_SIDE_PANEL = 'NETWORK_NODE_DHT_TOGGLE_SIDE_PANEL', NETWORK_NODE_DHT_SIDE_PANEL_RESIZE = 'NETWORK_NODE_DHT_SIDE_PANEL_RESIZE', } export const NETWORK_NODE_DHT_INIT = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_INIT; export const NETWORK_NODE_DHT_CLOSE = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_CLOSE; -export const NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS; -export const NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS; -export const NETWORK_NODE_DHT_SET_ACTIVE_BOOTSTRAP_REQUEST = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_SET_ACTIVE_BOOTSTRAP_REQUEST; export const NETWORK_NODE_DHT_GET_PEERS = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_GET_PEERS; export const NETWORK_NODE_DHT_GET_PEERS_SUCCESS = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_GET_PEERS_SUCCESS; export const NETWORK_NODE_DHT_SET_ACTIVE_PEER = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_SET_ACTIVE_PEER; -export const NETWORK_NODE_DHT_TOGGLE_SIDE_PANEL = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_TOGGLE_SIDE_PANEL; export const NETWORK_NODE_DHT_SIDE_PANEL_RESIZE = NetworkNodeDhtActionTypes.NETWORK_NODE_DHT_SIDE_PANEL_RESIZE; export interface NetworkNodeDhtAction extends FeatureAction { @@ -41,22 +33,6 @@ export class NetworkNodeDhtClose implements NetworkNodeDhtAction { readonly type = NETWORK_NODE_DHT_CLOSE; } -export class NetworkNodeDhtGetBootstrapStats implements NetworkNodeDhtAction { - readonly type = NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS; -} - -export class NetworkNodeDhtGetBootstrapStatsSuccess implements NetworkNodeDhtAction { - readonly type = NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS; - - constructor(public payload: NetworkBootstrapStatsRequest[]) { } -} - -export class NetworkNodeDhtSetActiveBootstrapRequest implements NetworkNodeDhtAction { - readonly type = NETWORK_NODE_DHT_SET_ACTIVE_BOOTSTRAP_REQUEST; - - constructor(public payload: any) { } -} - export class NetworkNodeDhtGetPeers implements NetworkNodeDhtAction { readonly type = NETWORK_NODE_DHT_GET_PEERS; } @@ -73,10 +49,6 @@ export class NetworkNodeDhtSetActivePeer implements NetworkNodeDhtAction { constructor(public payload: NetworkNodeDhtPeer) { } } -export class NetworkNodeDhtToggleSidePanel implements NetworkNodeDhtAction { - readonly type = NETWORK_NODE_DHT_TOGGLE_SIDE_PANEL; -} - export class NetworkNodeDhtSidePanelResize implements NetworkNodeDhtAction { readonly type = NETWORK_NODE_DHT_SIDE_PANEL_RESIZE; @@ -86,12 +58,8 @@ export class NetworkNodeDhtSidePanelResize implements NetworkNodeDhtAction { export type NetworkNodeDhtActions = | NetworkNodeDhtInit | NetworkNodeDhtClose - | NetworkNodeDhtGetBootstrapStats - | NetworkNodeDhtGetBootstrapStatsSuccess - | NetworkNodeDhtSetActiveBootstrapRequest | NetworkNodeDhtGetPeers | NetworkNodeDhtGetPeersSuccess | NetworkNodeDhtSetActivePeer - | NetworkNodeDhtToggleSidePanel | NetworkNodeDhtSidePanelResize ; diff --git a/frontend/src/app/features/network/node-dht/network-node-dht.component.ts b/frontend/src/app/features/network/node-dht/network-node-dht.component.ts index 9491a77ac..8f52a536e 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht.component.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht.component.ts @@ -4,11 +4,11 @@ import { tap, timer } from 'rxjs'; import { untilDestroyed } from '@ngneat/until-destroy'; import { NetworkNodeDhtClose, - NetworkNodeDhtGetBootstrapStats, NetworkNodeDhtGetPeers, NetworkNodeDhtInit, } from '@network/node-dht/network-node-dht.actions'; -import { selectNetworkNodeDhtOpenSidePanel } from '@network/node-dht/network-node-dht.state'; +import { selectNetworkNodeDhtActivePeer } from '@network/node-dht/network-node-dht.state'; +import { NetworkNodeDhtPeer } from '@shared/types/network/node-dht/network-node-dht.type'; @Component({ selector: 'mina-network-node-dht', @@ -32,18 +32,17 @@ export class NetworkNodeDhtComponent extends StoreDispatcher implements OnInit, timer(3000, 3000) .pipe( tap(() => this.dispatch(NetworkNodeDhtGetPeers)), - tap(() => this.dispatch(NetworkNodeDhtGetBootstrapStats)), untilDestroyed(this), ) .subscribe(); } private listenToSidePanelChange(): void { - this.select(selectNetworkNodeDhtOpenSidePanel, open => { - if (open && !this.openSidePanel) { + this.select(selectNetworkNodeDhtActivePeer, (activePeer: NetworkNodeDhtPeer) => { + if (activePeer && !this.openSidePanel) { this.openSidePanel = true; this.detect(); - } else if (!open && this.openSidePanel) { + } else if (!activePeer && this.openSidePanel) { this.openSidePanel = false; this.detect(); } diff --git a/frontend/src/app/features/network/node-dht/network-node-dht.effects.ts b/frontend/src/app/features/network/node-dht/network-node-dht.effects.ts index 4d24ee7bd..0ca94eadf 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht.effects.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht.effects.ts @@ -2,25 +2,32 @@ import { Injectable } from '@angular/core'; import { MinaState, selectMinaState } from '@app/app.setup'; import { Actions, createEffect, ofType } from '@ngrx/effects'; import { Effect } from '@openmina/shared'; -import { filter, map, switchMap, tap } from 'rxjs'; +import { EMPTY, filter, map, switchMap, tap } from 'rxjs'; import { catchErrorAndRepeat } from '@shared/constants/store-functions'; import { MinaErrorType } from '@shared/types/error-preview/mina-error-type.enum'; import { Store } from '@ngrx/store'; import { MinaRustBaseEffect } from '@shared/base-classes/mina-rust-base.effect'; import { - NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS, - NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS, + NETWORK_NODE_DHT_CLOSE, NETWORK_NODE_DHT_GET_PEERS, NETWORK_NODE_DHT_GET_PEERS_SUCCESS, NETWORK_NODE_DHT_INIT, - NetworkNodeDhtActions, + NetworkNodeDhtActions, NetworkNodeDhtClose, NetworkNodeDhtGetPeers, } from '@network/node-dht/network-node-dht.actions'; import { NetworkNodeDhtService } from '@network/node-dht/network-node-dht.service'; import { NetworkNodeDhtPeer } from '@shared/types/network/node-dht/network-node-dht.type'; import { NetworkNodeDhtBucket } from '@shared/types/network/node-dht/network-node-dht-bucket.type'; import { - NetworkBootstrapStatsRequest, -} from '@shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type'; + DASHBOARD_SPLITS_CLOSE, + DASHBOARD_SPLITS_GET_SPLITS, DashboardSplitsClose, + DashboardSplitsGetSplits, +} from '@network/splits/dashboard-splits.actions'; +import { + NODES_LIVE_CLOSE, + NODES_LIVE_GET_NODES, + NodesLiveClose, + NodesLiveGetNodes, +} from '@nodes/live/nodes-live.actions'; @Injectable({ providedIn: 'root', @@ -29,10 +36,8 @@ export class NetworkNodeDhtEffects extends MinaRustBaseEffect this.actions$.pipe( ofType(NETWORK_NODE_DHT_INIT), - switchMap(() => [ - { type: NETWORK_NODE_DHT_GET_PEERS }, - { type: NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS }, - ]), + map(() => ({ type: NETWORK_NODE_DHT_GET_PEERS })), )); this.getPeers$ = createEffect(() => this.actions$.pipe( - ofType(NETWORK_NODE_DHT_GET_PEERS), - filter(() => !this.pendingRequest), - tap(() => this.pendingRequest = true), - switchMap(() => this.nodeDhtService.getDhtPeers()), + ofType(NETWORK_NODE_DHT_GET_PEERS, NETWORK_NODE_DHT_CLOSE), + this.latestActionState(), + filter(({ action }) => action.type === NETWORK_NODE_DHT_CLOSE || !this.pendingRequest), + tap(({ action }) => { + this.pendingRequest = action.type === NETWORK_NODE_DHT_GET_PEERS; + }), + switchMap(({ action }) => + action.type === NETWORK_NODE_DHT_CLOSE + ? EMPTY + : this.nodeDhtService.getDhtPeers(), + ), map((payload: { peers: NetworkNodeDhtPeer[], thisKey: string, buckets: NetworkNodeDhtBucket[] }) => ({ type: NETWORK_NODE_DHT_GET_PEERS_SUCCESS, payload, @@ -63,20 +72,5 @@ export class NetworkNodeDhtEffects extends MinaRustBaseEffect this.actions$.pipe( - ofType(NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS), - filter(() => !this.pendingRequest2), - tap(() => this.pendingRequest2 = true), - switchMap(() => this.nodeDhtService.getDhtBootstrapStats()), - map((payload: NetworkBootstrapStatsRequest[]) => ({ - type: NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS, - payload, - })), - tap(() => this.pendingRequest2 = false), - //todo: review catch error payload - catchErrorAndRepeat(MinaErrorType.RUST, NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS, {}), - )); - } } diff --git a/frontend/src/app/features/network/node-dht/network-node-dht.module.ts b/frontend/src/app/features/network/node-dht/network-node-dht.module.ts index 788306fea..444165111 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht.module.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht.module.ts @@ -16,15 +16,6 @@ import { EffectsModule } from '@ngrx/effects'; import { NetworkNodeDhtEffects } from '@network/node-dht/network-node-dht.effects'; import { NetworkNodeDhtLineComponent } from './network-node-dht-line/network-node-dht-line.component'; import { NetworkNodeDhtTableComponent } from './network-node-dht-table/network-node-dht-table.component'; -import { - NetworkNodeDhtPeerDetailsComponent, -} from './network-node-dht-peer-details/network-node-dht-peer-details.component'; -import { - NetworkNodeDhtBootstrapStatsComponent, -} from './network-node-dht-bootstrap-stats/network-node-dht-bootstrap-stats.component'; -import { - NetworkNodeDhtBootstrapDetailsComponent, -} from './network-node-dht-bootstrap-details/network-node-dht-bootstrap-details.component'; @NgModule({ @@ -33,9 +24,6 @@ import { NetworkNodeDhtTableComponent, NetworkNodeDhtSidePanelComponent, NetworkNodeDhtLineComponent, - NetworkNodeDhtPeerDetailsComponent, - NetworkNodeDhtBootstrapStatsComponent, - NetworkNodeDhtBootstrapDetailsComponent, ], imports: [ SharedModule, diff --git a/frontend/src/app/features/network/node-dht/network-node-dht.reducer.ts b/frontend/src/app/features/network/node-dht/network-node-dht.reducer.ts index 94e8aa0e6..94bda9d4f 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht.reducer.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht.reducer.ts @@ -1,12 +1,9 @@ import { NetworkNodeDhtState } from '@network/node-dht/network-node-dht.state'; import { NETWORK_NODE_DHT_CLOSE, - NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS, NETWORK_NODE_DHT_GET_PEERS_SUCCESS, - NETWORK_NODE_DHT_SET_ACTIVE_BOOTSTRAP_REQUEST, NETWORK_NODE_DHT_SET_ACTIVE_PEER, NETWORK_NODE_DHT_SIDE_PANEL_RESIZE, - NETWORK_NODE_DHT_TOGGLE_SIDE_PANEL, NetworkNodeDhtActions, } from '@network/node-dht/network-node-dht.actions'; @@ -14,9 +11,6 @@ const initialState: NetworkNodeDhtState = { peers: [], thisKey: '', activePeer: undefined, - openSidePanel: true, - boostrapStats: undefined, - activeBootstrapRequest: undefined, buckets: [], sidePanelWidth: -1, }; @@ -43,27 +37,6 @@ export function networkDhtReducer(state: NetworkNodeDhtState = initialState, act }; } - case NETWORK_NODE_DHT_TOGGLE_SIDE_PANEL: { - return { - ...state, - openSidePanel: !state.openSidePanel, - }; - } - - case NETWORK_NODE_DHT_GET_BOOTSTRAP_STATS_SUCCESS: { - return { - ...state, - boostrapStats: action.payload, - }; - } - - case NETWORK_NODE_DHT_SET_ACTIVE_BOOTSTRAP_REQUEST: { - return { - ...state, - activeBootstrapRequest: action.payload, - }; - } - case NETWORK_NODE_DHT_SIDE_PANEL_RESIZE: { return { ...state, diff --git a/frontend/src/app/features/network/node-dht/network-node-dht.routing.ts b/frontend/src/app/features/network/node-dht/network-node-dht.routing.ts index fcb7371f0..5cad7dc37 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht.routing.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht.routing.ts @@ -1,11 +1,26 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { NetworkNodeDhtComponent } from '@network/node-dht/network-node-dht.component'; +import { NETWORK_TITLE } from '@app/app.routing'; const routes: Routes = [ { - path: '', component: NetworkNodeDhtComponent, + path: '', + title: NETWORK_TITLE, + children: [ + { + path: ':id', + component: NetworkNodeDhtComponent, + title: NETWORK_TITLE, + }, + ], + }, + { + path: '**', + redirectTo: '', + pathMatch: 'full', + title: NETWORK_TITLE, }, ]; diff --git a/frontend/src/app/features/network/node-dht/network-node-dht.service.ts b/frontend/src/app/features/network/node-dht/network-node-dht.service.ts index 23edaf9cf..4193af226 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht.service.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht.service.ts @@ -6,9 +6,6 @@ import { NetworkNodeDhtPeerConnectionType, } from '@shared/types/network/node-dht/network-node-dht.type'; import { NetworkNodeDhtBucket } from '@shared/types/network/node-dht/network-node-dht-bucket.type'; -import { - NetworkBootstrapStatsRequest, -} from '@shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type'; @Injectable({ providedIn: 'root', @@ -23,37 +20,40 @@ export class NetworkNodeDhtService { ); } - getDhtBootstrapStats(): Observable { - return this.rust.get('/discovery/bootstrap_stats').pipe( - map((response: DhtBootstrapStatsResponse) => this.mapBootstrapStats(response)), - ); - } - private mapDhtPeers(response: DhtPeersResponse): { peers: NetworkNodeDhtPeer[], thisKey: string, buckets: NetworkNodeDhtBucket[] } { + const peers = response.buckets.reduce((acc, bucket) => { + const nodes = bucket.entries.map(entry => { + const binaryDistance = this.hexToBinary(entry.dist); + return { + connection: this.convertConnectionType(entry.connection), + peerId: entry.peer_id, + addressesLength: entry.addrs.length, + addrs: entry.addrs, + key: entry.key, + hexDistance: entry.dist, + libp2p: entry.libp2p, + binaryDistance, + bucketIndex: response.buckets.indexOf(bucket), + xorDistance: entry.key === response.this_key ? '-' : this.getNumberOfZerosUntilFirst1(binaryDistance), + bucketMaxHex: bucket.max_dist, + } as NetworkNodeDhtPeer; + }); + return acc.concat(nodes); + }, []); + + // placing origin peer at the beginning of the list + const indexOfOriginPeer = peers.findIndex(peer => peer.key === response.this_key); + if (indexOfOriginPeer > 0) { + const originPeer = peers.splice(indexOfOriginPeer, 1)[0]; + peers.unshift(originPeer); + } + return { - peers: response.buckets.reduce((acc, bucket) => { - const nodes = bucket.entries.map(entry => { - const binaryDistance = this.hexToBinary(entry.dist); - return { - connection: this.convertConnectionType(entry.connection), - peerId: entry.peer_id, - addressesLength: entry.addrs.length, - addrs: entry.addrs, - key: entry.key, - hexDistance: entry.dist, - libp2p: entry.libp2p, - binaryDistance, - bucketIndex: response.buckets.indexOf(bucket), - xorDistance: entry.key === response.this_key ? '-' : this.getNumberOfZerosUntilFirst1(binaryDistance), - bucketMaxHex: bucket.max_dist, - } as NetworkNodeDhtPeer; - }); - return acc.concat(nodes); - }, []), + peers, thisKey: response.this_key, buckets: response.buckets.map(bucket => ({ peers: bucket.entries.length, @@ -81,10 +81,6 @@ export class NetworkNodeDhtService { return leadingZeros; } - private mapBootstrapStats(response: DhtBootstrapStatsResponse): NetworkBootstrapStatsRequest[] { - return response.requests; - } - private convertConnectionType(connection: ConnectionType): NetworkNodeDhtPeerConnectionType { const connectionString = connection.replace(/([A-Z])/g, ' $1').trim(); return connectionString as NetworkNodeDhtPeerConnectionType; @@ -116,7 +112,3 @@ enum ConnectionType { NotConnected = 'NotConnected', CanConnect = 'CanConnect', } - -interface DhtBootstrapStatsResponse { - requests: NetworkBootstrapStatsRequest[]; -} diff --git a/frontend/src/app/features/network/node-dht/network-node-dht.state.ts b/frontend/src/app/features/network/node-dht/network-node-dht.state.ts index 2f2a26db3..0cc9d9783 100644 --- a/frontend/src/app/features/network/node-dht/network-node-dht.state.ts +++ b/frontend/src/app/features/network/node-dht/network-node-dht.state.ts @@ -3,17 +3,11 @@ import { MinaState } from '@app/app.setup'; import { selectNetworkNodeDhtState } from '@network/network.state'; import { NetworkNodeDhtPeer } from '@shared/types/network/node-dht/network-node-dht.type'; import { NetworkNodeDhtBucket } from '@shared/types/network/node-dht/network-node-dht-bucket.type'; -import { - NetworkBootstrapStatsRequest, -} from '@shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type'; export interface NetworkNodeDhtState { peers: NetworkNodeDhtPeer[]; thisKey: string; activePeer: NetworkNodeDhtPeer; - openSidePanel: boolean; - boostrapStats: NetworkBootstrapStatsRequest[]; - activeBootstrapRequest: any; buckets: NetworkNodeDhtBucket[]; sidePanelWidth: number; } @@ -25,13 +19,9 @@ const select = (selector: (state: NetworkNodeDhtState) => T): MemoizedSelecto export const selectNetworkNodeDhtPeers = select((network: NetworkNodeDhtState): NetworkNodeDhtPeer[] => network.peers); export const selectNetworkNodeDhtActivePeer = select((network: NetworkNodeDhtState): NetworkNodeDhtPeer => network.activePeer); -export const selectNetworkNodeDhtOpenSidePanel = select((network: NetworkNodeDhtState): boolean => network.openSidePanel); -export const selectNetworkNodeDhtBootstrapStats = select((network: NetworkNodeDhtState): NetworkBootstrapStatsRequest[] => network.boostrapStats); -export const selectNetworkNodeDhtActiveBootstrapRequest = select((network: NetworkNodeDhtState): any => network.activeBootstrapRequest); -export const selectNetworkNodeDhtBuckets = select((network: NetworkNodeDhtState): NetworkNodeDhtBucket[] => network.buckets); export const selectNetworkNodeDhtKeyPeersBucketsOpenSidePanel = select((network: NetworkNodeDhtState): [string, NetworkNodeDhtPeer[], NetworkNodeDhtBucket[], boolean] => [ network.thisKey, network.peers, network.buckets, - network.openSidePanel, + !!network.activePeer, ]); diff --git a/frontend/src/app/features/nodes/bootstrap/nodes-bootstrap.component.html b/frontend/src/app/features/nodes/bootstrap/nodes-bootstrap.component.html index c35f8eaba..c21065c0a 100644 --- a/frontend/src/app/features/nodes/bootstrap/nodes-bootstrap.component.html +++ b/frontend/src/app/features/nodes/bootstrap/nodes-bootstrap.component.html @@ -13,4 +13,3 @@ - diff --git a/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.html b/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.html index b06312530..01e08c971 100644 --- a/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.html +++ b/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.html @@ -6,24 +6,18 @@
Staking ledger - - -
- Snarked - Fetch hashes + Fetch hashes {{ ledgers.stakingEpoch.snarked.fetchHashesDuration | secDuration: secConfig }}
- Snarked - Fetch accounts + Fetch accounts {{ ledgers.stakingEpoch.snarked.fetchAccountsDuration | secDuration: secConfig }}
@@ -33,66 +27,61 @@
Next epoch ledger - - -
- Snarked - Fetch hashes + Fetch hashes {{ ledgers.nextEpoch.snarked.fetchHashesDuration | secDuration: secConfig }}
- Snarked - Fetch accounts + Fetch accounts {{ ledgers.nextEpoch.snarked.fetchAccountsDuration | secDuration: secConfig }}
+ [ngClass]="ledgers.rootSnarked.state">
- - Ledger at the root of the frontier - - - + + Snarked ledger at the root
- Snarked - Fetch hashes - {{ ledgers.root.snarked.fetchHashesDuration | secDuration: secConfig }} + Fetch hashes + {{ ledgers.rootSnarked.snarked.fetchHashesDuration | secDuration: secConfig }}
- Snarked - Fetch accounts - {{ ledgers.root.snarked.fetchAccountsDuration | secDuration: secConfig }} + Fetch accounts + {{ ledgers.rootSnarked.snarked.fetchAccountsDuration | secDuration: secConfig }}
+
+
+
+
+ + Staged ledger at the root +
+
- Staged - Fetch parts - {{ ledgers.root.staged.fetchPartsDuration | secDuration: secConfig }} + Fetch parts + {{ ledgers.rootStaged.staged.fetchPartsDuration | secDuration: secConfig }}
- Staged - Reconstruct - {{ ledgers.root.staged.reconstructDuration | secDuration: secConfig }} + Reconstruct + {{ ledgers.rootStaged.staged.reconstructDuration | secDuration: secConfig }}
@@ -114,14 +103,6 @@ - - - - {{ time | secDuration: secConfig }} - - - -
diff --git a/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.scss b/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.scss index 78cce84ac..94166b399 100644 --- a/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.scss +++ b/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.scss @@ -1,80 +1,78 @@ @import 'openmina'; :host { - padding-bottom: 80px; + padding-bottom: 80px; } .group { - .steps { - position: relative; - padding-left: 40px; - color: $base-tertiary; + .steps { + position: relative; + padding-left: 40px; + color: $base-tertiary; - &::before { - content: ''; - position: absolute; - top: -5px; - left: 10px; - width: 1px; - height: calc(100% - 13px); - background-color: $base-divider; - } + &::before { + content: ''; + position: absolute; + top: -5px; + left: 10px; + width: 1px; + height: calc(100% - 13px); + background-color: $base-divider; + } - .step { - position: relative; + .step { + position: relative; + color: $base-tertiary; - &::before { - content: ''; - position: absolute; - top: calc(50% - 1px); - left: -29px; - width: 20px; - height: 1px; - background-color: $base-divider; - } - } - } - - &.pending { - .group-title { - color: $base-tertiary; - } + &::before { + content: ''; + position: absolute; + top: calc(50% - 1px); + left: -29px; + width: 20px; + height: 1px; + background-color: $base-divider; + } + } + } - .steps .step { - color: $base-tertiary; - } - } + &.pending { + .group-title { + color: $base-tertiary; + } + } - &.success { - .group-title { - color: $success-primary; - } + &.success { + .group-title { + color: $success-primary; + } - .steps .step { - color: $success-secondary !important; - } - } + .steps::before, + .steps .step::before { + background-color: $success-tertiary; + } + } - .pending-icon { - width: 20px; - height: 20px; + .pending-icon { + width: 20px; + height: 20px; - span { - background-color: $base-tertiary; - width: 10px; - height: 10px; - border-radius: 10px; - } - } + span { + background-color: $base-tertiary; + width: 10px; + height: 10px; + border-radius: 10px; + } + } - .loading-icon { - animation: spin 2s linear infinite; - } + .loading-icon { + animation: spin 2s linear infinite; + } } .tooltip-row { - display: grid; - grid-template-columns: 40px 1fr; + display: grid; + grid-template-columns: 40px 1fr; } @keyframes spin { diff --git a/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.ts b/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.ts index a504c5d44..18dff60c4 100644 --- a/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.ts +++ b/frontend/src/app/features/nodes/overview/nodes-overview-ledgers/nodes-overview-ledgers.component.ts @@ -1,5 +1,14 @@ -import { ChangeDetectionStrategy, Component, Input, OnChanges, OnDestroy, TemplateRef, ViewChild, ViewContainerRef } from '@angular/core'; -import { NodesOverviewLedger, NodesOverviewLedgerStepSnarked, NodesOverviewStagedLedgerStep } from '@shared/types/nodes/dashboard/nodes-overview-ledger.type'; +import { + ChangeDetectionStrategy, + Component, + Input, + OnChanges, + OnDestroy, + TemplateRef, + ViewChild, + ViewContainerRef, +} from '@angular/core'; +import { NodesOverviewLedger } from '@shared/types/nodes/dashboard/nodes-overview-ledger.type'; import { SecDurationConfig } from '@openmina/shared'; import { Overlay, OverlayRef } from '@angular/cdk/overlay'; import { TemplatePortal } from '@angular/cdk/portal'; diff --git a/frontend/src/app/features/nodes/overview/nodes-overview.effects.ts b/frontend/src/app/features/nodes/overview/nodes-overview.effects.ts index 9d652ea25..4247d1fda 100644 --- a/frontend/src/app/features/nodes/overview/nodes-overview.effects.ts +++ b/frontend/src/app/features/nodes/overview/nodes-overview.effects.ts @@ -44,7 +44,7 @@ export class NodesOverviewEffects extends MinaRustBaseEffect action.type === NODES_OVERVIEW_CLOSE ? EMPTY - : this.nodesOverviewService.getNodes(), + : this.nodesOverviewService.getNodes(state.app.nodes), ), map((payload: NodesOverviewNode[]) => ({ type: NODES_OVERVIEW_GET_NODES_SUCCESS, payload })), catchErrorAndRepeat(MinaErrorType.GENERIC, NODES_OVERVIEW_GET_NODES_SUCCESS, []), diff --git a/frontend/src/app/features/nodes/overview/nodes-overview.service.ts b/frontend/src/app/features/nodes/overview/nodes-overview.service.ts index 0013f1b8e..12873289f 100644 --- a/frontend/src/app/features/nodes/overview/nodes-overview.service.ts +++ b/frontend/src/app/features/nodes/overview/nodes-overview.service.ts @@ -2,19 +2,16 @@ import { Injectable } from '@angular/core'; import { catchError, forkJoin, map, Observable, of } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { NodesOverviewNode, NodesOverviewNodeKindType } from '@shared/types/nodes/dashboard/nodes-overview-node.type'; -import { hasValue, ONE_BILLION, ONE_MILLION, toReadableDate } from '@openmina/shared'; +import { hasValue, ONE_BILLION, ONE_MILLION, ONE_THOUSAND, toReadableDate } from '@openmina/shared'; import { NodesOverviewBlock, - NodesOverviewNodeBlockStatus + NodesOverviewNodeBlockStatus, } from '@shared/types/nodes/dashboard/nodes-overview-block.type'; import { NodesOverviewLedger, NodesOverviewLedgerEpochStep, NodesOverviewLedgerStepState, - NodesOverviewRootLedgerStep, - NodesOverviewStagedLedgerStep, } from '@shared/types/nodes/dashboard/nodes-overview-ledger.type'; -import { CONFIG } from '@shared/constants/config'; import { MinaNode } from '@shared/types/core/environment/mina-env.type'; import { NodesOverviewResync } from '@shared/types/nodes/dashboard/nodes-overview-resync.type'; @@ -26,8 +23,7 @@ export class NodesOverviewService { constructor(private http: HttpClient) { } - getNodes(): Observable { - const nodes = CONFIG.configs; + getNodes(nodes: MinaNode[]): Observable { return forkJoin( nodes.map((node: MinaNode) => { return this.getNodeTips({ url: node.url, name: node.name }, '?limit=1'); @@ -81,7 +77,7 @@ export class NodesOverviewService { missingBlocks: node.blocks.filter((block: any) => block.status === NodesOverviewNodeBlockStatus.MISSING).length, fetchedBlocks: node.blocks.filter((block: any) => block.status === NodesOverviewNodeBlockStatus.FETCHED).length, fetchingBlocks: node.blocks.filter((block: any) => block.status === NodesOverviewNodeBlockStatus.FETCHING).length, - ledgers: this.getLedgers(node.ledgers, node.synced), + ledgers: this.getLedgers(node.ledgers), resyncs: this.getResyncs(node.resyncs), blocks, } as NodesOverviewNode; @@ -101,7 +97,7 @@ export class NodesOverviewService { missingBlocks: 0, fetchedBlocks: 0, fetchingBlocks: 0, - ledgers: this.getLedgers({}, null), + ledgers: this.getLedgers({}), resyncs: [], blocks: [], }]); @@ -109,28 +105,30 @@ export class NodesOverviewService { ); } - private getLedgers(ledgers: any, synced: number): NodesOverviewLedger { + private getLedgers(ledgers: any): NodesOverviewLedger { const ledger = {} as NodesOverviewLedger; - const epochLedger = this.getLedgerStep(ledgers.root); + const epochLedger = this.getSnarkedLedgerStep(ledgers.root); if (!ledgers.root) { - ledger.root = { - ...epochLedger, + ledger.rootSnarked = epochLedger; + ledger.rootStaged = { + state: NodesOverviewLedgerStepState.PENDING, staged: { fetchPartsStart: null, fetchPartsEnd: null, + fetchPartsDuration: null, + fetchPassedTime: null, reconstructStart: null, reconstructEnd: null, - fetchPartsDuration: null, reconstructDuration: null, - } as NodesOverviewStagedLedgerStep, - } as NodesOverviewRootLedgerStep; + reconstructPassedTime: null, + }, + totalTime: null, + }; } else { - ledger.root = { - ...epochLedger, - state: this.noneOfStepsCompleted(ledgers.root) && !ledgers.root.staged.fetch_parts_start && !ledgers.root.staged.reconstruct_start - ? NodesOverviewLedgerStepState.PENDING - : NodesOverviewLedgerStepState.LOADING, + ledger.rootSnarked = epochLedger; + ledger.rootStaged = { + state: !ledgers.root.staged.fetch_parts_start && !ledgers.root.staged.reconstruct_start ? NodesOverviewLedgerStepState.PENDING : NodesOverviewLedgerStepState.LOADING, staged: { fetchPartsStart: ledgers.root.staged.fetch_parts_start, fetchPartsEnd: ledgers.root.staged.fetch_parts_end, @@ -138,23 +136,28 @@ export class NodesOverviewService { reconstructEnd: ledgers.root.staged.reconstruct_end, fetchPartsDuration: this.getDuration(ledgers.root.staged.fetch_parts_start, ledgers.root.staged.fetch_parts_end), reconstructDuration: this.getDuration(ledgers.root.staged.reconstruct_start, ledgers.root.staged.reconstruct_end), + fetchPassedTime: this.getPassed(ledgers.root.staged.fetch_parts_start), + reconstructPassedTime: this.getPassed(ledgers.root.staged.reconstruct_start), }, - synced: null, + totalTime: null, }; - if (synced) { - ledger.root.synced = synced; - ledger.root.state = NodesOverviewLedgerStepState.SUCCESS; - ledger.root.totalTime = epochLedger.snarked.fetchHashesDuration + epochLedger.snarked.fetchAccountsDuration + ledger.root.staged.fetchPartsDuration + ledger.root.staged.reconstructDuration; + if (ledger.rootStaged.state !== NodesOverviewLedgerStepState.PENDING) { + ledger.rootSnarked.state = NodesOverviewLedgerStepState.SUCCESS; + ledger.rootSnarked.totalTime = ledger.rootSnarked.snarked.fetchHashesDuration + ledger.rootSnarked.snarked.fetchAccountsDuration; + } + if (ledger.rootStaged.staged.reconstructEnd) { + ledger.rootStaged.state = NodesOverviewLedgerStepState.SUCCESS; + ledger.rootStaged.totalTime = ledger.rootStaged.staged.fetchPartsDuration + ledger.rootStaged.staged.reconstructDuration; } } - ledger.nextEpoch = this.getLedgerStep(ledgers.next_epoch); - if (ledger.root.state !== NodesOverviewLedgerStepState.PENDING) { + ledger.nextEpoch = this.getSnarkedLedgerStep(ledgers.next_epoch); + if (ledger.rootSnarked.state !== NodesOverviewLedgerStepState.PENDING) { ledger.nextEpoch.state = NodesOverviewLedgerStepState.SUCCESS; ledger.nextEpoch.totalTime = ledger.nextEpoch.snarked.fetchHashesDuration + ledger.nextEpoch.snarked.fetchAccountsDuration; } - ledger.stakingEpoch = this.getLedgerStep(ledgers.staking_epoch); + ledger.stakingEpoch = this.getSnarkedLedgerStep(ledgers.staking_epoch); if (ledger.nextEpoch.state !== NodesOverviewLedgerStepState.PENDING) { ledger.stakingEpoch.state = NodesOverviewLedgerStepState.SUCCESS; ledger.stakingEpoch.totalTime = ledger.stakingEpoch.snarked.fetchHashesDuration + ledger.stakingEpoch.snarked.fetchAccountsDuration; @@ -163,17 +166,19 @@ export class NodesOverviewService { return ledger; } - private getLedgerStep(step: any): NodesOverviewLedgerEpochStep { + private getSnarkedLedgerStep(step: any): NodesOverviewLedgerEpochStep { if (!step) { return { state: NodesOverviewLedgerStepState.PENDING, snarked: { fetchHashesStart: null, fetchHashesEnd: null, + fetchHashesDuration: null, + fetchHashesPassedTime: null, fetchAccountsStart: null, fetchAccountsEnd: null, - fetchHashesDuration: null, fetchAccountsDuration: null, + fetchAccountsPassedTime: null, }, } as NodesOverviewLedgerEpochStep; } @@ -186,6 +191,8 @@ export class NodesOverviewService { fetchAccountsEnd: step.snarked.fetch_accounts_end, fetchHashesDuration: this.getDuration(step.snarked.fetch_hashes_start, step.snarked.fetch_hashes_end), fetchAccountsDuration: this.getDuration(step.snarked.fetch_accounts_start, step.snarked.fetch_accounts_end), + fetchHashesPassedTime: this.getPassed(step.snarked.fetch_hashes_start), + fetchAccountsPassedTime: this.getPassed(step.snarked.fetch_accounts_start), }, } as NodesOverviewLedgerEpochStep; }; @@ -197,8 +204,11 @@ export class NodesOverviewService { return Math.ceil((end - start) / ONE_BILLION); } - private hasAllStepsCompleted(step: any): boolean { - return !!(step.snarked.fetch_hashes_end && step.snarked.fetch_accounts_end); + private getPassed(start: number): number | null { + if (!start) { + return null; + } + return Math.ceil((Date.now() / ONE_THOUSAND) - (start / ONE_BILLION)); } private noneOfStepsCompleted(step: any): boolean { diff --git a/frontend/src/app/layout/menu/menu.component.ts b/frontend/src/app/layout/menu/menu.component.ts index a377e5009..176315670 100644 --- a/frontend/src/app/layout/menu/menu.component.ts +++ b/frontend/src/app/layout/menu/menu.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { Store } from '@ngrx/store'; import { MinaState } from '@app/app.setup'; import { selectActiveNode, selectAppMenu } from '@app/app.state'; @@ -8,16 +8,15 @@ import { APP_CHANGE_MENU_COLLAPSING, APP_TOGGLE_MENU_OPENING, AppChangeMenuCollapsing, - AppToggleMenuOpening + AppToggleMenuOpening, } from '@app/app.actions'; import { ManualDetection, removeParamsFromURL, ThemeSwitcherService, ThemeType, - TooltipPosition + TooltipPosition, } from '@openmina/shared'; -import { DOCUMENT } from '@angular/common'; import { MinaNode } from '@shared/types/core/environment/mina-env.type'; import { filter, map, tap } from 'rxjs'; import { CONFIG, getAvailableFeatures } from '@shared/constants/config'; @@ -31,6 +30,7 @@ interface MenuItem { const MENU_ITEMS: MenuItem[] = [ { name: 'Dashboard', icon: 'dashboard' }, + { name: 'Block Production', icon: 'library_add' }, { name: 'Nodes', icon: 'margin' }, { name: 'Resources', icon: 'analytics' }, { name: 'Network', icon: 'account_tree' }, @@ -58,8 +58,7 @@ export class MenuComponent extends ManualDetection implements OnInit { activeNode: MinaNode; activeRoute: string; - constructor(@Inject(DOCUMENT) private readonly document: Document, - private router: Router, + constructor(private router: Router, private store: Store, private themeService: ThemeSwitcherService) { super(); } diff --git a/frontend/src/app/layout/new-node/new-node.component.html b/frontend/src/app/layout/new-node/new-node.component.html new file mode 100644 index 000000000..bec7c8103 --- /dev/null +++ b/frontend/src/app/layout/new-node/new-node.component.html @@ -0,0 +1,57 @@ +
Adding a new node +
The nodes added manually will persist in your browser's local storage.
+
+
+
Give it a name
+
+ +
+
URL of your node
+
+ +
+
Attach a debugger to your node (Optional)
+
+ +
+
Attach a memory profiler to your node (Optional)
+
+ +
+
Confirm which features your node is ready to provide.
+ +
+
+
+
+ check_small +
+
{{ feature.name }}
+
+
+
+
+ check_small +
+
{{ sub.name }}
+
+
+
+
+
+ +
+ + +
diff --git a/frontend/src/app/layout/new-node/new-node.component.scss b/frontend/src/app/layout/new-node/new-node.component.scss new file mode 100644 index 000000000..fdaafac5e --- /dev/null +++ b/frontend/src/app/layout/new-node/new-node.component.scss @@ -0,0 +1,41 @@ +@import 'openmina'; + +:host { + width: 100%; + height: 100%; + padding: 30px; +} + +.mina-input { + height: 40px; + border-radius: 6px; +} + +.feature { + color: $base-tertiary; + + .fx-row-full-cent { + width: 16px; + height: 16px; + border: 2px solid $base-divider; + border-radius: 6px; + } + + .mina-icon { + display: none; + font-variation-settings: 'FILL' 0, 'wght' 400 !important; + } + + &.checked { + color: $base-primary; + + .mina-icon { + display: block; + } + + .fx-row-full-cent { + background-color: $selected-container; + border: none; + } + } +} diff --git a/frontend/src/app/layout/new-node/new-node.component.ts b/frontend/src/app/layout/new-node/new-node.component.ts new file mode 100644 index 000000000..b70f5346f --- /dev/null +++ b/frontend/src/app/layout/new-node/new-node.component.ts @@ -0,0 +1,193 @@ +import { + ChangeDetectionStrategy, + Component, + ElementRef, + EventEmitter, + HostListener, + OnInit, + ViewChild, +} from '@angular/core'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FeaturesConfig, FeatureType, MinaNode } from '@shared/types/core/environment/mina-env.type'; +import { AppAddNode } from '@app/app.actions'; + +const nodeNames: string[] = [ + 'Crypto Hash', + 'Block Forge', + 'Ledger Node', + 'Protocol Hub', + 'Chain Matrix', + 'Cipher Node', + 'Crypto Core', + 'Token Vault', + 'Crypto Mesh', + 'Protocol Forge', +]; +const servers: string[] = [ + '192.168.1.100:80', + '10.0.0.1:443', + '172.16.0.1:8080', + '198.51.100.1:3000', + '203.0.113.10:8000', + '192.0.2.15:9000', + '169.254.0.1:27017', + '127.0.0.1:5432', +]; + + +type Feature = { + name: string; + checked?: boolean; + subFeatures: SubFeature[]; +}; + +type SubFeature = { + name: string; + checked?: boolean; +}; + +@Component({ + selector: 'mina-new-node', + templateUrl: './new-node.component.html', + styleUrls: ['./new-node.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + host: { class: 'flex-column bg-surface-top popup-box-shadow-weak border-rad-8' }, +}) +export class NewNodeComponent extends StoreDispatcher implements OnInit { + + features: Feature[] = [ + { + name: 'Dashboard', + checked: true, + subFeatures: [], + }, + { + name: 'Nodes', + checked: true, + subFeatures: [ + { name: 'overview', checked: true }, + { name: 'live', checked: true }, + { name: 'bootstrap', checked: true }, + ], + }, + { + name: 'State', + checked: true, + subFeatures: [ + { name: 'actions', checked: true }, + ], + }, + { + name: 'Network', + checked: true, + subFeatures: [ + { name: 'messages', checked: true }, + { name: 'connections', checked: true }, + { name: 'blocks', checked: true }, + { name: 'topology', checked: true }, + { name: 'node DHT', checked: true }, + { name: 'graph overview', checked: true }, + { name: 'bootstrap stats', checked: true }, + ], + }, + { + name: 'Snarks', + checked: true, + subFeatures: [ + { name: 'scan state', checked: true }, + ], + }, + { + name: 'Resources', + checked: true, + subFeatures: [ + { name: 'memory', checked: true }, + ], + }, + ]; + readonly closeEmitter: EventEmitter = new EventEmitter(); + readonly placeholder: string = nodeNames[Math.floor(Math.random() * nodeNames.length)]; + readonly placeholder2: string = servers[Math.floor(Math.random() * servers.length)]; + readonly placeholder3: string = servers[Math.floor(Math.random() * servers.length)]; + readonly placeholder4: string = servers[Math.floor(Math.random() * servers.length)]; + formGroup: FormGroup; + + @ViewChild('fg') private fgRef: ElementRef; + + @HostListener('document:keydown', ['$event']) + handleKeyboardEvent(event: KeyboardEvent): void { + if (event.key === 'Escape') { + this.close(); + } + } + + @HostListener('document:click', ['$event']) + clickOut(event: MouseEvent): void { + if (!this.el.nativeElement.contains(event.target)) { + this.close(); + } + } + + constructor(private formBuilder: FormBuilder, + private el: ElementRef) { super(); } + + ngOnInit(): void { + this.initForm(); + } + + private initForm(): void { + this.formGroup = this.formBuilder.group({ + name: ['', Validators.required], + url: ['', Validators.required], + memProfiler: [''], + debugger: [''], + }); + } + + onFeatureCheck(feature: Feature): void { + feature.checked = !feature.checked; + feature.subFeatures.forEach(subFeature => { + subFeature.checked = feature.checked; + }); + } + + onSubFeatureCheck(subFeature: SubFeature, feature: Feature): void { + subFeature.checked = !subFeature.checked; + feature.checked = feature.subFeatures.some(subFeature => subFeature.checked); + } + + addNode(): void { + if (this.formGroup.invalid) { + this.fgRef.nativeElement.scroll({ top: 0, behavior: 'smooth' }); + this.formGroup.markAllAsTouched(); + return; + } + + const featuresConfig: FeaturesConfig = {}; + this.features + .filter(f => f.checked) + .forEach((feature: Feature) => { + const featureType = feature.name.toLowerCase().replace(' ', '-') as FeatureType; + featuresConfig[featureType] = feature.subFeatures + .filter(f => f.checked) + .map((subFeature: SubFeature) => subFeature.name.toLowerCase().replace(' ', '-')); + }); + + const payload: MinaNode = { + name: this.formGroup.get('name').value, + url: this.formGroup.get('url').value, + memoryProfiler: this.formGroup.get('memProfiler').value, + debugger: this.formGroup.get('debugger').value, + features: featuresConfig, + isCustom: true, + }; + + this.dispatch(AppAddNode, payload); + this.close(); + } + + close(): void { + this.closeEmitter.emit(); + } +} diff --git a/frontend/src/app/layout/node-picker/node-picker.component.html b/frontend/src/app/layout/node-picker/node-picker.component.html index 72c591502..a592ac947 100644 --- a/frontend/src/app/layout/node-picker/node-picker.component.html +++ b/frontend/src/app/layout/node-picker/node-picker.component.html @@ -5,12 +5,12 @@
+ class="add-node border-rad-4 secondary primary-hover pointer p-absolute flex-row align-center flex-center"> add
-
+
{{ node.url }}
+
+
+ delete +
+
+
+ add_circle +
New node
+
diff --git a/frontend/src/app/layout/node-picker/node-picker.component.scss b/frontend/src/app/layout/node-picker/node-picker.component.scss index c525d5162..32ae70a14 100644 --- a/frontend/src/app/layout/node-picker/node-picker.component.scss +++ b/frontend/src/app/layout/node-picker/node-picker.component.scss @@ -1,40 +1,44 @@ @import 'openmina'; :host { - max-height: 60vh; + max-height: 50vh; } .node-picker { - .add-node { - right: 12px; - top: 10px; - width: 22px; - height: 22px; - - &:hover { - background-color: $base-container; - } - } - - .node { - .mina-icon { - width: 20px; - } - - .names { - width: calc(100% - 20px); - - > span { - height: 50%; - - &:first-child { - padding-bottom: 3px; - } - } - } - } + .add-node { + right: 12px; + top: 10px; + width: 22px; + height: 22px; + + &:hover { + background-color: $base-container; + } + } + + .node { + .mina-icon { + width: 20px; + } + + .names { + width: calc(100% - 20px); + + > span { + height: 50%; + + &:first-child { + padding-bottom: 3px; + } + } + } + } } .node:focus { - outline: 2px solid $selected-primary; + outline: 2px solid $selected-primary; +} + +.mina-icon { + font-variation-settings: 'FILL' 0, 'wght' 400 !important; } diff --git a/frontend/src/app/layout/node-picker/node-picker.component.ts b/frontend/src/app/layout/node-picker/node-picker.component.ts index 3a0dd17e4..f17d6c456 100644 --- a/frontend/src/app/layout/node-picker/node-picker.component.ts +++ b/frontend/src/app/layout/node-picker/node-picker.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, ViewChild } from '@angular/core'; import { MinaNode } from '@shared/types/core/environment/mina-env.type'; import { debounceTime, distinctUntilChanged, filter, fromEvent, map } from 'rxjs'; -import { AppAddNode, AppChangeActiveNode } from '@app/app.actions'; +import { AppChangeActiveNode, AppDeleteNode } from '@app/app.actions'; import { untilDestroyed } from '@ngneat/until-destroy'; import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; @@ -18,7 +18,7 @@ export class NodePickerComponent extends StoreDispatcher implements AfterViewIni nodes: MinaNode[] = []; filteredNodes: MinaNode[] = []; - closeEmitter: EventEmitter = new EventEmitter(); + closeEmitter: EventEmitter = new EventEmitter(); parentInitialWidth: number = 0; @ViewChild('searchNode') searchInput: ElementRef; @@ -55,7 +55,7 @@ export class NodePickerComponent extends StoreDispatcher implements AfterViewIni } selectNode(node: MinaNode): void { - this.closeEmitter.emit(); + this.closeEmitter.emit(false); if (node !== this.activeNode) { this.dispatch(AppChangeActiveNode, node); } @@ -63,9 +63,11 @@ export class NodePickerComponent extends StoreDispatcher implements AfterViewIni addNode(event: MouseEvent): void { event.stopImmediatePropagation(); - const value = this.searchInput.nativeElement.value.trim(); - const payload = value[value.length - 1] === '/' ? value.slice(0, -1) : value; - this.dispatch(AppAddNode, payload); this.searchInput.nativeElement.value = ''; + this.closeEmitter.emit(true); + } + + deleteCustomNode(node: MinaNode): void { + this.dispatch(AppDeleteNode, node); } } diff --git a/frontend/src/app/layout/server-status/server-status.component.html b/frontend/src/app/layout/server-status/server-status.component.html index 50865cc6e..cfd8be41c 100644 --- a/frontend/src/app/layout/server-status/server-status.component.html +++ b/frontend/src/app/layout/server-status/server-status.component.html @@ -9,6 +9,8 @@
{{ !switchForbidden ? activeNode?.name : 'All Nodes' }} arrow_drop_down diff --git a/frontend/src/app/layout/server-status/server-status.component.ts b/frontend/src/app/layout/server-status/server-status.component.ts index 6da77a9ba..fc8c8b1d7 100644 --- a/frontend/src/app/layout/server-status/server-status.component.ts +++ b/frontend/src/app/layout/server-status/server-status.component.ts @@ -1,13 +1,4 @@ -import { - ChangeDetectionStrategy, - Component, - ComponentRef, - ElementRef, - Input, - NgZone, - OnInit, - ViewChild -} from '@angular/core'; +import { ChangeDetectionStrategy, Component, ComponentRef, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { selectActiveNode, selectAppMenu, selectNodes } from '@app/app.state'; import { filter, take } from 'rxjs'; import { Store } from '@ngrx/store'; @@ -18,6 +9,8 @@ import { MinaNode } from '@shared/types/core/environment/mina-env.type'; import { ComponentPortal } from '@angular/cdk/portal'; import { Overlay, OverlayRef } from '@angular/cdk/overlay'; import { NodePickerComponent } from '@app/layout/node-picker/node-picker.component'; +import { NewNodeComponent } from '@app/layout/new-node/new-node.component'; +import { StoreDispatcher } from '@shared/base-classes/store-dispatcher.class'; @Component({ selector: 'mina-server-status', @@ -26,7 +19,7 @@ import { NodePickerComponent } from '@app/layout/node-picker/node-picker.compone changeDetection: ChangeDetectionStrategy.OnPush, host: { class: 'flex-row align-center' }, }) -export class ServerStatusComponent extends ManualDetection implements OnInit { +export class ServerStatusComponent extends StoreDispatcher implements OnInit { @Input() switchForbidden: boolean; @@ -38,10 +31,9 @@ export class ServerStatusComponent extends ManualDetection implements OnInit { private nodes: MinaNode[] = []; private overlayRef: OverlayRef; private nodePickerComponent: ComponentRef; + private newNodeComponent: ComponentRef; - constructor(private zone: NgZone, - private overlay: Overlay, - private store: Store) { super(); } + constructor(private overlay: Overlay) { super(); } ngOnInit(): void { this.listenToMenuChange(); @@ -49,31 +41,25 @@ export class ServerStatusComponent extends ManualDetection implements OnInit { } private listenToMenuChange(): void { - this.store.select(selectAppMenu) - .pipe(filter(menu => menu.isMobile !== this.isMobile)) - .subscribe((menu: AppMenu) => { - this.isMobile = menu.isMobile; - this.detect(); - }); + this.select(selectAppMenu, (menu: AppMenu) => { + this.isMobile = menu.isMobile; + this.detect(); + }, filter(menu => menu.isMobile !== this.isMobile)); } private listenToNodeChanges(): void { - this.store.select(selectNodes) - .pipe(filter(nodes => nodes.length > 0)) - .subscribe((nodes: MinaNode[]) => { - this.nodes = nodes; - if (this.overlayRef?.hasAttached()) { - this.detachOverlay(); - this.openNodePicker(); - } - this.detect(); - }); - this.store.select(selectActiveNode) - .pipe(filter(Boolean)) - .subscribe((activeNode: MinaNode) => { - this.activeNode = activeNode; - this.detect(); - }); + this.select(selectNodes, (nodes: MinaNode[]) => { + this.nodes = nodes; + if (this.overlayRef?.hasAttached()) { + this.detachOverlay(); + this.openNodePicker(); + } + this.detect(); + }, filter(nodes => nodes.length > 0)); + this.select(selectActiveNode, (activeNode: MinaNode) => { + this.activeNode = activeNode; + this.detect(); + }, filter(Boolean)); } openNodePicker(event?: MouseEvent): void { @@ -106,7 +92,12 @@ export class ServerStatusComponent extends ManualDetection implements OnInit { this.nodePickerComponent.instance.nodes = this.nodes; this.nodePickerComponent.instance.filteredNodes = this.nodes; this.nodePickerComponent.instance.activeNode = this.activeNode; - this.nodePickerComponent.instance.closeEmitter.pipe(take(1)).subscribe(() => this.detachOverlay()); + this.nodePickerComponent.instance.closeEmitter.pipe(take(1)).subscribe((addNewNode: boolean) => { + this.detachOverlay(); + if (addNewNode) { + this.openAddNewNodeOverlay(); + } + }); } detachOverlay(): void { @@ -114,4 +105,28 @@ export class ServerStatusComponent extends ManualDetection implements OnInit { this.overlayRef.detach(); } } + + private openAddNewNodeOverlay(): void { + if (this.overlayRef?.hasAttached()) { + this.overlayRef.detach(); + return; + } + + this.overlayRef = this.overlay.create({ + hasBackdrop: true, + width: '100%', + maxWidth: '900px', + height: '100%', + maxHeight: '650px', + scrollStrategy: this.overlay.scrollStrategies.block(), + positionStrategy: this.overlay.position() + .global() + .centerHorizontally() + .centerVertically(), + }); + + const portal = new ComponentPortal(NewNodeComponent); + this.newNodeComponent = this.overlayRef.attach(portal); + this.newNodeComponent.instance.closeEmitter.pipe(take(1)).subscribe(() => this.detachOverlay()); + } } diff --git a/frontend/src/app/shared/constants/config.ts b/frontend/src/app/shared/constants/config.ts index ed77b7794..c6e67c122 100644 --- a/frontend/src/app/shared/constants/config.ts +++ b/frontend/src/app/shared/constants/config.ts @@ -4,6 +4,12 @@ import { hasValue } from '@openmina/shared'; export const CONFIG: Readonly = { ...environment, + configs: environment.configs.map((config) => ({ + ...config, + url: getURL(config.url), + memoryProfiler: getURL(config.memoryProfiler), + debugger: getURL(config.debugger), + })), }; (window as any).config = CONFIG; @@ -31,3 +37,20 @@ export function isFeatureEnabled(config: MinaNode, feature: FeatureType): boolea export function getFeaturesConfig(config: MinaNode): FeaturesConfig { return config?.features || CONFIG.globalConfig?.features; } + +export function isSubFeatureEnabled(config: MinaNode, feature: FeatureType, subFeature: string): boolean { + const features = getFeaturesConfig(config); + return hasValue(features[feature]) && features[feature].includes(subFeature); +} + + +export function getURL(pathOrUrl: string): string { + if (pathOrUrl) { + let href = new URL(pathOrUrl, origin).href; + if (href.endsWith('/')) { + href = href.slice(0, -1); + } + return href; + } + return pathOrUrl; +} diff --git a/frontend/src/app/shared/enums/routes.enum.ts b/frontend/src/app/shared/enums/routes.enum.ts index f8dfc9e3d..e7acb086c 100644 --- a/frontend/src/app/shared/enums/routes.enum.ts +++ b/frontend/src/app/shared/enums/routes.enum.ts @@ -34,4 +34,5 @@ export enum Routes { WORK_POOL = 'work-pool', SNARKS = 'snarks', TESTING_TOOL = 'testing-tool', + NODE_DHT = 'node-dht', } diff --git a/frontend/src/app/shared/loading-spinner/loading-spinner.component.html b/frontend/src/app/shared/loading-spinner/loading-spinner.component.html index 15a4c862c..5c25e358f 100644 --- a/frontend/src/app/shared/loading-spinner/loading-spinner.component.html +++ b/frontend/src/app/shared/loading-spinner/loading-spinner.component.html @@ -1 +1,2 @@ - + diff --git a/frontend/src/app/shared/loading-spinner/loading-spinner.component.scss b/frontend/src/app/shared/loading-spinner/loading-spinner.component.scss index 63633bff9..c32935693 100644 --- a/frontend/src/app/shared/loading-spinner/loading-spinner.component.scss +++ b/frontend/src/app/shared/loading-spinner/loading-spinner.component.scss @@ -12,9 +12,8 @@ display: block; width: 16px; height: 16px; - border: 1px solid $base-tertiary; border-radius: 50%; - border-top-color: transparent; + border-top-color: transparent !important; animation: spin 2s linear infinite; } diff --git a/frontend/src/app/shared/loading-spinner/loading-spinner.component.ts b/frontend/src/app/shared/loading-spinner/loading-spinner.component.ts index ddada88a2..b53c8f177 100644 --- a/frontend/src/app/shared/loading-spinner/loading-spinner.component.ts +++ b/frontend/src/app/shared/loading-spinner/loading-spinner.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; @Component({ selector: 'mina-loading-spinner', @@ -8,4 +8,10 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class LoadingSpinnerComponent { + /** + * The color using CSS var. + * + * Default is var(--base-primary) + */ + @Input() color: string = 'var(--base-primary)'; } diff --git a/frontend/src/app/shared/types/core/environment/mina-env.type.ts b/frontend/src/app/shared/types/core/environment/mina-env.type.ts index b171a6e74..15197b8f2 100644 --- a/frontend/src/app/shared/types/core/environment/mina-env.type.ts +++ b/frontend/src/app/shared/types/core/environment/mina-env.type.ts @@ -13,18 +13,18 @@ export interface MinaNode { memoryProfiler?: string; debugger?: string; features?: FeaturesConfig; + isCustom?: boolean; } -export type FeaturesConfig = { - [key in FeatureType]?: string[]; -}; +export type FeaturesConfig = Partial<{ + 'dashboard': string[]; + 'nodes': string[]; + 'state': string[]; + 'network': string[]; + 'snarks': string[]; + 'resources': string[]; + 'testing-tool': string[]; + 'block-production': string[]; +}>; -export type FeatureType = - | 'dashboard' - | 'nodes' - | 'network' - | 'resources' - | 'state' - | 'snarks' - | 'testing-tool' - ; +export type FeatureType = keyof FeaturesConfig; diff --git a/frontend/src/app/shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type.ts b/frontend/src/app/shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type.ts index b797a51ef..7895984ca 100644 --- a/frontend/src/app/shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type.ts +++ b/frontend/src/app/shared/types/network/bootstrap-stats/network-bootstrap-stats-request.type.ts @@ -3,7 +3,7 @@ export interface NetworkBootstrapStatsRequest { address: string; start: number; finish: number; - duration: number; + durationInSecs: number; peerId: string; existingPeers: number; newPeers: number; diff --git a/frontend/src/app/shared/types/nodes/dashboard/nodes-overview-ledger.type.ts b/frontend/src/app/shared/types/nodes/dashboard/nodes-overview-ledger.type.ts index 690144d44..48d39f6d8 100644 --- a/frontend/src/app/shared/types/nodes/dashboard/nodes-overview-ledger.type.ts +++ b/frontend/src/app/shared/types/nodes/dashboard/nodes-overview-ledger.type.ts @@ -1,18 +1,20 @@ export interface NodesOverviewLedger { - root: NodesOverviewRootLedgerStep; stakingEpoch: NodesOverviewLedgerEpochStep; nextEpoch: NodesOverviewLedgerEpochStep; + rootSnarked: NodesOverviewLedgerEpochStep; + rootStaged: NodesOverviewRootStagedLedgerStep; } export interface NodesOverviewLedgerEpochStep { state: NodesOverviewLedgerStepState; - snarked: NodesOverviewLedgerStepSnarked; + snarked: NodesOverviewSnarkedLedgerStep; totalTime: number; } -export interface NodesOverviewRootLedgerStep extends NodesOverviewLedgerEpochStep { +export interface NodesOverviewRootStagedLedgerStep { + state: NodesOverviewLedgerStepState; staged: NodesOverviewStagedLedgerStep; - synced: number; + totalTime: number; } export enum NodesOverviewLedgerStepState { @@ -21,20 +23,24 @@ export enum NodesOverviewLedgerStepState { SUCCESS = 'success', } -export interface NodesOverviewLedgerStepSnarked { +export interface NodesOverviewSnarkedLedgerStep { fetchHashesStart: number; fetchHashesEnd: number; + fetchHashesDuration: number; + fetchHashesPassedTime: number; fetchAccountsStart: number; fetchAccountsEnd: number; - fetchHashesDuration: number; fetchAccountsDuration: number; + fetchAccountsPassedTime: number; } export interface NodesOverviewStagedLedgerStep { fetchPartsStart: number; fetchPartsEnd: number; + fetchPartsDuration: number; + fetchPassedTime: number; reconstructStart: number; reconstructEnd: number; - fetchPartsDuration: number; reconstructDuration: number; + reconstructPassedTime: number; } diff --git a/frontend/src/assets/styles/openmina.scss b/frontend/src/assets/styles/openmina.scss index 9abb09814..9b0e59963 100644 --- a/frontend/src/assets/styles/openmina.scss +++ b/frontend/src/assets/styles/openmina.scss @@ -1,3 +1,5 @@ +$side-panel-z-index: 1000; + $base-primary: var(--base-primary); $base-secondary: var(--base-secondary); $base-tertiary: var(--base-tertiary); diff --git a/frontend/src/environments/environment.compose.ts b/frontend/src/environments/environment.compose.ts new file mode 100644 index 000000000..d1c50b8c9 --- /dev/null +++ b/frontend/src/environments/environment.compose.ts @@ -0,0 +1,22 @@ +import { MinaEnv } from '@shared/types/core/environment/mina-env.type'; + +export const environment: Readonly = { + production: false, + identifier: 'Local FE', + globalConfig: { + features: { + dashboard: [], + nodes: ['overview', 'live', 'bootstrap'], + state: ['actions'], + network: ['node-dht', 'graph-overview', 'bootstrap-stats'], + snarks: ['scan-state'], + }, + }, + configs: [ + { + name: 'Compose rust node', + url: '/openmina-node', + }, + ], +}; + diff --git a/frontend/src/environments/environment.local.ts b/frontend/src/environments/environment.local.ts index 38633e3ca..8bd2f1be4 100644 --- a/frontend/src/environments/environment.local.ts +++ b/frontend/src/environments/environment.local.ts @@ -2,7 +2,7 @@ import { MinaEnv } from '@shared/types/core/environment/mina-env.type'; export const environment: Readonly = { production: false, - identifier: 'local', + identifier: 'Local FE', globalConfig: { features: { dashboard: [], diff --git a/frontend/src/environments/environment.prod.ts b/frontend/src/environments/environment.prod.ts index c0cf58c97..7b32cbbbf 100644 --- a/frontend/src/environments/environment.prod.ts +++ b/frontend/src/environments/environment.prod.ts @@ -2,12 +2,14 @@ import { MinaEnv } from '@shared/types/core/environment/mina-env.type'; export const environment: Readonly = { production: true, - identifier: 'Rust based node', + identifier: 'Rust based nodes', globalConfig: { features: { + dashboard: [], nodes: ['overview', 'live', 'bootstrap'], state: ['actions'], - snarks: ['scan-state', 'work-pool'], + network: ['node-dht', 'graph-overview', 'bootstrap-stats'], + snarks: ['scan-state'], }, }, configs: [ @@ -16,8 +18,10 @@ export const environment: Readonly = { url: 'http://1.k8.openmina.com:30252', memoryProfiler: 'http://1.k8.openmina.com:31164', features: { + dashboard: [], nodes: ['overview', 'live', 'bootstrap'], state: ['actions'], + network: ['node-dht', 'graph-overview', 'bootstrap-stats'], snarks: ['scan-state'], resources: ['memory'], }, @@ -27,42 +31,28 @@ export const environment: Readonly = { url: 'http://1.k8.openmina.com:31688', debugger: 'http://1.k8.openmina.com:31072', features: { + dashboard: [], nodes: ['overview', 'live', 'bootstrap'], state: ['actions'], - network: ['messages', 'connections', 'blocks'], + network: ['messages', 'connections', 'blocks', 'topology', 'node-dht', 'graph-overview', 'bootstrap-stats'], snarks: ['scan-state'], }, }, { name: 'feat/frontend-api-peers', - url: 'http://176.9.147.28:3000' + url: 'http://176.9.147.28:3000', }, { name: 'Snarker 1', url: 'http://webrtc2.webnode.openmina.com:10000', - features: { - nodes: ['overview', 'live', 'bootstrap'], - state: ['actions'], - snarks: ['scan-state', 'work-pool'], - }, }, { name: 'Snarker 2', url: 'http://webrtc3.webnode.openmina.com:10000', - features: { - nodes: ['overview', 'live', 'bootstrap'], - state: ['actions'], - snarks: ['scan-state', 'work-pool'], - }, }, { name: 'Snarker 3', url: 'http://webrtc4.webnode.openmina.com:10000', - features: { - nodes: ['overview', 'live', 'bootstrap'], - state: ['actions'], - snarks: ['scan-state', 'work-pool'], - }, }, ], }; diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index fe3f778c9..ef06ae4ac 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -2,7 +2,7 @@ import { MinaEnv } from '@shared/types/core/environment/mina-env.type'; export const environment: Readonly = { production: false, - identifier: 'local', + identifier: 'Development FE', globalConfig: { features: { dashboard: [], @@ -10,6 +10,7 @@ export const environment: Readonly = { state: ['actions'], network: ['messages', 'connections', 'blocks', 'topology', 'node-dht', 'graph-overview', 'bootstrap-stats'], snarks: ['scan-state' /*'work-pool'*/], + 'block-production': ['overview'], // 'testing-tool': ['scenarios'], }, }, diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 74bd1d7e8..daf8bf8cd 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -67,7 +67,10 @@ ], "@resources/*": [ "src/app/features/resources/*" - ] + ], + "@block-production": [ + "src/app/features/block-production/*" + ], } }, "angularCompilerOptions": { diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index b95c2a50c..9ec1bfdaa 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mina-tree" -version = "0.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0" diff --git a/macros/Cargo.toml b/macros/Cargo.toml new file mode 100644 index 000000000..e2499ba64 --- /dev/null +++ b/macros/Cargo.toml @@ -0,0 +1,20 @@ +[package] +name = "openmina-macros" +version = "0.3.1" +edition = "2021" +license = "Apache-2.0" +authors = [ "Alexander Koptelov " ] + +[lib] +proc-macro = true + +[dependencies] +proc-macro2 = "1.0.79" +quote = "1.0.35" +syn = "2.0.53" + +[dev-dependencies] +openmina-core = { path = "../core" } +tracing = "0.1.40" +rust-format = { version = "0.3", features = ["token_stream"] } +anyhow = "1.0.81" diff --git a/macros/src/action_event.md b/macros/src/action_event.md new file mode 100644 index 000000000..6267af32b --- /dev/null +++ b/macros/src/action_event.md @@ -0,0 +1,182 @@ +Derives `[openmina_core::ActionEvent]` trait implementation for action. + +### Action containers + +For action containers, it simply delegates to inner actions. + + +```rust +# use openmina_core::ActionEvent; +# +#[derive(ActionEvent)] +enum ActionContainer { + SubAction1(Action1), +} +#[derive(ActionEvent)] +enum Action1 { + Init, + Done, +} + +ActionContainer::SubAction1(Action1::Init).action_event(context); +``` + +```rust +impl ActionEvent for ActionContainer { + fn action_event(&self, context: &T) + where T: ActionContext + { + match self { + ActionContainer(action) => action.action_event(context), + } + } +} + +impl ActionEvent for Action1 { + fn action_event(&self, context: &T) + where T: ActionContext + { + match self { + Action1::Init => openmina_core::action_debug!(context), + Action1::Done => openmina_core::action_debug!(context), + } + } +} +``` + +### Tracing level + +By default, tracing event of level `debug` is generated for an action. It can be +overriden by using `#[action_event(level = ...)]` attribute. Also, actions that +names ends with `Error` or `Warn` will be traced with `warn` level. + +```rust +#[derive(openmina_core::ActionEvent)] +#[action_event(level = trace)] +pub enum Action { + ActionDefaultLevel, + #[action_event(level = warn)] + ActionOverrideLevel, + ActionWithError, + ActionWithWarn, +} +``` + +```rust +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + Action::ActionDefaultLevel => openmina_core::action_trace!(context), + Action::ActionOverrideLevel => openmina_core::action_warn!(context), + Action::ActionWithError => openmina_core::action_warn!(context), + Action::ActionWithWarn => openmina_core::action_warn!(context), + } + } +} +``` + +### Summary field + + +If an action has doc-comment, its first line will be used for `summary` field of +tracing events for the action. + +```rust +#[derive(openmina_core::ActionEvent)] +pub enum Action { + Unit, + /// documentation + UnitWithDoc, + /// Multiline documentation. + /// Another line. + /// + /// And another. + UnitWithMultilineDoc, +} +``` + +```rust +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + match self { + Action::Unit => openmina_core::action_debug!(context), + Action::UnitWithDoc => openmina_core::action_debug!(context, summary = "documentation"), + Action::UnitWithMultilineDoc => openmina_core::action_debug!(context, summary = "Multiline documentation"), + } + } +} +``` + +### Fields + +Certain fields can be added to the tracing event, using `#[action_event(fields(...))]` attribute. + +```rust +#[derive(openmina_core::ActionEvent)] +pub enum Action { + NoFields { f1: bool }, + #[action_event(fields(f1))] + Field { f1: bool }, + #[action_event(fields(f = f1))] + FieldWithName { f1: bool }, + #[action_event(fields(debug(f1)))] + DebugField { f1: bool }, + #[action_event(fields(display(f1)))] + DisplayField { f1: bool }, +} +``` + +```rust +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + match self { + Action::NoFields { f1 } => openmina_core::action_debug!(context), + Action::Field { f1 } => openmina_core::action_debug!(context, f1 = f1), + Action::FieldWithName { f1 } => openmina_core::action_debug!(context, f = f1), + Action::DebugField { f1 } => openmina_core::action_debug!(context, f1 = debug(f1)), + Action::DisplayField { f1 } => openmina_core::action_debug!(context, f1 = display(f1)), + } + } +} +``` + +### Logging using custom expression. + +When an action needs some custom logic to log (e.g. different logging basing on +a field's enum variant), logging can be delegated to a function implementing +that logic. + +```rust +#[derive(openmina_core::ActionEvent)] +pub enum Action { + #[action_event(expr(foo(context)))] + Unit, + #[action_event(expr(bar(context, f1)))] + Named { f1: bool }, +} +``` + +```rust +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + Action::Unit => foo(context), + Action::Named { f1 } => bar(context, f1), + } + } +} +``` diff --git a/macros/src/action_event.rs b/macros/src/action_event.rs new file mode 100644 index 000000000..12908e17d --- /dev/null +++ b/macros/src/action_event.rs @@ -0,0 +1,487 @@ +use std::convert::TryInto; + +use proc_macro2::*; +use quote::*; +use syn::*; + +#[derive(Clone, Debug)] +enum Level { + Error, + Warn, + Info, + Debug, + Trace, +} + +impl TryFrom for Level { + type Error = Error; + + fn try_from(value: Expr) -> Result { + let Expr::Path(ExprPath { path, .. }) = value else { + return Err(Error::new_spanned(value, "ident is expected")); + }; + let level = match path.require_ident()?.to_string().to_lowercase().as_str() { + "error" => Level::Error, + "warn" => Level::Warn, + "info" => Level::Info, + "debug" => Level::Debug, + "trace" => Level::Trace, + _ => return Err(Error::new_spanned(path, "incorrect value")), + }; + Ok(level) + } +} + +impl ToTokens for Level { + fn to_tokens(&self, tokens: &mut TokenStream) { + let ident = match self { + Level::Error => format_ident!("action_error"), + Level::Warn => format_ident!("action_warn"), + Level::Info => format_ident!("action_info"), + Level::Debug => format_ident!("action_debug"), + Level::Trace => format_ident!("action_trace"), + }; + tokens.extend(quote!(#ident)); + } +} + +#[derive(Clone, Debug)] +enum FieldsSpec { + /// List of expressions for fields to be added to the tracing, with + /// optional ident for filtering. + Some(Vec<(Option, TokenStream)>), +} + +#[derive(Clone, Debug, Default)] +struct ActionEventAttrs { + level: Option, + fields: Option, + expr: Option, +} + +pub fn expand(input: DeriveInput) -> Result { + let Data::Enum(enum_data) = &input.data else { + return Err(Error::new_spanned(input, "should be enum")); + }; + let type_name = &input.ident; + let trait_name = quote!(openmina_core::ActionEvent); // TODO + let input_attrs = action_event_attrs(&input.attrs)?; + let variants = enum_data + .variants + .iter() + .map(|v| { + let variant_name = &v.ident; + let mut args = vec![quote!(context)]; + let variant_attrs = action_event_attrs(&v.attrs)?; + match &v.fields { + Fields::Unnamed(fields) => { + if fields.unnamed.len() != 1 { + return Err(Error::new_spanned( + fields, + "only single-item variant supported", + )); + } + if fields.unnamed.len() != 1 { + return Err(Error::new_spanned( + fields, + "only single-item variant supported", + )); + } + Ok(quote! { + #type_name :: #variant_name (action) => action.action_event(#(#args),*), + }) + } + Fields::Named(fields_named) => { + let field_names = fields_named.named.iter().map(|named| &named.ident); + if let Some(expr) = variant_attrs.expr { + return Ok(quote! { + #type_name :: #variant_name { #(#field_names),* } => #expr, + }); + } + args.extend(summary_field(&v.attrs)?); + args.extend(fields(&variant_attrs.fields, &input_attrs.fields, fields_named)?); + let level = level(&variant_attrs.level, &v.ident, &input_attrs.level); + Ok(quote! { + #type_name :: #variant_name { #(#field_names),* } => openmina_core::#level!(#(#args),*), + }) + } + Fields::Unit => { + if let Some(expr) = variant_attrs.expr { + return Ok(quote! { + #type_name :: #variant_name => #expr, + }); + } + args.extend(summary_field(&v.attrs)?); + let level = level(&variant_attrs.level, &v.ident, &input_attrs.level); + Ok(quote! { + #type_name :: #variant_name => openmina_core::#level!(#(#args),*), + }) + } + } + }) + .collect::>>()?; + + Ok(quote! { + impl #trait_name for #type_name { + fn action_event(&self, context: &T) + where T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + #(#variants)* + } + } + } + }) +} + +fn level(variant_level: &Option, variant_name: &Ident, enum_level: &Option) -> Level { + variant_level + .as_ref() + .cloned() + .or_else(|| { + let s = variant_name.to_string(); + (s.ends_with("Error") || s.ends_with("Warn")).then_some(Level::Warn) + }) + .or_else(|| enum_level.as_ref().cloned()) + .unwrap_or(Level::Debug) +} + +fn fields( + variant_fields: &Option, + enum_fields: &Option, + fields: &FieldsNamed, +) -> Result> { + variant_fields + .as_ref() + .or(enum_fields.as_ref()) + .map_or_else(|| Ok(Vec::new()), |f| filter_fields(f, fields)) +} + +fn filter_fields(field_spec: &FieldsSpec, fields: &FieldsNamed) -> Result> { + match field_spec { + FieldsSpec::Some(f) => f + .iter() + .filter(|(name, _)| { + name.as_ref().map_or(true, |name| { + fields.named.iter().any(|n| Some(name) == n.ident.as_ref()) + }) + }) + .map(|(_, expr)| Ok(expr.clone())) + .collect(), + } +} + +fn action_event_attrs(attrs: &Vec) -> Result { + attrs + .iter() + .filter(|attr| attr.path().is_ident("action_event")) + .try_fold(ActionEventAttrs::default(), |mut attrs, attr| { + let nested = + attr.parse_args_with(punctuated::Punctuated::::parse_terminated)?; + nested.into_iter().try_for_each(|meta| { + match meta { + // #[level = ...] + Meta::NameValue(name_value) if name_value.path.is_ident("level") => { + let _ = attrs.level.insert(name_value.value.try_into()?); + } + // #[expr(...)] + Meta::List(list) if list.path.is_ident("expr") => { + let _ = attrs.expr.insert(list.parse_args::()?); + } + // #[fields(...)] + Meta::List(list) if list.path.is_ident("fields") => { + let nested = list.parse_args_with( + punctuated::Punctuated::::parse_terminated, + )?; + let fields = nested + .iter() + .map(|meta| { + match meta { + // field + Meta::Path(path) => { + let ident = path.require_ident()?; + Ok((Some(ident.clone()), quote!(#ident = #ident))) + } + // field = expr + Meta::NameValue(name_value) => { + let event_field = name_value.path.require_ident()?; + let expr = &name_value.value; + let maybe_field = get_field_name(expr); + Ok((maybe_field.cloned(), quote!(#event_field = #expr))) + } + // debug(field) + // display(field) + Meta::List(list) + if list.path.is_ident("debug") + || list.path.is_ident("display") => + { + let conv = list.path.require_ident()?; + let Expr::Path(field) = list.parse_args::()? else { + return Err(Error::new_spanned( + list, + "identifier is expected", + )); + }; + let field = field.path.require_ident()?; + Ok((Some(field.clone()), quote!(#field = #conv(#field)))) + } + _ => Err(Error::new_spanned(meta, "unrecognized repr")), + } + }) + .collect::>>()?; + let _ = attrs.fields.insert(FieldsSpec::Some(fields)); + } + _ => return Err(Error::new_spanned(meta, "unrecognized repr")), + } + Ok(()) + })?; + Ok(attrs) + }) +} + +fn get_field_name(expr: &Expr) -> Option<&Ident> { + match expr { + Expr::Path(path) => path.path.require_ident().ok(), + Expr::Field(field) => get_field_name(&field.base), + Expr::Reference(reference) => get_field_name(&reference.expr), + Expr::Unary(ExprUnary { expr, .. }) => get_field_name(expr), + Expr::Call(call) => match call.func.as_ref() { + Expr::Path(path) if path.path.is_ident("display") || path.path.is_ident("debug") => { + call.args.first().and_then(|arg| get_field_name(arg)) + } + Expr::Field(field) => get_field_name(&field.base), + _ => None, + }, + _ => None, + } +} + +fn summary_field(attrs: &Vec) -> Result> { + let Some(doc_attr) = attrs.iter().find(|attr| attr.path().is_ident("doc")) else { + return Ok(None); + }; + let name_value = doc_attr.meta.require_name_value()?; + let Expr::Lit(ExprLit { + lit: Lit::Str(lit), .. + }) = &name_value.value + else { + return Ok(None); + }; + let value = lit.value(); + let trimmed = value.trim(); + let stripped = trimmed.strip_suffix('.').unwrap_or(trimmed); + Ok(Some(quote!(summary = #stripped))) +} + +#[cfg(test)] +mod tests { + use rust_format::{Formatter, RustFmt}; + + fn test(input: &str, expected: &str) -> anyhow::Result<()> { + let fmt = RustFmt::default(); + + let expected = fmt.format_str(expected)?; + let input = syn::parse_str::(input)?; + let output = super::expand(input)?; + let output = fmt.format_tokens(output)?; + assert_eq!( + output, expected, + "\n<<<<<<\n{}======\n{}>>>>>>", + output, expected + ); + Ok(()) + } + + #[test] + fn test_delegate() -> anyhow::Result<()> { + let input = r#" +#[derive(openmina_core::ActionEvent)] +pub enum SuperAction { + Sub1(SubAction1), + Sub2(SubAction2), +} +"#; + let expected = r#" +impl openmina_core::ActionEvent for SuperAction { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + SuperAction::Sub1(action) => action.action_event(context), + SuperAction::Sub2(action) => action.action_event(context), + } + } +} +"#; + test(input, expected) + } + + #[test] + fn test_unit() -> anyhow::Result<()> { + let input = r#" +#[derive(openmina_core::ActionEvent)] +pub enum Action { + Unit, + /// documentation + UnitWithDoc, + /// Multiline documentation. + /// Another line. + /// + /// And another. + UnitWithMultilineDoc, +} +"#; + let expected = r#" +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + Action::Unit => openmina_core::action_debug!(context), + Action::UnitWithDoc => openmina_core::action_debug!(context, summary = "documentation"), + Action::UnitWithMultilineDoc => openmina_core::action_debug!(context, summary = "Multiline documentation"), + } + } +} +"#; + test(input, expected) + } + + #[test] + fn test_level() -> anyhow::Result<()> { + let input = r#" +#[derive(openmina_core::ActionEvent)] +#[action_event(level = trace)] +pub enum Action { + ActionDefaultLevel, + #[action_event(level = warn)] + ActionOverrideLevel, + ActionWithError, + ActionWithWarn, +} +"#; + let expected = r#" +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + Action::ActionDefaultLevel => openmina_core::action_trace!(context), + Action::ActionOverrideLevel => openmina_core::action_warn!(context), + Action::ActionWithError => openmina_core::action_warn!(context), + Action::ActionWithWarn => openmina_core::action_warn!(context), + } + } +} +"#; + test(input, expected) + } + + #[test] + fn test_fields() -> anyhow::Result<()> { + let input = r#" +#[derive(openmina_core::ActionEvent)] +pub enum Action { + NoFields { f1: bool }, + #[action_event(fields(f1))] + Field { f1: bool }, + #[action_event(fields(f = f1))] + FieldWithName { f1: bool }, + #[action_event(fields(f = f.subfield))] + FieldExpr { f: WithSubfield }, + #[action_event(fields(f = display(f.subfield)))] + FieldDisplayExpr { f: WithSubfield }, + #[action_event(fields(debug(f1)))] + DebugField { f1: bool }, + #[action_event(fields(display(f1)))] + DisplayField { f1: bool }, +} +"#; + let expected = r#" +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + Action::NoFields { f1 } => openmina_core::action_debug!(context), + Action::Field { f1 } => openmina_core::action_debug!(context, f1 = f1), + Action::FieldWithName { f1 } => openmina_core::action_debug!(context, f = f1), + Action::FieldExpr { f } => openmina_core::action_debug!(context, f = f.subfield), + Action::FieldDisplayExpr { f } => openmina_core::action_debug!(context, f = display(f.subfield)), + Action::DebugField { f1 } => openmina_core::action_debug!(context, f1 = debug(f1)), + Action::DisplayField { f1 } => openmina_core::action_debug!(context, f1 = display(f1)), + } + } +} +"#; + test(input, expected) + } + + #[test] + fn test_filtered_fields() -> anyhow::Result<()> { + let input = r#" +#[derive(openmina_core::ActionEvent)] +#[action_event(fields(f1, f2 = f2.sub, f3 = display(f3.sub), f4 = foo()))] +pub enum Action { + Unit, + AllFields { f1: bool, f2: WithSub, f3: WithSub }, + OnlyF1 { f1: bool }, + WithF3 { f1: bool, f3: WithSub }, +} +"#; + let expected = r#" +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + Action::Unit => openmina_core::action_debug!(context), + Action::AllFields { f1, f2, f3 } => openmina_core::action_debug!(context, f1 = f1, f2 = f2.sub, f3 = display(f3.sub), f4 = foo()), + Action::OnlyF1 { f1 } => openmina_core::action_debug!(context, f1 = f1, f4 = foo()), + Action::WithF3 { f1, f3 } => openmina_core::action_debug!(context, f1 = f1, f3 = display(f3.sub), f4 = foo()), + } + } +} +"#; + test(input, expected) + } + + #[test] + fn test_call() -> anyhow::Result<()> { + let input = r#" +#[derive(openmina_core::ActionEvent)] +pub enum Action { + #[action_event(expr(foo(context)))] + Unit, + #[action_event(expr(foo(context, f1)))] + Named { f1: bool }, +} +"#; + let expected = r#" +impl openmina_core::ActionEvent for Action { + fn action_event(&self, context: &T) + where + T: openmina_core::log::EventContext, + { + #[allow(unused_variables)] + match self { + Action::Unit => foo(context), + Action::Named { f1 } => foo(context, f1), + } + } +} +"#; + test(input, expected) + } +} diff --git a/macros/src/lib.rs b/macros/src/lib.rs new file mode 100644 index 000000000..7181354e2 --- /dev/null +++ b/macros/src/lib.rs @@ -0,0 +1,11 @@ +#[doc = include_str!("action_event.md")] +#[proc_macro_derive(ActionEvent, attributes(action_event))] +pub fn action_event(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + let input = syn::parse_macro_input!(input as syn::DeriveInput); + match action_event::expand(input) { + Ok(tokens) => tokens.into(), + Err(err) => err.to_compile_error().into(), + } +} + +mod action_event; diff --git a/node/Cargo.toml b/node/Cargo.toml index 1e460b979..4d53bc1b0 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "node" -version = "0.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0" diff --git a/node/invariants/Cargo.toml b/node/invariants/Cargo.toml index 74c8c7e23..e8e5f127f 100644 --- a/node/invariants/Cargo.toml +++ b/node/invariants/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-invariants" -version = "0.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0" diff --git a/node/native/Cargo.toml b/node/native/Cargo.toml index ea9120b46..9ed654bee 100644 --- a/node/native/Cargo.toml +++ b/node/native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-native" -version = "0.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0" diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index 09e0cf379..a9d8eeaf2 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -223,8 +223,8 @@ pub enum ActionKind { P2pNetworkKademliaStreamOutgoingDataReady, P2pNetworkKademliaStreamPrune, P2pNetworkKademliaStreamRemoteClose, - P2pNetworkKademliaStreamSendReply, P2pNetworkKademliaStreamSendRequest, + P2pNetworkKademliaStreamSendResponse, P2pNetworkKademliaStreamWaitIncoming, P2pNetworkKademliaStreamWaitOutgoing, P2pNetworkNoiseDecryptedData, @@ -1117,7 +1117,7 @@ impl ActionKindGet for P2pNetworkKademliaAction { ActionKind::P2pNetworkKademliaUpdateFindNodeRequest } Self::StartBootstrap { .. } => ActionKind::P2pNetworkKademliaStartBootstrap, - Self::BootstrapFinished { .. } => ActionKind::P2pNetworkKademliaBootstrapFinished, + Self::BootstrapFinished => ActionKind::P2pNetworkKademliaBootstrapFinished, } } } @@ -1153,13 +1153,13 @@ impl ActionKindGet for P2pNetworkKademliaStreamAction { match self { Self::New { .. } => ActionKind::P2pNetworkKademliaStreamNew, Self::IncomingData { .. } => ActionKind::P2pNetworkKademliaStreamIncomingData, + Self::RemoteClose { .. } => ActionKind::P2pNetworkKademliaStreamRemoteClose, + Self::WaitIncoming { .. } => ActionKind::P2pNetworkKademliaStreamWaitIncoming, Self::WaitOutgoing { .. } => ActionKind::P2pNetworkKademliaStreamWaitOutgoing, Self::SendRequest { .. } => ActionKind::P2pNetworkKademliaStreamSendRequest, - Self::SendReply { .. } => ActionKind::P2pNetworkKademliaStreamSendReply, + Self::SendResponse { .. } => ActionKind::P2pNetworkKademliaStreamSendResponse, Self::OutgoingDataReady { .. } => ActionKind::P2pNetworkKademliaStreamOutgoingDataReady, - Self::WaitIncoming { .. } => ActionKind::P2pNetworkKademliaStreamWaitIncoming, Self::Close { .. } => ActionKind::P2pNetworkKademliaStreamClose, - Self::RemoteClose { .. } => ActionKind::P2pNetworkKademliaStreamRemoteClose, Self::Prune { .. } => ActionKind::P2pNetworkKademliaStreamPrune, } } diff --git a/node/src/block_producer/block_producer_actions.rs b/node/src/block_producer/block_producer_actions.rs index 9a04133b0..328cda610 100644 --- a/node/src/block_producer/block_producer_actions.rs +++ b/node/src/block_producer/block_producer_actions.rs @@ -1,5 +1,6 @@ use mina_p2p_messages::v2::MinaBaseProofStableV2; use openmina_core::block::ArcBlockWithHash; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use super::vrf_evaluator::BlockProducerVrfEvaluatorAction; @@ -11,13 +12,24 @@ use super::{ pub type BlockProducerActionWithMeta = redux::ActionWithMeta; pub type BlockProducerActionWithMetaRef<'a> = redux::ActionWithMeta<&'a BlockProducerAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(level = trace)] pub enum BlockProducerAction { VrfEvaluator(BlockProducerVrfEvaluatorAction), BestTipUpdate { best_tip: ArcBlockWithHash, }, WonSlotSearch, + #[action_event( + level = info, + fields( + slot = won_slot.global_slot.slot_number.as_u32(), + slot_time = openmina_core::log::to_rfc_3339(won_slot.slot_time) + .unwrap_or_else(|_| "".to_owned()), + current_time = openmina_core::log::to_rfc_3339(context.timestamp()) + .unwrap_or_else(|_| "".to_owned()), + ) + )] WonSlot { won_slot: BlockProducerWonSlot, }, diff --git a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs index 58c48e77d..c2e15e5df 100644 --- a/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs +++ b/node/src/block_producer/vrf_evaluator/block_producer_vrf_evaluator_actions.rs @@ -5,9 +5,12 @@ use mina_p2p_messages::v2::{ ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1, ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1, LedgerHash, }; +use openmina_core::action_info; use openmina_core::block::ArcBlockWithHash; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use vrf::VrfEvaluationOutput; +use vrf::VrfWonSlot; use super::{EpochData, VrfEvaluatorInput}; @@ -16,21 +19,26 @@ pub type BlockProducerVrfEvaluatorActionWithMeta = pub type BlockProducerVrfEvaluatorActionWithMetaRef<'a> = redux::ActionWithMeta<&'a BlockProducerVrfEvaluatorAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(level = info)] pub enum BlockProducerVrfEvaluatorAction { - EvaluateSlot { - vrf_input: VrfEvaluatorInput, - }, + /// Vrf Evaluation requested. + #[action_event(fields(debug(vrp_input)))] + EvaluateSlot { vrf_input: VrfEvaluatorInput }, + /// Evaluation successful. + #[action_event(expr(log_vrf_output(context, vrf_output)))] ProcessSlotEvaluationSuccess { vrf_output: VrfEvaluationOutput, staking_ledger_hash: LedgerHash, }, - InitializeEvaluator { - best_tip: ArcBlockWithHash, - }, + #[action_event(level = trace)] + InitializeEvaluator { best_tip: ArcBlockWithHash }, + /// Checking possible Vrf evaluations. FinalizeEvaluatorInitialization { previous_epoch_and_height: Option<(u32, u32)>, }, + /// Checking possible Vrf evaluations. + #[action_event(level = info, fields(current_epoch_number, current_best_tip_slot, current_best_tip_global_slot))] CheckEpochEvaluability { current_epoch_number: u32, current_best_tip_height: u32, @@ -41,6 +49,8 @@ pub enum BlockProducerVrfEvaluatorAction { next_epoch_data: ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1, transition_frontier_size: u32, }, + /// Initalize epoch vrf evaluation. + #[action_event(level = info, fields(current_epoch_number, current_best_tip_slot, current_best_tip_global_slot))] InitializeEpochEvaluation { current_epoch_number: u32, current_best_tip_slot: u32, @@ -51,6 +61,8 @@ pub enum BlockProducerVrfEvaluatorAction { producer: AccountPublicKey, transition_frontier_size: u32, }, + /// Constructing delegator table. + #[action_event(level = info, fields(current_epoch_number, current_best_tip_slot, current_best_tip_global_slot))] BeginDelegatorTableConstruction { staking_epoch_data: EpochData, producer: AccountPublicKey, @@ -61,6 +73,8 @@ pub enum BlockProducerVrfEvaluatorAction { next_epoch_first_slot: u32, transition_frontier_size: u32, }, + /// Delegator table constructed. + #[action_event(level = info, fields(current_epoch_number, current_best_tip_slot, current_best_tip_global_slot))] FinalizeDelegatorTableConstruction { staking_epoch_data: EpochData, producer: AccountPublicKey, @@ -71,6 +85,8 @@ pub enum BlockProducerVrfEvaluatorAction { next_epoch_first_slot: u32, transition_frontier_size: u32, }, + /// Selecting starting slot. + #[action_event(level = info, fields(current_global_slot, current_best_tip_height))] SelectInitialSlot { current_global_slot: u32, current_best_tip_height: u32, @@ -80,6 +96,8 @@ pub enum BlockProducerVrfEvaluatorAction { staking_epoch_data: EpochData, next_epoch_first_slot: u32, }, + /// Starting epoch evaluation. + #[action_event(level = info, fields(current_epoch_number, current_best_tip_slot, current_best_tip_global_slot))] BeginEpochEvaluation { current_best_tip_height: u32, current_best_tip_slot: u32, @@ -88,18 +106,25 @@ pub enum BlockProducerVrfEvaluatorAction { staking_epoch_data: EpochData, latest_evaluated_global_slot: u32, }, + /// Saving last block height in epoch. + #[action_event(level = info, fields(epoch_number, last_block_height))] RecordLastBlockHeightInEpoch { epoch_number: u32, last_block_height: u32, }, + #[action_event(level = trace)] ContinueEpochEvaluation { latest_evaluated_global_slot: u32, epoch_number: u32, }, + /// Epoch evaluation finished. + #[action_event(level = info, fields(epoch_number, latest_evaluated_global_slot))] FinishEpochEvaluation { epoch_number: u32, latest_evaluated_global_slot: u32, }, + /// Waiting for epoch to evaluate. + #[action_event(level = info, fields(current_epoch_number, current_best_tip_height))] WaitForNextEvaluation { current_epoch_number: u32, current_best_tip_height: u32, @@ -108,13 +133,15 @@ pub enum BlockProducerVrfEvaluatorAction { last_epoch_block_height: Option, transition_frontier_size: u32, }, + /// Checking epoch bounds. + #[action_event(level = trace)] CheckEpochBounds { epoch_number: u32, latest_evaluated_global_slot: u32, }, - CleanupOldSlots { - current_epoch_number: u32, - }, + /// Cleaning up old won slots. + #[action_event(level = trace)] + CleanupOldSlots { current_epoch_number: u32 }, } impl redux::EnablingCondition for BlockProducerVrfEvaluatorAction { @@ -217,3 +244,24 @@ impl From for crate::Action { Self::BlockProducer(crate::BlockProducerAction::VrfEvaluator(value)) } } + +fn log_vrf_output(context: &T, vrf_output: &VrfEvaluationOutput) +where + T: openmina_core::log::EventContext, +{ + match vrf_output { + VrfEvaluationOutput::SlotWon(VrfWonSlot { + global_slot, + vrf_output, + .. + }) => action_info!( + context, + summary = "Slot evaluation result - won slot", + global_slot, + vrf_output = display(vrf_output) + ), + VrfEvaluationOutput::SlotLost(_) => { + action_info!(context, summary = "Slot evaluation result - lost slot") + } + } +} diff --git a/node/src/external_snark_worker/external_snark_worker_actions.rs b/node/src/external_snark_worker/external_snark_worker_actions.rs index cca543aa5..776b231e4 100644 --- a/node/src/external_snark_worker/external_snark_worker_actions.rs +++ b/node/src/external_snark_worker/external_snark_worker_actions.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use openmina_core::snark::SnarkJobId; +use openmina_core::{snark::SnarkJobId, ActionEvent}; use redux::{EnablingCondition, Timestamp}; use serde::{Deserialize, Serialize}; @@ -11,7 +11,8 @@ use super::{ SnarkWorkResult, }; -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, ActionEvent)] +#[action_event(fields(display(job_id), display(error)))] pub enum ExternalSnarkWorkerAction { Start, Started, diff --git a/node/src/logger/logger_effects.rs b/node/src/logger/logger_effects.rs index 15d93b510..03a158c9c 100644 --- a/node/src/logger/logger_effects.rs +++ b/node/src/logger/logger_effects.rs @@ -1,1448 +1,89 @@ -use p2p::P2pNetworkConnectionCloseReason; +use openmina_core::log::inner::field::{display, DisplayValue}; +use openmina_core::log::inner::Value; +use openmina_core::log::{time_to_str, ActionEvent, EventContext}; +use p2p::PeerId; -use crate::block_producer::vrf_evaluator::BlockProducerVrfEvaluatorAction; -use crate::p2p::channels::best_tip::P2pChannelsBestTipAction; -use crate::p2p::channels::rpc::P2pChannelsRpcAction; -use crate::p2p::channels::snark::P2pChannelsSnarkAction; -use crate::p2p::channels::snark_job_commitment::P2pChannelsSnarkJobCommitmentAction; use crate::p2p::channels::P2pChannelsAction; -use crate::p2p::connection::incoming::P2pConnectionIncomingAction; -use crate::p2p::connection::outgoing::P2pConnectionOutgoingAction; use crate::p2p::connection::P2pConnectionAction; -use crate::p2p::disconnection::P2pDisconnectionAction; -use crate::p2p::discovery::P2pDiscoveryAction; -use crate::p2p::network::{ - noise::P2pNetworkNoiseAction, pnet::P2pNetworkPnetAction, rpc::P2pNetworkRpcAction, - scheduler::P2pNetworkSchedulerAction, select::P2pNetworkSelectAction, - yamux::P2pNetworkYamuxAction, P2pNetworkAction, SelectKind, -}; +use crate::p2p::network::P2pNetworkAction; use crate::p2p::P2pAction; -use crate::snark::work_verify::SnarkWorkVerifyAction; use crate::snark::SnarkAction; -use crate::transition_frontier::genesis::TransitionFrontierGenesisAction; -use crate::transition_frontier::sync::TransitionFrontierSyncAction; -use crate::transition_frontier::TransitionFrontierAction; -use crate::{Action, ActionWithMetaRef, BlockProducerAction, Service, Store}; +use crate::{Action, ActionKind, ActionWithMetaRef, Service, Store}; + +struct ActionLoggerContext { + time: redux::Timestamp, + time_str: String, + node_id: DisplayValue, + kind: DisplayValue, +} + +impl ActionLoggerContext { + fn new(time: redux::Timestamp, node_id: PeerId, kind: ActionKind) -> Self { + ActionLoggerContext { + time, + time_str: time_to_str(time), + node_id: display(node_id), + kind: display(kind), + } + } +} + +impl EventContext for ActionLoggerContext { + fn timestamp(&self) -> redux::Timestamp { + self.time + } + + fn time(&self) -> &'_ dyn Value { + &self.time_str + } + + fn node_id(&self) -> &'_ dyn Value { + &self.node_id + } + + fn kind(&self) -> &'_ dyn Value { + &self.kind + } +} pub fn logger_effects(store: &Store, action: ActionWithMetaRef<'_>) { let (action, meta) = action.split(); - let kind = action.kind(); - - let node_id = store.state().p2p.my_id().to_string(); - // let _guard = openmina_core::log::create_span(&peer_id).entered(); + let context = ActionLoggerContext::new(meta.time(), store.state().p2p.my_id(), action.kind()); match action { Action::P2p(action) => match action { - P2pAction::Listen(action) => match action { - p2p::listen::P2pListenAction::New { listener_id, addr } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("addr: {addr}"), - addr = addr.to_string(), - listener_id = listener_id.to_string(), - ); - } - p2p::listen::P2pListenAction::Expired { listener_id, addr } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("addr: {addr}"), - addr = addr.to_string(), - listener_id = listener_id.to_string(), - ); - } - p2p::listen::P2pListenAction::Error { listener_id, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("id: {listener_id}, error: {error}"), - error = error, - listener_id = listener_id.to_string(), - ); - } - p2p::listen::P2pListenAction::Closed { listener_id, error } => { - if let Some(error) = error { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("id: {listener_id}, error: {error}"), - error = error, - listener_id = listener_id.to_string(), - ); - } else { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("id: {listener_id},"), - listener_id = listener_id.to_string(), - ); - } - } - }, + P2pAction::Listen(action) => action.action_event(&context), P2pAction::Connection(action) => match action { - P2pConnectionAction::Outgoing(action) => match action { - P2pConnectionOutgoingAction::RandomInit => {} - P2pConnectionOutgoingAction::Init { opts, .. } => { - let peer_id = opts.peer_id(); - openmina_core::log::info!( - meta.time(); - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - transport = opts.kind(), - ); - } - P2pConnectionOutgoingAction::Reconnect { opts, .. } => { - let peer_id = opts.peer_id(); - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - transport = opts.kind(), - ); - } - P2pConnectionOutgoingAction::OfferSdpCreatePending { .. } => {} - P2pConnectionOutgoingAction::OfferSdpCreateError { peer_id, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - error = error.clone(), - ); - } - P2pConnectionOutgoingAction::OfferSdpCreateSuccess { peer_id, sdp } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - sdp = sdp.clone(), - ); - } - P2pConnectionOutgoingAction::OfferReady { peer_id, offer } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - offer = serde_json::to_string(offer).ok() - ); - } - P2pConnectionOutgoingAction::OfferSendSuccess { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - ); - } - P2pConnectionOutgoingAction::AnswerRecvPending { .. } => {} - P2pConnectionOutgoingAction::AnswerRecvError { peer_id, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - error = format!("{:?}", error), - ); - } - P2pConnectionOutgoingAction::AnswerRecvSuccess { peer_id, answer } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - trace_answer = serde_json::to_string(answer).ok() - ); - } - P2pConnectionOutgoingAction::FinalizePending { .. } => {} - P2pConnectionOutgoingAction::FinalizeError { peer_id, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - error = error.clone(), - ); - } - P2pConnectionOutgoingAction::FinalizeSuccess { peer_id } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - P2pConnectionOutgoingAction::Timeout { peer_id } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - P2pConnectionOutgoingAction::Error { peer_id, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - error = format!("{:?}", error), - ); - } - P2pConnectionOutgoingAction::Success { peer_id } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - }, - P2pConnectionAction::Incoming(action) => match action { - P2pConnectionIncomingAction::Init { opts, .. } => { - let peer_id = opts.peer_id; - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - trace_signaling = format!("{:?}", opts.signaling), - ); - } - P2pConnectionIncomingAction::AnswerSdpCreatePending { .. } => {} - P2pConnectionIncomingAction::AnswerSdpCreateError { peer_id, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - error = format!("{:?}", error), - ); - } - P2pConnectionIncomingAction::AnswerSdpCreateSuccess { peer_id, sdp } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - trace_sdp = sdp.clone(), - ); - } - P2pConnectionIncomingAction::AnswerReady { peer_id, answer } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - trace_answer = serde_json::to_string(answer).ok() - ); - } - P2pConnectionIncomingAction::AnswerSendSuccess { peer_id } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - ); - } - P2pConnectionIncomingAction::FinalizePending { .. } => {} - P2pConnectionIncomingAction::FinalizeError { peer_id, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - error = format!("{:?}", error), - ); - } - P2pConnectionIncomingAction::FinalizeSuccess { peer_id } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - ); - } - P2pConnectionIncomingAction::Timeout { peer_id } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - ); - } - P2pConnectionIncomingAction::Error { peer_id, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - error = format!("{:?}", error), - ); - } - P2pConnectionIncomingAction::Success { peer_id } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - ); - } - P2pConnectionIncomingAction::Libp2pReceived { peer_id } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - ); - } - }, - }, - P2pAction::Disconnection(action) => match action { - P2pDisconnectionAction::Init { peer_id, reason } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string(), - reason = format!("{:?}", reason) - ); - } - P2pDisconnectionAction::Finish { peer_id } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - }, - P2pAction::Discovery(action) => match action { - P2pDiscoveryAction::Init { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - P2pDiscoveryAction::Success { peer_id, .. } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - P2pDiscoveryAction::KademliaBootstrap => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("bootstrap kademlia"), - ); - } - P2pDiscoveryAction::KademliaInit => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("find node"), - ); - } - P2pDiscoveryAction::KademliaAddRoute { peer_id, addresses } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("add route {peer_id} {:?}", addresses.first()), - ); - } - P2pDiscoveryAction::KademliaSuccess { peers } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peers: {:?}", peers), - ); - } - P2pDiscoveryAction::KademliaFailure { description } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("{:?}", description), - ); - } + P2pConnectionAction::Outgoing(action) => action.action_event(&context), + P2pConnectionAction::Incoming(action) => action.action_event(&context), }, + P2pAction::Disconnection(action) => action.action_event(&context), + P2pAction::Discovery(action) => action.action_event(&context), P2pAction::Channels(action) => match action { - P2pChannelsAction::MessageReceived(_) => {} - P2pChannelsAction::BestTip(action) => match action { - P2pChannelsBestTipAction::Init { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - P2pChannelsBestTipAction::Ready { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - _ => {} - }, - P2pChannelsAction::Snark(action) => match action { - P2pChannelsSnarkAction::Init { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - P2pChannelsSnarkAction::Ready { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - _ => {} - }, - P2pChannelsAction::SnarkJobCommitment(action) => match action { - P2pChannelsSnarkJobCommitmentAction::Init { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {}", peer_id), - peer_id = peer_id.to_string() - ); - } - P2pChannelsSnarkJobCommitmentAction::Ready { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {}", peer_id), - peer_id = peer_id.to_string() - ); - } - _ => {} - }, - P2pChannelsAction::Rpc(action) => match action { - P2pChannelsRpcAction::Init { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - P2pChannelsRpcAction::Ready { peer_id } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}"), - peer_id = peer_id.to_string() - ); - } - P2pChannelsRpcAction::RequestSend { - peer_id, - id, - request, - } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}, rpc_id: {id}, kind: {:?}", request.kind()), - peer_id = peer_id.to_string(), - rpc_id = id.to_string(), - trace_request = serde_json::to_string(request).ok() - ); - } - P2pChannelsRpcAction::ResponseReceived { - peer_id, - id, - response, - } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("peer_id: {peer_id}, rpc_id: {id}"), - peer_id = peer_id.to_string(), - rpc_id = id.to_string(), - trace_response = serde_json::to_string(response).ok() - ); - } - _ => {} - }, + P2pChannelsAction::MessageReceived(action) => action.action_event(&context), + P2pChannelsAction::BestTip(action) => action.action_event(&context), + P2pChannelsAction::Snark(action) => action.action_event(&context), + P2pChannelsAction::SnarkJobCommitment(action) => action.action_event(&context), + P2pChannelsAction::Rpc(action) => action.action_event(&context), }, - P2pAction::Peer(_) => {} - // TODO: + P2pAction::Peer(action) => action.action_event(&context), P2pAction::Network(action) => match action { - P2pNetworkAction::Scheduler(action) => match action { - P2pNetworkSchedulerAction::InterfaceDetected { ip } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("ip: {}", ip), - ); - } - P2pNetworkSchedulerAction::InterfaceExpired { ip } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("ip: {}", ip), - ); - } - P2pNetworkSchedulerAction::IncomingDidAccept { addr, result } => match result { - Ok(()) => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.as_ref().unwrap().to_string(), - ), - Err(err) => openmina_core::log::error!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - err = err, - ), - }, - P2pNetworkSchedulerAction::OutgoingDidConnect { addr, result } => { - match result { - Ok(()) => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - ), - Err(err) => openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - err = err, - ), - } - } - P2pNetworkSchedulerAction::SelectDone { - addr, - kind: select_kind, - protocol, - incoming, - } if protocol.is_some() => match select_kind { - SelectKind::Authentication => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("authentication on addr: {}", addr), - negotiated = format!("{:?}", protocol), - incoming = incoming, - ) - } - SelectKind::MultiplexingNoPeerId => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("multiplexing on addr: {}", addr), - negotiated = format!("{:?}", protocol), - incoming = incoming, - ) - } - SelectKind::Multiplexing(peer_id) => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("multiplexing on addr: {}", addr), - peer_id = peer_id.to_string(), - negotiated = format!("{:?}", protocol), - incoming = incoming, - ) - } - SelectKind::Stream(peer_id, stream_id) => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("stream on addr: {}", addr), - peer_id = peer_id.to_string(), - stream_id = stream_id, - negotiated = format!("{:?}", protocol), - incoming = incoming, - ) - } - }, - P2pNetworkSchedulerAction::SelectError { - addr, - kind: select_kind, - error, - } => match select_kind { - SelectKind::Authentication => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - error = error, - summary = format!("failed select authentication on addr {}: {}", addr, error), - ) - } - SelectKind::MultiplexingNoPeerId => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - error = error, - summary = format!("failed select multiplexing on addr {}: {}", addr, error), - ) - } - SelectKind::Multiplexing(peer_id) => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - error = error, - summary = format!("failed select multiplexing on addr {}: {}", addr, error), - peer_id = peer_id.to_string(), - ) - } - SelectKind::Stream(peer_id, stream_id) => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - error = error, - summary = format!("failed select stream on addr {}: {}", addr, error), - peer_id = peer_id.to_string(), - stream_id = stream_id, - ) - } - }, - P2pNetworkSchedulerAction::Disconnect { addr, reason } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("disconnecting peer {addr}: {reason}"), - addr = openmina_core::log::inner::field::display(addr), - reason = openmina_core::log::inner::field::display(reason), - ) - } - P2pNetworkSchedulerAction::Error { addr, error } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("disconnecting peer {addr}: {error}"), - addr = openmina_core::log::inner::field::display(addr), - error = openmina_core::log::inner::field::display(error), - ) - } - P2pNetworkSchedulerAction::Disconnected { addr, reason } => match reason { - P2pNetworkConnectionCloseReason::Disconnect(reason) => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("disconnected peer {addr}: {reason}"), - addr = openmina_core::log::inner::field::display(addr), - reason = openmina_core::log::inner::field::display(reason), - ) - } - P2pNetworkConnectionCloseReason::Error(error) => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("disconnected peer {addr}: {error}"), - addr = openmina_core::log::inner::field::display(addr), - error = openmina_core::log::inner::field::display(error), - ) - } - }, - _ => {} - }, - P2pNetworkAction::Pnet(action) => match action { - P2pNetworkPnetAction::SetupNonce { addr, incoming, .. } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - incoming = incoming, - ) - } - _ => {} - }, - P2pNetworkAction::Select(action) => match action { - P2pNetworkSelectAction::Init { - addr, - kind: select_kind, - incoming, - .. - } => match select_kind { - SelectKind::Authentication => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("authentication on addr: {}", addr), - incoming = incoming, - ) - } - SelectKind::MultiplexingNoPeerId => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("multiplexing on addr: {}", addr), - incoming = incoming, - ) - } - SelectKind::Multiplexing(peer_id) => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("multiplexing on addr: {}", addr), - peer_id = peer_id.to_string(), - incoming = incoming, - ) - } - SelectKind::Stream(peer_id, stream_id) => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("stream on addr: {}", addr), - peer_id = peer_id.to_string(), - stream_id = stream_id, - incoming = incoming, - ) - } - }, - P2pNetworkSelectAction::IncomingToken { - addr, - kind: stream_kind, - token, - } => match stream_kind { - SelectKind::Authentication => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("authentication on addr: {}", addr), - token = format!("{:?}", token), - ) - } - SelectKind::MultiplexingNoPeerId => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("multiplexing on addr: {}", addr), - token = format!("{:?}", token), - ) - } - SelectKind::Multiplexing(peer_id) => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("multiplexing on addr: {}", addr), - peer_id = peer_id.to_string(), - token = format!("{:?}", token), - ) - } - SelectKind::Stream(peer_id, stream_id) => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("stream on addr: {}", addr), - peer_id = peer_id.to_string(), - stream_id = stream_id, - token = format!("{:?}", token), - ) - } - }, - P2pNetworkSelectAction::OutgoingTokens { - addr, - kind: select_kind, - tokens, - } => match select_kind { - SelectKind::Authentication => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("authentication on addr: {}", addr), - tokens = format!("{:?}", tokens), - ) - } - SelectKind::MultiplexingNoPeerId => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("multiplexing on addr: {}", addr), - tokens = format!("{:?}", tokens), - ) - } - SelectKind::Multiplexing(peer_id) => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("multiplexing on addr: {}", addr), - peer_id = peer_id.to_string(), - tokens = format!("{:?}", tokens), - ) - } - SelectKind::Stream(peer_id, stream_id) => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("stream on addr: {}", addr), - peer_id = peer_id.to_string(), - stream_id = stream_id, - tokens = format!("{:?}", tokens), - ) - } - }, - _ => {} - }, - P2pNetworkAction::Noise(action) => match action { - P2pNetworkNoiseAction::Init { addr, incoming, .. } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - incoming = incoming, - ) - } - P2pNetworkNoiseAction::HandshakeDone { - addr, - peer_id, - incoming, - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - incoming = incoming, - peer_id = peer_id.to_string(), - ) - } - P2pNetworkNoiseAction::IncomingChunk { addr, data } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - data = format!("{:?}", data), - ) - } - P2pNetworkNoiseAction::OutgoingChunk { addr, data } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - data = format!("{:?}", data), - ) - } - P2pNetworkNoiseAction::DecryptedData { addr, data, .. } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - data = format!("{:?}", data), - ) - } - _ => {} - }, - P2pNetworkAction::Yamux(action) => match action { - P2pNetworkYamuxAction::IncomingData { addr, data } => { - openmina_core::log::debug!( - meta.time(); - kind = kind.to_string(), - addr = addr.to_string(), - data = format!("{:?}", data), - ) - } - P2pNetworkYamuxAction::IncomingFrame { addr, frame } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - frame = format!("{:?}", frame), - ) - } - P2pNetworkYamuxAction::OutgoingFrame { addr, frame } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - frame = format!("{:?}", frame), - ) - } - _ => {} - }, - P2pNetworkAction::Rpc(action) => match action { - P2pNetworkRpcAction::Init { - addr, - peer_id, - stream_id, - incoming, - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - peer_id = peer_id.to_string(), - stream_id = stream_id, - incoming = incoming, - ) - } - P2pNetworkRpcAction::IncomingMessage { - addr, - peer_id, - stream_id, - message, - } => { - let msg = match &message { - p2p::RpcMessage::Handshake => "handshake".to_owned(), - p2p::RpcMessage::Heartbeat => "heartbeat".to_owned(), - p2p::RpcMessage::Query { header, .. } => format!("{header:?}"), - p2p::RpcMessage::Response { header, .. } => format!("{header:?}"), - }; - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - addr = addr.to_string(), - peer_id = peer_id.to_string(), - stream_id = stream_id, - msg = msg, - ) - } - _ => {} - }, - P2pNetworkAction::Kad(_) => {} + P2pNetworkAction::Scheduler(action) => action.action_event(&context), + P2pNetworkAction::Pnet(action) => action.action_event(&context), + P2pNetworkAction::Select(action) => action.action_event(&context), + P2pNetworkAction::Noise(action) => action.action_event(&context), + P2pNetworkAction::Yamux(action) => action.action_event(&context), + P2pNetworkAction::Rpc(action) => action.action_event(&context), + P2pNetworkAction::Kad(action) => action.action_event(&context), }, }, - Action::ExternalSnarkWorker(a) => { - use crate::external_snark_worker::ExternalSnarkWorkerAction; - match a { - ExternalSnarkWorkerAction::Start - | ExternalSnarkWorkerAction::Started - | ExternalSnarkWorkerAction::Kill - | ExternalSnarkWorkerAction::Killed - | ExternalSnarkWorkerAction::WorkCancelled - | ExternalSnarkWorkerAction::PruneWork => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - trace_action = serde_json::to_string(&a).ok() - ) - } - ExternalSnarkWorkerAction::SubmitWork { job_id, .. } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - work_id = job_id.to_string(), - ) - } - ExternalSnarkWorkerAction::WorkResult { .. } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - ) - } - ExternalSnarkWorkerAction::CancelWork => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - ) - } - ExternalSnarkWorkerAction::WorkError { error, .. } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - error = error.to_string(), - ) - } - ExternalSnarkWorkerAction::Error { error, .. } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - error = error.to_string(), - ) - } - ExternalSnarkWorkerAction::StartTimeout { .. } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - ) - } - ExternalSnarkWorkerAction::WorkTimeout { .. } => { - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - ) - } - } - } + Action::ExternalSnarkWorker(action) => action.action_event(&context), Action::Snark(a) => match a { - SnarkAction::WorkVerify(a) => match a { - SnarkWorkVerifyAction::Init { - req_id, - batch, - sender, - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("id: {}, batch size: {}", req_id, batch.len()), - peer_id = sender, - rpc_id = req_id.to_string(), - trace_batch = serde_json::to_string(&batch.iter().map(|v| v.job_id()).collect::>()).ok() - ); - } - SnarkWorkVerifyAction::Error { req_id, .. } => { - let Some(req) = store.state().snark.work_verify.jobs.get(*req_id) else { - return; - }; - openmina_core::log::warn!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("id: {}, batch size: {}", req_id, req.batch().len()), - peer_id = req.sender(), - rpc_id = req_id.to_string(), - trace_batch = serde_json::to_string(&req.batch().iter().map(|v| v.job_id()).collect::>()).ok() - ); - } - SnarkWorkVerifyAction::Success { req_id } => { - let Some(req) = store.state().snark.work_verify.jobs.get(*req_id) else { - return; - }; - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("id: {}, batch size: {}", req_id, req.batch().len()), - peer_id = req.sender(), - rpc_id = req_id.to_string(), - trace_batch = serde_json::to_string(&req.batch().iter().map(|v| v.job_id()).collect::>()).ok() - ); - } - _ => {} - }, - _ => {} - }, - Action::TransitionFrontier(a) => match a { - TransitionFrontierAction::Genesis(a) => match a { - TransitionFrontierGenesisAction::ProvePending => { - openmina_core::log::info!( - meta.time(); - kind = kind.to_string(), - summary = format!("Proving genesis block"), - ); - } - TransitionFrontierGenesisAction::ProveSuccess { .. } => { - openmina_core::log::info!( - meta.time(); - kind = kind.to_string(), - summary = format!("Genesis block proved"), - ); - } - _ => {} - }, - TransitionFrontierAction::GenesisInject => { - let Some(genesis) = store - .state() - .transition_frontier - .genesis - .block_with_real_or_dummy_proof() - else { - return; - }; - openmina_core::log::info!( - meta.time(); - kind = kind.to_string(), - summary = format!("Transition frontier reconstructed genesis ledger({}) and block({})", genesis.snarked_ledger_hash(), genesis.hash()), - genesis_block_hash = genesis.hash().to_string(), - genesis_ledger_hash = genesis.snarked_ledger_hash().to_string(), - ); - } - TransitionFrontierAction::Sync(action) => match action { - TransitionFrontierSyncAction::Init { - best_tip, - root_block, - .. - } => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "Transition frontier sync init".to_string(), - block_hash = best_tip.hash.to_string(), - root_block_hash = root_block.hash.to_string(), - ), - TransitionFrontierSyncAction::BestTipUpdate { - best_tip, - root_block, - .. - } => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "New best tip received".to_string(), - block_hash = best_tip.hash.to_string(), - root_block_hash = root_block.hash.to_string(), - ), - TransitionFrontierSyncAction::LedgerStakingPending => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "Staking ledger sync pending".to_string(), - ), - TransitionFrontierSyncAction::LedgerStakingSuccess => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "Staking ledger sync success".to_string(), - ), - TransitionFrontierSyncAction::LedgerNextEpochPending => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "Next epoch ledger sync pending".to_string(), - ) - } - TransitionFrontierSyncAction::LedgerNextEpochSuccess => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "Next epoch ledger sync pending".to_string(), - ) - } - TransitionFrontierSyncAction::LedgerRootPending => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "Transition frontier root ledger sync pending".to_string(), - ), - TransitionFrontierSyncAction::LedgerRootSuccess => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "Transition frontier root ledger sync success".to_string(), - ), - _other => openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - ), - }, - TransitionFrontierAction::Synced { .. } => openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = "Transition frontier synced".to_string(), - ), - }, - Action::BlockProducer(a) => match a { - BlockProducerAction::VrfEvaluator(a) => match a { - BlockProducerVrfEvaluatorAction::ProcessSlotEvaluationSuccess { - vrf_output, - .. - } => match vrf_output { - vrf::VrfEvaluationOutput::SlotWon(won_slot) => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Slot evaluation result - won slot"), - global_slot = won_slot.global_slot, - vrf_output = won_slot.vrf_output.to_string(), - ) - } - vrf::VrfEvaluationOutput::SlotLost(_) => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Slot evaluation result - lost slot: {:?}", vrf_output), - ) - } - }, - BlockProducerVrfEvaluatorAction::EvaluateSlot { vrf_input } => { - openmina_core::log::debug!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Vrf Evaluation requested: {:?}", vrf_input), - ) - } - BlockProducerVrfEvaluatorAction::CheckEpochEvaluability { - current_epoch_number, - current_best_tip_global_slot, - current_best_tip_slot, - .. - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Checking possible Vrf evaluations"), - status = store.state().block_producer.vrf_evaluator().unwrap().status.to_string(), // TODO: keep? if yes, no unwrap - status_details = format!("{:?}", store.state().block_producer.vrf_evaluator().unwrap().status), - current_epoch = current_epoch_number, - current_best_tip_global_slot = current_best_tip_global_slot, - current_best_tip_slot = current_best_tip_slot, - ) - } - BlockProducerVrfEvaluatorAction::InitializeEpochEvaluation { - current_epoch_number, - current_best_tip_global_slot, - current_best_tip_slot, - .. - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Constructing delegator table"), - status = store.state().block_producer.vrf_evaluator().unwrap().status.to_string(), // TODO: keep? if yes, no unwrap - current_epoch = current_epoch_number, - current_best_tip_global_slot = current_best_tip_global_slot, - current_best_tip_slot = current_best_tip_slot, - ) - } - BlockProducerVrfEvaluatorAction::BeginDelegatorTableConstruction { - current_epoch_number, - current_best_tip_global_slot, - current_best_tip_slot, - .. - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Constructing delegator table"), - status = store.state().block_producer.vrf_evaluator().unwrap().status.to_string(), // TODO: keep? if yes, no unwrap - current_epoch = current_epoch_number, - current_best_tip_global_slot = current_best_tip_global_slot, - current_best_tip_slot = current_best_tip_slot, - ) - } - BlockProducerVrfEvaluatorAction::BeginEpochEvaluation { - current_epoch_number, - current_best_tip_global_slot, - current_best_tip_slot, - .. - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Starting epoch evaluation"), - status = store.state().block_producer.vrf_evaluator().unwrap().status.to_string(), // TODO: keep? if yes, no unwrap - current_epoch = current_epoch_number, - current_best_tip_global_slot = current_best_tip_global_slot, - current_best_tip_slot = current_best_tip_slot, - ) - } - BlockProducerVrfEvaluatorAction::FinalizeDelegatorTableConstruction { - current_epoch_number, - current_best_tip_global_slot, - current_best_tip_slot, - .. - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Delegator table constructed"), - status = store.state().block_producer.vrf_evaluator().unwrap().status.to_string(), // TODO: keep? if yes, no unwrap - current_epoch = current_epoch_number, - current_best_tip_global_slot = current_best_tip_global_slot, - current_best_tip_slot = current_best_tip_slot, - ) - } - BlockProducerVrfEvaluatorAction::RecordLastBlockHeightInEpoch { - epoch_number, - last_block_height, - .. - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Saving last block height in epoch"), - status = store.state().block_producer.vrf_evaluator().unwrap().status.to_string(), // TODO: keep? if yes, no unwrap - epoch = epoch_number, - last_block_height = last_block_height, - ) - } - BlockProducerVrfEvaluatorAction::InitializeEvaluator { .. } => {} - BlockProducerVrfEvaluatorAction::FinalizeEvaluatorInitialization { .. } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Vrf evaluator initilaized"), - ) - } - BlockProducerVrfEvaluatorAction::FinishEpochEvaluation { - epoch_number, - latest_evaluated_global_slot, - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Epoch evaluation finished"), - epoch_number = epoch_number, - latest_evaluated_global_slot = latest_evaluated_global_slot, - ) - } - BlockProducerVrfEvaluatorAction::WaitForNextEvaluation { - current_epoch_number, - current_best_tip_height, - .. - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Waiting for epoch to evaluate"), - epoch_number = current_epoch_number, - current_best_tip_height = current_best_tip_height, - ) - } - BlockProducerVrfEvaluatorAction::SelectInitialSlot { - current_epoch_number, - current_best_tip_height, - .. - } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Selecting starting slot"), - epoch_number = current_epoch_number, - current_best_tip_height = current_best_tip_height, - ) - } - BlockProducerVrfEvaluatorAction::CheckEpochBounds { .. } => { - openmina_core::log::trace!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Checking epoch bounds"), - status = format!("{:?}", store.state().block_producer.vrf_evaluator().unwrap().status), - ) - } - BlockProducerVrfEvaluatorAction::CleanupOldSlots { .. } => { - openmina_core::log::trace!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Cleaning up old won slots"), - ) - } - _ => {} - }, - BlockProducerAction::BestTipUpdate { .. } => {} - BlockProducerAction::WonSlot { won_slot } => { - openmina_core::log::info!( - meta.time(); - node_id = node_id, - kind = kind.to_string(), - summary = format!("Won slot"), - slot = won_slot.global_slot.slot_number.as_u32(), - slot_time = openmina_core::log::to_rfc_3339(won_slot.slot_time).unwrap(), - current_time = openmina_core::log::to_rfc_3339(meta.time()).unwrap(), - ) - } + SnarkAction::WorkVerify(a) => a.action_event(&context), _ => {} }, + Action::TransitionFrontier(a) => a.action_event(&context), + Action::BlockProducer(a) => a.action_event(&context), _ => {} } } diff --git a/node/src/rpc/rpc_effects.rs b/node/src/rpc/rpc_effects.rs index 57edc2064..e8928a89e 100644 --- a/node/src/rpc/rpc_effects.rs +++ b/node/src/rpc/rpc_effects.rs @@ -490,30 +490,44 @@ pub fn rpc_effects(store: &mut Store, action: RpcActionWithMeta) ); } RpcAction::ReadinessCheck { rpc_id } => { - let synced = store - .service() - .stats() - .and_then(|stats| stats.get_sync_time()) - .ok_or_else(|| String::from("Not synced")) - .and_then(|t| { - meta.time().checked_sub(t).ok_or_else(|| { - format!("Cannot get duration between {t:?} and {:?}", meta.time()) - }) - }) - .and_then(|dur| { - const THRESH: Duration = Duration::from_secs(60 * 3 * 10); - if dur <= THRESH { - Ok(()) - } else { - Err(format!( - "Synced {:?} ago, which is more than the threshold {:?}", - dur, THRESH - )) - } - }); - openmina_core::log::debug!(meta.time(); summary = "readiness check", result = format!("{synced:?}")); + const THRESH: Duration = Duration::from_secs(60 * 3 * 10); + let synced = match store.state().transition_frontier.sync { + TransitionFrontierSyncState::Synced { time } + if meta.time().checked_sub(time) <= Some(THRESH) => + { + Ok(()) + } + TransitionFrontierSyncState::Synced { time } => Err(format!( + "Synced {:?} ago, which is more than the threshold {:?}", + meta.time().checked_sub(time), + THRESH + )), + _ => Err(format!("not synced")), + }; + // let synced = store + // .service() + // .stats() + // .and_then(|stats| stats.get_sync_time()) + // .ok_or_else(|| String::from("Not synced")) + // .and_then(|t| { + // meta.time().checked_sub(t).ok_or_else(|| { + // format!("Cannot get duration between {t:?} and {:?}", meta.time()) + // }) + // }) + // .and_then(|dur| { + // const THRESH: Duration = Duration::from_secs(60 * 3 * 10); + // if dur <= THRESH { + // Ok(()) + // } else { + // Err(format!( + // "Synced {:?} ago, which is more than the threshold {:?}", + // dur, THRESH + // )) + // } + // }); + // openmina_core::log::debug!(meta.time(); summary = "readiness check", result = format!("{synced:?}")); respond_or_log!( - store.service().respond_health_check(rpc_id, synced), + store.service().respond_readiness_check(rpc_id, synced), meta.time() ); } diff --git a/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs b/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs index dedba3702..ab42b7c1e 100644 --- a/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs +++ b/node/src/transition_frontier/genesis/transition_frontier_genesis_actions.rs @@ -1,4 +1,5 @@ use mina_p2p_messages::v2; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use super::{GenesisConfigLoaded, TransitionFrontierGenesisState}; @@ -8,7 +9,8 @@ pub type TransitionFrontierGenesisActionWithMeta = pub type TransitionFrontierGenesisActionWithMetaRef<'a> = redux::ActionWithMeta<&'a TransitionFrontierGenesisAction>; -#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone)] +#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(level = trace)] pub enum TransitionFrontierGenesisAction { LedgerLoadInit, LedgerLoadPending, @@ -17,7 +19,11 @@ pub enum TransitionFrontierGenesisAction { }, Produce, ProveInit, + /// Proving genesis block. + #[action_event(level = info)] ProvePending, + /// Genesis block proved. + #[action_event(level = info)] ProveSuccess { proof: Box, }, diff --git a/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_actions.rs b/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_actions.rs index 8e3ad275d..9d2fe9ba1 100644 --- a/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_actions.rs +++ b/node/src/transition_frontier/sync/ledger/snarked/transition_frontier_sync_ledger_snarked_actions.rs @@ -1,4 +1,5 @@ use mina_p2p_messages::v2::{LedgerHash, MinaBaseAccountBinableArgStableV2}; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::ledger::{LedgerAddress, LEDGER_DEPTH}; @@ -21,7 +22,8 @@ pub type TransitionFrontierSyncLedgerSnarkedActionWithMeta = pub type TransitionFrontierSyncLedgerSnarkedActionWithMetaRef<'a> = redux::ActionWithMeta<&'a TransitionFrontierSyncLedgerSnarkedAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(level = trace)] pub enum TransitionFrontierSyncLedgerSnarkedAction { Pending, PeersQuery, diff --git a/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_actions.rs b/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_actions.rs index 05b2fdc39..7d89f31a5 100644 --- a/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_actions.rs +++ b/node/src/transition_frontier/sync/ledger/staged/transition_frontier_sync_ledger_staged_actions.rs @@ -1,6 +1,7 @@ use std::sync::Arc; use mina_p2p_messages::v2::{self, LedgerHash}; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::p2p::channels::rpc::{P2pRpcId, StagedLedgerAuxAndPendingCoinbases}; @@ -17,7 +18,8 @@ pub type TransitionFrontierSyncLedgerStagedActionWithMeta = pub type TransitionFrontierSyncLedgerStagedActionWithMetaRef<'a> = redux::ActionWithMeta<&'a TransitionFrontierSyncLedgerStagedAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(level = trace)] pub enum TransitionFrontierSyncLedgerStagedAction { PartsFetchPending, PartsPeerFetchInit, diff --git a/node/src/transition_frontier/sync/ledger/transition_frontier_sync_ledger_actions.rs b/node/src/transition_frontier/sync/ledger/transition_frontier_sync_ledger_actions.rs index 6133232c6..2566be57c 100644 --- a/node/src/transition_frontier/sync/ledger/transition_frontier_sync_ledger_actions.rs +++ b/node/src/transition_frontier/sync/ledger/transition_frontier_sync_ledger_actions.rs @@ -1,3 +1,4 @@ +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::transition_frontier::sync::TransitionFrontierSyncAction; @@ -12,7 +13,7 @@ pub type TransitionFrontierSyncLedgerActionWithMeta = pub type TransitionFrontierSyncLedgerActionWithMetaRef<'a> = redux::ActionWithMeta<&'a TransitionFrontierSyncLedgerAction>; -#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone)] +#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone, ActionEvent)] pub enum TransitionFrontierSyncLedgerAction { Init, Snarked(TransitionFrontierSyncLedgerSnarkedAction), diff --git a/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs b/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs index 6e8764dfc..15ddd3446 100644 --- a/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs +++ b/node/src/transition_frontier/sync/transition_frontier_sync_actions.rs @@ -1,6 +1,7 @@ use mina_p2p_messages::v2::StateHash; use openmina_core::block::ArcBlockWithHash; use openmina_core::consensus::consensus_take; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::p2p::channels::rpc::P2pRpcId; @@ -17,31 +18,42 @@ pub type TransitionFrontierSyncActionWithMeta = redux::ActionWithMeta = redux::ActionWithMeta<&'a TransitionFrontierSyncAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] pub enum TransitionFrontierSyncAction { /// Set transition frontier target to new best tip (for still unsynced frontiers) + #[action_event(level = info, fields( + block_hash = display(&best_tip.hash), + root_block_hash = display(&root_block.hash), + ))] Init { best_tip: ArcBlockWithHash, root_block: ArcBlockWithHash, blocks_inbetween: Vec, }, /// Set sync target to a new best tip (for already synced frontiers) + #[action_event(level = info)] BestTipUpdate { best_tip: ArcBlockWithHash, root_block: ArcBlockWithHash, blocks_inbetween: Vec, }, /// Staking Ledger sync is pending + #[action_event(level = info)] LedgerStakingPending, /// Staking Ledger sync was successful + #[action_event(level = info)] LedgerStakingSuccess, /// Next Epoch Ledger sync is pending + #[action_event(level = info)] LedgerNextEpochPending, /// Next Epoch Ledger sync was successful + #[action_event(level = info)] LedgerNextEpochSuccess, /// Transition frontier Root Ledger sync is pending + #[action_event(level = info)] LedgerRootPending, /// Transition frontier Root Ledger sync was successful + #[action_event(level = info)] LedgerRootSuccess, BlocksPending, BlocksPeersQuery, diff --git a/node/src/transition_frontier/transition_frontier_actions.rs b/node/src/transition_frontier/transition_frontier_actions.rs index 34bb81634..63f466362 100644 --- a/node/src/transition_frontier/transition_frontier_actions.rs +++ b/node/src/transition_frontier/transition_frontier_actions.rs @@ -1,6 +1,7 @@ use std::collections::BTreeSet; use mina_p2p_messages::v2::StateHash; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use super::genesis::TransitionFrontierGenesisAction; @@ -10,17 +11,21 @@ pub type TransitionFrontierActionWithMeta = redux::ActionWithMeta = redux::ActionWithMeta<&'a TransitionFrontierAction>; -#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone)] +#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone, ActionEvent)] pub enum TransitionFrontierAction { Genesis(TransitionFrontierGenesisAction), - /// Inject genesis block into the transition frontier, unless we already - /// have a better block there. + /// Inject genesis block into the transition frontier. + /// + /// Unless we already have a better block there. /// /// If this node is block producer, we produce proof for the genesis /// block, otherwise we don't need it so we use dummy proof instead. + #[action_event(level = info)] GenesisInject, Sync(TransitionFrontierSyncAction), + /// Transition frontier synced. + #[action_event(level = info)] Synced { /// Required protocol states for root block. needed_protocol_states: BTreeSet, diff --git a/node/src/transition_frontier/transition_frontier_effects.rs b/node/src/transition_frontier/transition_frontier_effects.rs index bbabd0bbb..91013cbea 100644 --- a/node/src/transition_frontier/transition_frontier_effects.rs +++ b/node/src/transition_frontier/transition_frontier_effects.rs @@ -9,7 +9,9 @@ use crate::stats::sync::SyncingLedger; use crate::Store; use super::genesis::TransitionFrontierGenesisAction; -use super::sync::ledger::snarked::TransitionFrontierSyncLedgerSnarkedAction; +use super::sync::ledger::snarked::{ + TransitionFrontierSyncLedgerSnarkedAction, ACCOUNT_SUBTREE_HEIGHT, +}; use super::sync::ledger::staged::TransitionFrontierSyncLedgerStagedAction; use super::sync::ledger::{ transition_frontier_sync_ledger_init_effects, @@ -354,7 +356,7 @@ fn handle_transition_frontier_sync_ledger_action( .sync .ledger_target_kind() { - if address.length() < LEDGER_DEPTH - 1 { + if address.length() < LEDGER_DEPTH - ACCOUNT_SUBTREE_HEIGHT { stats.syncing_ledger( kind, SyncingLedger::FetchHashes { start, end }, diff --git a/node/testing/Cargo.toml b/node/testing/Cargo.toml index a0e96701d..a04f9d229 100644 --- a/node/testing/Cargo.toml +++ b/node/testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-node-testing" -version = "0.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0" diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index e7b98421f..d76838c16 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "p2p" -version = "0.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0" @@ -42,6 +42,7 @@ mina-p2p-messages = { workspace = true } salsa-simple = { path = "../tools/salsa-simple" } openmina-core = { path = "../core" } +openmina-macros = { path = "../macros" } quick-protobuf = "0.8.1" crypto-bigint = { version = "0.5.5", features = ["generic-array", "serde", "alloc"] } diff --git a/p2p/libp2p-rpc-behaviour/Cargo.toml b/p2p/libp2p-rpc-behaviour/Cargo.toml index 7e727273c..66adec8a7 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.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0" diff --git a/p2p/src/channels/best_tip/p2p_channels_best_tip_actions.rs b/p2p/src/channels/best_tip/p2p_channels_best_tip_actions.rs index a6fa853a5..dc13fd93b 100644 --- a/p2p/src/channels/best_tip/p2p_channels_best_tip_actions.rs +++ b/p2p/src/channels/best_tip/p2p_channels_best_tip_actions.rs @@ -1,4 +1,4 @@ -use openmina_core::block::ArcBlockWithHash; +use openmina_core::{block::ArcBlockWithHash, ActionEvent}; use serde::{Deserialize, Serialize}; use crate::{ @@ -11,27 +11,34 @@ use super::BestTipPropagationState; pub type P2pChannelsBestTipActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pChannelsBestTipAction>; -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, ActionEvent)] +#[action_event(fields(display(peer_id), best_tip = display(&best_tip.hash)))] pub enum P2pChannelsBestTipAction { + /// Initialize best tip channel. Init { peer_id: PeerId, }, Pending { peer_id: PeerId, }, + /// Best tip channel is ready. Ready { peer_id: PeerId, }, + /// Send best tip request. RequestSend { peer_id: PeerId, }, + /// Best tip response is received. Received { peer_id: PeerId, best_tip: ArcBlockWithHash, }, + /// Best tip request is received. RequestReceived { peer_id: PeerId, }, + /// Best tip response is sent. ResponseSend { peer_id: PeerId, best_tip: ArcBlockWithHash, diff --git a/p2p/src/channels/p2p_channels_actions.rs b/p2p/src/channels/p2p_channels_actions.rs index 7f436a713..3f5fa5b20 100644 --- a/p2p/src/channels/p2p_channels_actions.rs +++ b/p2p/src/channels/p2p_channels_actions.rs @@ -1,3 +1,4 @@ +use openmina_core::log::ActionEvent; use serde::{Deserialize, Serialize}; use crate::{P2pState, PeerId}; @@ -50,3 +51,11 @@ impl From for crate::P2pAction { Self::Channels(P2pChannelsAction::MessageReceived(a)) } } + +impl ActionEvent for P2pChannelsMessageReceivedAction { + fn action_event(&self, _context: &T) + where + T: openmina_core::log::EventContext, + { + } +} diff --git a/p2p/src/channels/rpc/p2p_channels_rpc_actions.rs b/p2p/src/channels/rpc/p2p_channels_rpc_actions.rs index e3767aba1..6c170d6ef 100644 --- a/p2p/src/channels/rpc/p2p_channels_rpc_actions.rs +++ b/p2p/src/channels/rpc/p2p_channels_rpc_actions.rs @@ -1,3 +1,4 @@ +use openmina_core::ActionEvent; use redux::Timestamp; use serde::{Deserialize, Serialize}; @@ -9,7 +10,8 @@ pub type P2pChannelsRpcActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pChan pub const MAX_P2P_RPC_REMOTE_CONCURRENT_REQUESTS: usize = 5; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(peer_id)))] pub enum P2pChannelsRpcAction { Init { peer_id: PeerId, diff --git a/p2p/src/channels/snark/p2p_channels_snark_actions.rs b/p2p/src/channels/snark/p2p_channels_snark_actions.rs index 641f49de6..520fe085f 100644 --- a/p2p/src/channels/snark/p2p_channels_snark_actions.rs +++ b/p2p/src/channels/snark/p2p_channels_snark_actions.rs @@ -1,12 +1,13 @@ use crate::{channels::P2pChannelsAction, P2pState, PeerId}; -use openmina_core::snark::Snark; +use openmina_core::{snark::Snark, ActionEvent}; use serde::{Deserialize, Serialize}; use super::{P2pChannelsSnarkState, SnarkInfo, SnarkPropagationState}; pub type P2pChannelsSnarkActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pChannelsSnarkAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(peer_id)))] pub enum P2pChannelsSnarkAction { Init { peer_id: PeerId, diff --git a/p2p/src/channels/snark_job_commitment/p2p_channels_snark_job_commitment_actions.rs b/p2p/src/channels/snark_job_commitment/p2p_channels_snark_job_commitment_actions.rs index ad51f894c..02ca96cb7 100644 --- a/p2p/src/channels/snark_job_commitment/p2p_channels_snark_job_commitment_actions.rs +++ b/p2p/src/channels/snark_job_commitment/p2p_channels_snark_job_commitment_actions.rs @@ -1,3 +1,4 @@ +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::{P2pState, PeerId}; @@ -9,7 +10,8 @@ use super::{ pub type P2pChannelsSnarkJobCommitmentActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pChannelsSnarkJobCommitmentAction>; -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, ActionEvent)] +#[action_event(fields(display(peer_id)))] pub enum P2pChannelsSnarkJobCommitmentAction { Init { peer_id: PeerId, diff --git a/p2p/src/connection/incoming/p2p_connection_incoming_actions.rs b/p2p/src/connection/incoming/p2p_connection_incoming_actions.rs index 198380a36..f2db4d8db 100644 --- a/p2p/src/connection/incoming/p2p_connection_incoming_actions.rs +++ b/p2p/src/connection/incoming/p2p_connection_incoming_actions.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; -use openmina_core::requests::RpcId; +use openmina_core::{requests::RpcId, ActionEvent}; use crate::{webrtc, P2pAction, P2pState, PeerId}; @@ -9,12 +9,15 @@ use super::P2pConnectionIncomingInitOpts; pub type P2pConnectionIncomingActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pConnectionIncomingAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(debug(opts), display(peer_id), display(error)))] pub enum P2pConnectionIncomingAction { + /// Incoming connection is initialized. Init { opts: P2pConnectionIncomingInitOpts, rpc_id: Option, }, + #[action_event(level = trace)] AnswerSdpCreatePending { peer_id: PeerId, }, @@ -33,26 +36,35 @@ pub enum P2pConnectionIncomingAction { AnswerSendSuccess { peer_id: PeerId, }, + /// Pending incoming connection finalization. + #[action_event(level = trace)] FinalizePending { peer_id: PeerId, }, + /// Error finalizing incoming connection. FinalizeError { peer_id: PeerId, error: String, }, + /// Incoming connection finalized. FinalizeSuccess { peer_id: PeerId, }, + /// Timeout establishing incoming connection. Timeout { peer_id: PeerId, }, + /// Error establishing incoming connection. Error { peer_id: PeerId, error: P2pConnectionIncomingError, }, + /// Incoming connection is succesful. + #[action_event(level = info)] Success { peer_id: PeerId, }, + /// Incoming libp2p connection is succesful. Libp2pReceived { peer_id: PeerId, }, diff --git a/p2p/src/connection/incoming/p2p_connection_incoming_state.rs b/p2p/src/connection/incoming/p2p_connection_incoming_state.rs index 14ae5c345..52dac1f98 100644 --- a/p2p/src/connection/incoming/p2p_connection_incoming_state.rs +++ b/p2p/src/connection/incoming/p2p_connection_incoming_state.rs @@ -113,9 +113,12 @@ impl P2pConnectionIncomingState { } } -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, thiserror::Error)] pub enum P2pConnectionIncomingError { + #[error("error creating SDP: {0}")] SdpCreateError(String), + #[error("finalization error: {0}")] FinalizeError(String), + #[error("timeout error")] Timeout, } diff --git a/p2p/src/connection/mod.rs b/p2p/src/connection/mod.rs index 939ceef05..c94c2f546 100644 --- a/p2p/src/connection/mod.rs +++ b/p2p/src/connection/mod.rs @@ -43,9 +43,11 @@ impl RejectionReason { } } -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, thiserror::Error)] pub enum P2pConnectionErrorResponse { + #[error("connection rejected: {0}")] Rejected(RejectionReason), + #[error("internal error")] InternalError, } diff --git a/p2p/src/connection/outgoing/p2p_connection_outgoing_actions.rs b/p2p/src/connection/outgoing/p2p_connection_outgoing_actions.rs index 0525c567b..893019b60 100644 --- a/p2p/src/connection/outgoing/p2p_connection_outgoing_actions.rs +++ b/p2p/src/connection/outgoing/p2p_connection_outgoing_actions.rs @@ -1,3 +1,4 @@ +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use openmina_core::requests::RpcId; @@ -10,17 +11,25 @@ use super::{P2pConnectionOutgoingError, P2pConnectionOutgoingInitOpts}; pub type P2pConnectionOutgoingActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pConnectionOutgoingAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(opts), display(peer_id), display(error)))] pub enum P2pConnectionOutgoingAction { + /// Initialize connection to a random peer. + #[action_event(level = trace)] RandomInit, + /// Initialize connection to a new peer. + #[action_event(level = info)] Init { opts: P2pConnectionOutgoingInitOpts, rpc_id: Option, }, + /// Reconnect to an existing peer. + #[action_event(level = info)] Reconnect { opts: P2pConnectionOutgoingInitOpts, rpc_id: Option, }, + #[action_event(level = trace)] OfferSdpCreatePending { peer_id: PeerId, }, @@ -39,6 +48,7 @@ pub enum P2pConnectionOutgoingAction { OfferSendSuccess { peer_id: PeerId, }, + #[action_event(level = trace)] AnswerRecvPending { peer_id: PeerId, }, @@ -50,23 +60,31 @@ pub enum P2pConnectionOutgoingAction { peer_id: PeerId, answer: webrtc::Answer, }, + #[action_event(level = trace)] FinalizePending { peer_id: PeerId, }, + /// Error finalizing outgoing connection. FinalizeError { peer_id: PeerId, error: String, }, + /// Outgoing connection succsessfully finalized. + #[action_event(level = info)] FinalizeSuccess { peer_id: PeerId, }, + /// Timeout establishing connection to a peer. Timeout { peer_id: PeerId, }, + /// Error connecting to a peer. Error { peer_id: PeerId, error: P2pConnectionOutgoingError, }, + /// Outgoing connection is successful. + #[action_event(level = info)] Success { peer_id: PeerId, }, diff --git a/p2p/src/connection/outgoing/p2p_connection_outgoing_state.rs b/p2p/src/connection/outgoing/p2p_connection_outgoing_state.rs index 670551b5f..a89e840e8 100644 --- a/p2p/src/connection/outgoing/p2p_connection_outgoing_state.rs +++ b/p2p/src/connection/outgoing/p2p_connection_outgoing_state.rs @@ -119,11 +119,16 @@ impl P2pConnectionOutgoingState { } } -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, thiserror::Error)] pub enum P2pConnectionOutgoingError { + #[error("error creating SDP: {0}")] SdpCreateError(String), + #[error("rejected: {0}")] Rejected(RejectionReason), + #[error("remote internal error")] RemoteInternalError, + #[error("finalization error: {0}")] FinalizeError(String), + #[error("timeout error")] Timeout, } diff --git a/p2p/src/disconnection/p2p_disconnection_actions.rs b/p2p/src/disconnection/p2p_disconnection_actions.rs index 36f03cfe5..b94188143 100644 --- a/p2p/src/disconnection/p2p_disconnection_actions.rs +++ b/p2p/src/disconnection/p2p_disconnection_actions.rs @@ -1,3 +1,4 @@ +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use super::P2pDisconnectionReason; @@ -5,15 +6,16 @@ use crate::{P2pPeerStatus, P2pState, PeerId}; pub type P2pDisconnectionActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pDisconnectionAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(peer_id), display(reason)), level = info)] pub enum P2pDisconnectionAction { + /// Initialize disconnection. Init { peer_id: PeerId, reason: P2pDisconnectionReason, }, - Finish { - peer_id: PeerId, - }, + /// Finish disconnecting from a peer. + Finish { peer_id: PeerId }, } impl redux::EnablingCondition for P2pDisconnectionAction { diff --git a/p2p/src/discovery/p2p_discovery_actions.rs b/p2p/src/discovery/p2p_discovery_actions.rs index d1841630e..51ab8f562 100644 --- a/p2p/src/discovery/p2p_discovery_actions.rs +++ b/p2p/src/discovery/p2p_discovery_actions.rs @@ -1,3 +1,4 @@ +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::{connection::outgoing::P2pConnectionOutgoingInitOpts, P2pState, PeerId}; @@ -6,7 +7,8 @@ use crate::{connection::outgoing::P2pConnectionOutgoingInitOpts, P2pState, PeerI pub type P2pDiscoveryActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pDiscoveryAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(peer_id), debug(peers), debug(addresses), description))] pub enum P2pDiscoveryAction { Init { peer_id: PeerId, diff --git a/p2p/src/listen/p2p_listen_actions.rs b/p2p/src/listen/p2p_listen_actions.rs index 43aac301d..7fd4774b1 100644 --- a/p2p/src/listen/p2p_listen_actions.rs +++ b/p2p/src/listen/p2p_listen_actions.rs @@ -1,3 +1,4 @@ +use openmina_core::ActionEvent; use redux::EnablingCondition; use serde::{Deserialize, Serialize}; @@ -5,7 +6,8 @@ use crate::{P2pListenerId, P2pState}; pub type P2pListenActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pListenAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(listener_id), display(addr), error))] pub enum P2pListenAction { New { listener_id: P2pListenerId, diff --git a/p2p/src/network/kad/bootstrap/p2p_network_kad_bootstrap_actions.rs b/p2p/src/network/kad/bootstrap/p2p_network_kad_bootstrap_actions.rs index b8191b015..9fae385fc 100644 --- a/p2p/src/network/kad/bootstrap/p2p_network_kad_bootstrap_actions.rs +++ b/p2p/src/network/kad/bootstrap/p2p_network_kad_bootstrap_actions.rs @@ -1,19 +1,21 @@ +use openmina_core::ActionEvent; use redux::EnablingCondition; use serde::{Deserialize, Serialize}; use crate::{P2pAction, P2pNetworkKadAction, P2pNetworkKadLatestRequestPeers, P2pState, PeerId}; -#[derive(Clone, Debug, Serialize, Deserialize)] +#[derive(Clone, Debug, Serialize, Deserialize, ActionEvent)] +#[action_event(fields(display(peer_id), debug(closest_peers), error))] pub enum P2pNetworkKadBootstrapAction { + /// Create `FIND_NODE` request. CreateRequests, + /// `FIND_NODE` request successful. RequestDone { peer_id: PeerId, closest_peers: P2pNetworkKadLatestRequestPeers, }, - RequestError { - peer_id: PeerId, - error: String, - }, + /// `FIND_NODE` request failed. + RequestError { peer_id: PeerId, error: String }, } impl EnablingCondition for P2pNetworkKadBootstrapAction { diff --git a/p2p/src/network/kad/p2p_network_kad_actions.rs b/p2p/src/network/kad/p2p_network_kad_actions.rs index cf14af9dd..d9de6c603 100644 --- a/p2p/src/network/kad/p2p_network_kad_actions.rs +++ b/p2p/src/network/kad/p2p_network_kad_actions.rs @@ -1,5 +1,6 @@ use std::net::SocketAddr; +use openmina_core::ActionEvent; use redux::EnablingCondition; use serde::{Deserialize, Serialize}; @@ -11,7 +12,7 @@ use crate::{ use super::bootstrap::P2pNetworkKadBootstrapAction; /// Kademlia actions. -#[derive(Debug, Clone, Serialize, Deserialize, derive_more::From)] +#[derive(Debug, Clone, Serialize, Deserialize, derive_more::From, ActionEvent)] pub enum P2pNetworkKadAction { System(P2pNetworkKademliaAction), Bootstrap(P2pNetworkKadBootstrapAction), @@ -37,8 +38,17 @@ impl From for P2pAction { } /// Kademlia system actions -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, ActionEvent)] +#[action_event(fields( + display(addr), + display(peer_id), + stream_id, + display(key), + debug(closest_peers) +))] pub enum P2pNetworkKademliaAction { + /// Answer `FIND_NODE` request. + /// /// Answers peer's `FIND_NODE` request by querying routing table for closest nodes. AnswerFindNodeRequest { addr: SocketAddr, @@ -46,6 +56,8 @@ pub enum P2pNetworkKademliaAction { stream_id: StreamId, key: PeerId, }, + /// Udate result of scheduled outgoing `FIND_NODE`. + /// /// Udates result of scheduled outgoing `FIND_NODE` request to a peer. UpdateFindNodeRequest { addr: SocketAddr, @@ -53,10 +65,12 @@ pub enum P2pNetworkKademliaAction { stream_id: StreamId, closest_peers: Vec, }, - /// Performs local node's Kademlia bootstrap. + /// Perform local node's Kademlia bootstrap. + #[action_event(level = info)] StartBootstrap { key: PeerId }, /// Bootstrap is finished. - BootstrapFinished {}, + #[action_event(level = info)] + BootstrapFinished, } impl EnablingCondition for P2pNetworkKademliaAction { diff --git a/p2p/src/network/kad/p2p_network_kad_effects.rs b/p2p/src/network/kad/p2p_network_kad_effects.rs index 95ebef8c2..e16583ced 100644 --- a/p2p/src/network/kad/p2p_network_kad_effects.rs +++ b/p2p/src/network/kad/p2p_network_kad_effects.rs @@ -54,7 +54,7 @@ impl P2pNetworkKademliaAction { debug!(meta.time(); "found {} peers", closer_peers.len()); let message = P2pNetworkKademliaRpcReply::FindNode { closer_peers }; - store.dispatch(P2pNetworkKademliaStreamAction::SendReply { + store.dispatch(P2pNetworkKademliaStreamAction::SendResponse { addr, peer_id, stream_id, @@ -66,13 +66,17 @@ impl P2pNetworkKademliaAction { UpdateFindNodeRequest { addr: _, peer_id, - stream_id: _, + stream_id, closest_peers, }, _, ) => { let data = closest_peers.clone(); - store.dispatch(P2pNetworkKadRequestAction::ReplyReceived { peer_id, data }); + store.dispatch(P2pNetworkKadRequestAction::ReplyReceived { + peer_id, + stream_id, + data, + }); Ok(()) } (StartBootstrap { .. }, _) => { diff --git a/p2p/src/network/kad/p2p_network_kad_reducer.rs b/p2p/src/network/kad/p2p_network_kad_reducer.rs index 88a76b0b8..c4f36290c 100644 --- a/p2p/src/network/kad/p2p_network_kad_reducer.rs +++ b/p2p/src/network/kad/p2p_network_kad_reducer.rs @@ -39,13 +39,14 @@ impl super::P2pNetworkKadState { .ok_or_else(|| format!("kademlia request for {} is not found", action.peer_id())) .and_then(|request| request.reducer(meta.with_action(action))), - P2pNetworkKadAction::Stream(action @ P2pNetworkKademliaStreamAction::New { .. }) => { - self.create_kad_stream_state(action.peer_id(), action.stream_id()) - .map_err(|stream| { - format!("kademlia stream already exists for action {action:?}: {stream:?}") - }) - .and_then(|stream| stream.reducer(meta.with_action(action))) - } + P2pNetworkKadAction::Stream( + action @ P2pNetworkKademliaStreamAction::New { incoming, .. }, + ) => self + .create_kad_stream_state(*incoming, action.peer_id(), action.stream_id()) + .map_err(|stream| { + format!("kademlia stream already exists for action {action:?}: {stream:?}") + }) + .and_then(|stream| stream.reducer(meta.with_action(action))), P2pNetworkKadAction::Stream(action @ P2pNetworkKademliaStreamAction::Prune { .. }) => { self.remove_kad_stream_state(action.peer_id(), action.stream_id()) .then_some(()) diff --git a/p2p/src/network/kad/p2p_network_kad_state.rs b/p2p/src/network/kad/p2p_network_kad_state.rs index 07c1a4e88..0faa083fa 100644 --- a/p2p/src/network/kad/p2p_network_kad_state.rs +++ b/p2p/src/network/kad/p2p_network_kad_state.rs @@ -111,6 +111,7 @@ impl P2pNetworkKadState { pub fn create_kad_stream_state( &mut self, + incoming: bool, peer_id: &PeerId, stream_id: &StreamId, ) -> Result<&mut P2pNetworkKadStreamState, &P2pNetworkKadStreamState> { @@ -120,7 +121,9 @@ impl P2pNetworkKadState { .or_default() .entry(*stream_id) { - std::collections::btree_map::Entry::Vacant(e) => Ok(e.insert(Default::default())), + std::collections::btree_map::Entry::Vacant(e) => { + Ok(e.insert(P2pNetworkKadStreamState::new(incoming))) + } std::collections::btree_map::Entry::Occupied(e) => Err(e.into_mut()), } } diff --git a/p2p/src/network/kad/request/p2p_network_kad_request_actions.rs b/p2p/src/network/kad/request/p2p_network_kad_request_actions.rs index 8791922d6..c971eeab1 100644 --- a/p2p/src/network/kad/request/p2p_network_kad_request_actions.rs +++ b/p2p/src/network/kad/request/p2p_network_kad_request_actions.rs @@ -1,11 +1,13 @@ use std::net::SocketAddr; +use openmina_core::ActionEvent; use redux::EnablingCondition; use serde::{Deserialize, Serialize}; use crate::{P2pAction, P2pNetworkKadEntry, P2pState, PeerId, StreamId}; -#[derive(Clone, Debug, Serialize, Deserialize)] +#[derive(Clone, Debug, Serialize, Deserialize, ActionEvent)] +#[action_event(fields(display(peer_id), display(addr), display(key), stream_id, error))] pub enum P2pNetworkKadRequestAction { New { peer_id: PeerId, @@ -33,8 +35,10 @@ pub enum P2pNetworkKadRequestAction { }, ReplyReceived { peer_id: PeerId, + stream_id: StreamId, data: Vec, }, + #[action_event(level = trace)] Prune { peer_id: PeerId, }, diff --git a/p2p/src/network/kad/request/p2p_network_kad_request_effects.rs b/p2p/src/network/kad/request/p2p_network_kad_request_effects.rs index e1e179c06..510e66f4c 100644 --- a/p2p/src/network/kad/request/p2p_network_kad_request_effects.rs +++ b/p2p/src/network/kad/request/p2p_network_kad_request_effects.rs @@ -1,6 +1,5 @@ use std::net::SocketAddr; -use openmina_core::warn; use redux::ActionMeta; use crate::{ @@ -18,7 +17,7 @@ use crate::{ use super::{super::stream::P2pNetworkKademliaStreamAction, P2pNetworkKadRequestAction}; impl P2pNetworkKadRequestAction { - pub fn effects(self, meta: &ActionMeta, store: &mut Store) -> Result<(), String> + pub fn effects(self, _meta: &ActionMeta, store: &mut Store) -> Result<(), String> where Store: crate::P2pStore, { @@ -26,6 +25,9 @@ impl P2pNetworkKadRequestAction { let discovery_state = scheduler .discovery_state() .ok_or_else(|| String::from("discovery is not configured"))?; + if let A::Prune { .. } = &self { + return Ok(()); + } let peer_id = self.peer_id(); let Some(request_state) = discovery_state.request(peer_id) else { return Err(format!("no request for {peer_id}")); @@ -137,7 +139,12 @@ impl P2pNetworkKadRequestAction { store.dispatch(A::RequestSent { peer_id }); } A::RequestSent { .. } => {} - A::ReplyReceived { data, peer_id } => { + A::ReplyReceived { + data, + peer_id, + stream_id, + } => { + let addr = request_state.addr; let bootstrap_request = discovery_state .bootstrap_state() .and_then(|bootstrap_state| bootstrap_state.request(&peer_id)) @@ -170,9 +177,14 @@ impl P2pNetworkKadRequestAction { .collect(); store.dispatch(P2pDiscoveryAction::KademliaAddRoute { peer_id, addresses }); } + store.dispatch(P2pNetworkKademliaStreamAction::Close { + addr, + peer_id, + stream_id, + }); + store.dispatch(P2pNetworkKadRequestAction::Prune { peer_id }); } A::Error { peer_id, error } => { - warn!(meta.time(); "error requesting FIND_NODE: {error}"); let bootstrap_request = discovery_state .bootstrap_state() .and_then(|bootstrap_state| bootstrap_state.request(&peer_id)) @@ -180,6 +192,7 @@ impl P2pNetworkKadRequestAction { if bootstrap_request { store.dispatch(P2pNetworkKadBootstrapAction::RequestError { peer_id, error }); } + store.dispatch(P2pNetworkKadRequestAction::Prune { peer_id }); } A::Prune { .. } => {} } diff --git a/p2p/src/network/kad/stream/p2p_network_kad_stream_actions.rs b/p2p/src/network/kad/stream/p2p_network_kad_stream_actions.rs index e251bc415..bed2cad2c 100644 --- a/p2p/src/network/kad/stream/p2p_network_kad_stream_actions.rs +++ b/p2p/src/network/kad/stream/p2p_network_kad_stream_actions.rs @@ -1,5 +1,6 @@ use std::net::SocketAddr; +use openmina_core::ActionEvent; use redux::EnablingCondition; use serde::{Deserialize, Serialize}; @@ -9,7 +10,8 @@ use crate::{ }; /// Kademlia stream related actions. -#[derive(Debug, Clone, Serialize, Deserialize)] +#[derive(Debug, Clone, Serialize, Deserialize, ActionEvent)] +#[action_event(fields(display(addr), display(peer_id), stream_id, incoming, debug(data)))] pub enum P2pNetworkKademliaStreamAction { /// Creates a new stream state. New { @@ -18,6 +20,7 @@ pub enum P2pNetworkKademliaStreamAction { stream_id: StreamId, incoming: bool, }, + /// Handles incoming data from the stream. IncomingData { addr: SocketAddr, @@ -25,12 +28,26 @@ pub enum P2pNetworkKademliaStreamAction { stream_id: StreamId, data: Data, }, + /// Remote peer sent FIN to close the stream. + RemoteClose { + addr: SocketAddr, + peer_id: PeerId, + stream_id: StreamId, + }, + + /// Reinitializes existing stream state. + WaitIncoming { + addr: SocketAddr, + peer_id: PeerId, + stream_id: StreamId, + }, /// Sets the state to wait for outgoing data. WaitOutgoing { addr: SocketAddr, peer_id: PeerId, stream_id: StreamId, }, + /// Sends request to the stream. SendRequest { addr: SocketAddr, @@ -38,8 +55,8 @@ pub enum P2pNetworkKademliaStreamAction { stream_id: StreamId, data: P2pNetworkKademliaRpcRequest, }, - /// Sends data to the stream. - SendReply { + /// Sends response to the stream. + SendResponse { addr: SocketAddr, peer_id: PeerId, stream_id: StreamId, @@ -51,25 +68,16 @@ pub enum P2pNetworkKademliaStreamAction { peer_id: PeerId, stream_id: StreamId, }, - /// Reinitializes existing stream state. - WaitIncoming { - addr: SocketAddr, - peer_id: PeerId, - stream_id: StreamId, - }, + /// Start closing outgoing stream (first closing our half of the stream) Close { addr: SocketAddr, peer_id: PeerId, stream_id: StreamId, }, - /// Remote peer sent FIN to close the stream. - RemoteClose { - addr: SocketAddr, - peer_id: PeerId, - stream_id: StreamId, - }, + /// Removes the closed stream from the state. + #[action_event(level = trace)] Prune { addr: SocketAddr, peer_id: PeerId, @@ -85,7 +93,7 @@ macro_rules! enum_field { | P2pNetworkKademliaStreamAction::IncomingData { $field, .. } | P2pNetworkKademliaStreamAction::WaitOutgoing { $field, .. } | P2pNetworkKademliaStreamAction::SendRequest { $field, .. } - | P2pNetworkKademliaStreamAction::SendReply { $field, .. } + | P2pNetworkKademliaStreamAction::SendResponse { $field, .. } | P2pNetworkKademliaStreamAction::OutgoingDataReady { $field, .. } | P2pNetworkKademliaStreamAction::WaitIncoming { $field, .. } | P2pNetworkKademliaStreamAction::Close { $field, .. } diff --git a/p2p/src/network/kad/stream/p2p_network_kad_stream_effects.rs b/p2p/src/network/kad/stream/p2p_network_kad_stream_effects.rs index 857c12d6a..93c050448 100644 --- a/p2p/src/network/kad/stream/p2p_network_kad_stream_effects.rs +++ b/p2p/src/network/kad/stream/p2p_network_kad_stream_effects.rs @@ -5,7 +5,7 @@ use crate::{Data, P2pNetworkKademliaAction, P2pNetworkYamuxAction}; use super::{ super::{P2pNetworkKademliaRpcReply, P2pNetworkKademliaRpcRequest}, - P2pNetworkKadStreamKind, P2pNetworkKademliaStreamAction, + P2pNetworkKademliaStreamAction, }; impl P2pNetworkKademliaStreamAction { @@ -13,7 +13,9 @@ impl P2pNetworkKademliaStreamAction { where Store: crate::P2pStore, { - use super::P2pNetworkKadStreamState as S; + use super::P2pNetworkKadIncomingStreamState as I; + use super::P2pNetworkKadOutgoingStreamState as O; + use super::P2pNetworkKadStreamState as D; use P2pNetworkKademliaStreamAction as A; if let A::Prune { .. } = self { @@ -29,17 +31,11 @@ impl P2pNetworkKademliaStreamAction { .ok_or_else(|| String::from("peer discovery not configured"))? .find_kad_stream_state(self.peer_id(), self.stream_id()) .ok_or_else(|| format!("stream not found for action {self:?}"))?; + match (self, state) { ( A::New { .. }, - S::WaitingOutgoing { - kind: P2pNetworkKadStreamKind::Outgoing, - .. - } - | S::WaitingIncoming { - kind: P2pNetworkKadStreamKind::Incoming, - .. - }, + D::Outgoing(O::WaitingForRequest { .. }) | D::Incoming(I::WaitingForRequest { .. }), ) => Ok(()), ( A::IncomingData { @@ -48,9 +44,9 @@ impl P2pNetworkKademliaStreamAction { stream_id, .. }, - S::IncomingRequest { + D::Incoming(I::RequestIsReady { data: P2pNetworkKademliaRpcRequest::FindNode { key }, - }, + }), ) => { store.dispatch(P2pNetworkKademliaAction::AnswerFindNodeRequest { addr, @@ -72,24 +68,28 @@ impl P2pNetworkKademliaStreamAction { stream_id, .. }, - S::IncomingReply { + D::Outgoing(O::ResponseIsReady { data: P2pNetworkKademliaRpcReply::FindNode { closer_peers }, - }, + }), ) => { - store.dispatch(P2pNetworkKademliaAction::UpdateFindNodeRequest { + let closest_peers = closer_peers.clone(); + store.dispatch(A::WaitOutgoing { addr, peer_id, stream_id, - closest_peers: closer_peers.clone(), }); - store.dispatch(A::WaitOutgoing { + store.dispatch(P2pNetworkKademliaAction::UpdateFindNodeRequest { addr, peer_id, stream_id, + closest_peers, }); Ok(()) } - (A::WaitOutgoing { .. }, S::WaitingOutgoing { .. }) => Ok(()), + ( + A::WaitOutgoing { .. }, + D::Incoming(I::WaitingForReply { .. }) | D::Outgoing(O::WaitingForRequest { .. }), + ) => Ok(()), ( A::SendRequest { addr, @@ -97,13 +97,14 @@ impl P2pNetworkKademliaStreamAction { stream_id, .. } - | A::SendReply { + | A::SendResponse { addr, peer_id, stream_id, .. }, - S::OutgoingBytes { bytes, .. }, + D::Incoming(I::ResponseBytesAreReady { bytes }) + | D::Outgoing(O::RequestBytesAreReady { bytes }), ) => { // send data to the network store.dispatch(P2pNetworkYamuxAction::OutgoingData { @@ -119,13 +120,17 @@ impl P2pNetworkKademliaStreamAction { }); Ok(()) } - (A::WaitIncoming { .. }, S::WaitingIncoming { .. }) => Ok(()), + ( + A::WaitIncoming { .. }, + D::Incoming(I::WaitingForRequest { .. }) | D::Outgoing(O::WaitingForReply), + ) => Ok(()), ( A::Close { addr, stream_id, .. }, - S::OutgoingBytes { .. }, - ) => { + D::Incoming(I::ResponseBytesAreReady { bytes }) + | D::Outgoing(O::RequestBytesAreReady { bytes }), + ) if bytes.len() == 0 => { // send FIN to the network store.dispatch(P2pNetworkYamuxAction::OutgoingData { addr, @@ -141,11 +146,8 @@ impl P2pNetworkKademliaStreamAction { peer_id, stream_id, }, - S::WaitingIncoming { - kind: P2pNetworkKadStreamKind::Incoming, - .. - }, - ) => { + D::Incoming(I::WaitingForRequest { expect_close }), + ) if *expect_close => { // send FIN to the network store.dispatch(P2pNetworkYamuxAction::OutgoingData { addr, @@ -166,10 +168,7 @@ impl P2pNetworkKademliaStreamAction { peer_id, stream_id, }, - S::WaitingIncoming { - kind: P2pNetworkKadStreamKind::Outgoing, - .. - }, + D::Outgoing(O::Closing), ) => { store.dispatch(A::Prune { addr, @@ -178,7 +177,7 @@ impl P2pNetworkKademliaStreamAction { }); Ok(()) } - (action, S::Error(err)) => { + (action, D::Incoming(I::Error(err)) | D::Outgoing(O::Error(err))) => { warn!(meta.time(); summary = "error handling kademlia action", error = err, action = format!("{action:?}")); Ok(()) } diff --git a/p2p/src/network/kad/stream/p2p_network_kad_stream_reducer.rs b/p2p/src/network/kad/stream/p2p_network_kad_stream_reducer.rs index 0680c8330..a67707867 100644 --- a/p2p/src/network/kad/stream/p2p_network_kad_stream_reducer.rs +++ b/p2p/src/network/kad/stream/p2p_network_kad_stream_reducer.rs @@ -4,42 +4,28 @@ use redux::ActionWithMeta; use crate::{P2pNetworkKademliaRpcReply, P2pNetworkKademliaRpcRequest}; use super::{ - super::Message, P2pNetworkKadStreamKind, P2pNetworkKadStreamState, - P2pNetworkKademliaStreamAction, + super::Message, P2pNetworkKadIncomingStreamState, P2pNetworkKadOutgoingStreamState, + P2pNetworkKadStreamState, P2pNetworkKademliaStreamAction, }; -impl P2pNetworkKadStreamState { +impl P2pNetworkKadIncomingStreamState { pub fn reducer( &mut self, action: ActionWithMeta<&P2pNetworkKademliaStreamAction>, ) -> Result<(), String> { - use super::P2pNetworkKadStreamState as S; + use super::P2pNetworkKadIncomingStreamState as S; use super::P2pNetworkKademliaStreamAction as A; + let (action, _meta) = action.split(); - // println!("=== state: {self:?}"); - // println!("=== action: {action:?}"); + match (&self, action) { - (S::Default, A::New { incoming, .. }) => { - let kind = P2pNetworkKadStreamKind::from(*incoming); - *self = match kind { - P2pNetworkKadStreamKind::Incoming => S::WaitingIncoming { - kind, - expect_data: true, - expect_close: false, - }, - P2pNetworkKadStreamKind::Outgoing => S::WaitingOutgoing { - kind, - expect_close: false, - }, + (S::Default, A::New { incoming, .. }) if *incoming == true => { + *self = S::WaitingForRequest { + expect_close: false, }; Ok(()) } - ( - S::WaitingIncoming { - kind, expect_data, .. - }, - A::IncomingData { data, .. }, - ) if *expect_data => { + (S::WaitingForRequest { .. }, A::IncomingData { data, .. }) => { let data = &data.0; let mut reader = BytesReader::from_bytes(data); @@ -49,127 +35,159 @@ impl P2pNetworkKadStreamState { }; if len > reader.len() { - *self = S::IncomingPartialData { - kind: *kind, + *self = S::PartialRequestReceived { len, data: data[(len - reader.len())..].to_vec(), }; return Ok(()); } - self.handle_incoming_message(*kind, len, &data[data.len() - reader.len()..]) + self.handle_incoming_request(len, &data[data.len() - reader.len()..]) } - ( - S::IncomingPartialData { kind, len, data }, - A::IncomingData { data: new_data, .. }, - ) => { + (S::PartialRequestReceived { len, data }, A::IncomingData { data: new_data, .. }) => { let mut data = data.clone(); data.extend_from_slice(&new_data.0); if *len > data.len() { - *self = S::IncomingPartialData { - kind: *kind, - len: *len, - data, - }; + *self = S::PartialRequestReceived { len: *len, data }; return Ok(()); } - self.handle_incoming_message(*kind, *len, &data) + self.handle_incoming_request(*len, &data) } - (S::IncomingRequest { .. }, A::WaitOutgoing { .. }) => { - *self = S::WaitingOutgoing { - kind: P2pNetworkKadStreamKind::Incoming, - expect_close: false, - }; + (S::RequestIsReady { .. }, A::WaitOutgoing { .. }) => { + *self = S::WaitingForReply; + Ok(()) + } + (S::WaitingForReply, A::SendResponse { data, .. }) => { + let message = Message::from(data); + let bytes = serialize_into_vec(&message).map_err(|e| format!("{e}"))?; + *self = S::ResponseBytesAreReady { bytes }; Ok(()) } - (S::IncomingReply { .. }, A::WaitOutgoing { .. }) => { - *self = S::WaitingOutgoing { - kind: P2pNetworkKadStreamKind::Outgoing, - expect_close: true, + (S::ResponseBytesAreReady { .. }, A::WaitIncoming { .. }) => { + *self = S::WaitingForRequest { expect_close: true }; + Ok(()) + } + (S::WaitingForRequest { expect_close, .. }, A::RemoteClose { .. }) if *expect_close => { + *self = S::Closing; + Ok(()) + } + _ => { + return Err(format!( + "kademlia incoming stream state {self:?} is incorrect for action {action:?}", + )); + } + } + } + + fn handle_incoming_request(&mut self, len: usize, data: &[u8]) -> Result<(), String> { + use super::P2pNetworkKadIncomingStreamState::*; + + let mut reader = BytesReader::from_bytes(data); + + let message = match reader.read_message_by_len::(data, len) { + Ok(v) => v, + Err(e) => { + *self = Error(format!("error reading protobuf message: {e}")); + return Ok(()); + } + }; + + let data = match P2pNetworkKademliaRpcRequest::try_from(message.clone()) { + Ok(v) => v, + Err(e) => { + *self = Error(format!("error converting protobuf message: {e}")); + return Ok(()); + } + }; + + *self = P2pNetworkKadIncomingStreamState::RequestIsReady { data }; + Ok(()) + } +} + +impl P2pNetworkKadOutgoingStreamState { + pub fn reducer( + &mut self, + action: ActionWithMeta<&P2pNetworkKademliaStreamAction>, + ) -> Result<(), String> { + use super::P2pNetworkKadOutgoingStreamState as S; + use super::P2pNetworkKademliaStreamAction as A; + let (action, _meta) = action.split(); + // println!("=== state: {self:?}"); + // println!("=== action: {action:?}"); + match (&self, action) { + (S::Default, A::New { incoming, .. }) if !*incoming => { + *self = S::WaitingForRequest { + expect_close: false, }; Ok(()) } - ( - S::WaitingOutgoing { - kind: kind @ P2pNetworkKadStreamKind::Outgoing, - expect_close, - }, - A::SendRequest { data, .. }, - ) if !*expect_close => { + + (S::WaitingForRequest { .. }, A::SendRequest { data, .. }) => { let message = Message::from(data); let bytes = serialize_into_vec(&message).map_err(|e| format!("{e}"))?; - *self = S::OutgoingBytes { kind: *kind, bytes }; + *self = S::RequestBytesAreReady { bytes }; Ok(()) } - ( - S::WaitingOutgoing { - kind: kind @ P2pNetworkKadStreamKind::Incoming, - expect_close, - }, - A::SendReply { data, .. }, - ) if !*expect_close => { - let message = Message::from(data); - let bytes = serialize_into_vec(&message).map_err(|e| format!("{e}"))?; - *self = S::OutgoingBytes { kind: *kind, bytes }; + (S::RequestBytesAreReady { .. }, A::WaitIncoming { .. }) => { + *self = S::WaitingForReply; Ok(()) } - (S::WaitingOutgoing { kind, expect_close }, A::Close { .. }) if *expect_close => { - *self = S::OutgoingBytes { - kind: *kind, - bytes: Vec::new(), + + (S::WaitingForReply { .. }, A::IncomingData { data, .. }) => { + let data = &data.0; + + let mut reader = BytesReader::from_bytes(data); + let Ok(len) = reader.read_varint32(data).map(|v| v as usize) else { + *self = S::Error("error reading message length".to_owned()); + return Ok(()); }; + + if len > reader.len() { + *self = S::PartialReplyReceived { + len, + data: data[(len - reader.len())..].to_vec(), + }; + return Ok(()); + } + + self.handle_incoming_response(len, &data[data.len() - reader.len()..]) + } + (S::PartialReplyReceived { len, data }, A::IncomingData { data: new_data, .. }) => { + let mut data = data.clone(); + data.extend_from_slice(&new_data.0); + + if *len > data.len() { + *self = S::PartialReplyReceived { len: *len, data }; + return Ok(()); + } + + self.handle_incoming_response(*len, &data) + } + (S::ResponseIsReady { .. }, A::WaitOutgoing { .. }) => { + *self = S::WaitingForRequest { expect_close: true }; Ok(()) } - (S::OutgoingBytes { kind, bytes }, A::WaitIncoming { .. }) => { - let (expect_data, expect_close) = match kind { - // for incoming connection, after the first round we expect both new request or close - P2pNetworkKadStreamKind::Incoming => (true, true), - // for outgoing connection, we expect data and not close iff we sent data - P2pNetworkKadStreamKind::Outgoing => (!bytes.is_empty(), bytes.is_empty()), - }; - *self = S::WaitingIncoming { - kind: *kind, - expect_data, - expect_close, - }; + (S::WaitingForRequest { expect_close }, A::Close { .. }) if *expect_close => { + *self = S::RequestBytesAreReady { bytes: Vec::new() }; Ok(()) } - (S::WaitingIncoming { expect_close, .. }, A::RemoteClose { .. }) if *expect_close => { + (S::Closing, A::RemoteClose { .. }) => { *self = S::Closed; Ok(()) } _ => { return Err(format!( - "kademlia state {self:?} is incorrect for action {action:?}" + "kademlia outgoing stream state {self:?} is incorrect for action {action:?}", )); } } } - fn handle_incoming_message( - &mut self, - kind: P2pNetworkKadStreamKind, - len: usize, - data: &[u8], - ) -> Result<(), String> { - match kind { - P2pNetworkKadStreamKind::Incoming => { - self._handle_incoming_message::(len, data) - } - P2pNetworkKadStreamKind::Outgoing => { - self._handle_incoming_message::(len, data) - } - } - } - - fn _handle_incoming_message<'a, T>(&mut self, len: usize, data: &'a [u8]) -> Result<(), String> - where - T: std::fmt::Debug + TryFrom> + Into, - T::Error: std::error::Error, - { - use super::P2pNetworkKadStreamState::*; + fn handle_incoming_response(&mut self, len: usize, data: &[u8]) -> Result<(), String> { + use super::P2pNetworkKadOutgoingStreamState::*; let mut reader = BytesReader::from_bytes(data); @@ -181,7 +199,7 @@ impl P2pNetworkKadStreamState { } }; - let data = match T::try_from(message.clone()) { + let data = match P2pNetworkKademliaRpcReply::try_from(message.clone()) { Ok(v) => v, Err(e) => { *self = Error(format!("error converting protobuf message: {e}")); @@ -189,7 +207,19 @@ impl P2pNetworkKadStreamState { } }; - *self = data.into(); + *self = P2pNetworkKadOutgoingStreamState::ResponseIsReady { data }; Ok(()) } } + +impl P2pNetworkKadStreamState { + pub fn reducer( + &mut self, + action: ActionWithMeta<&P2pNetworkKademliaStreamAction>, + ) -> Result<(), String> { + match self { + P2pNetworkKadStreamState::Incoming(i) => i.reducer(action), + P2pNetworkKadStreamState::Outgoing(o) => o.reducer(action), + } + } +} diff --git a/p2p/src/network/kad/stream/p2p_network_kad_stream_state.rs b/p2p/src/network/kad/stream/p2p_network_kad_stream_state.rs index 3be649c4b..79e434b3e 100644 --- a/p2p/src/network/kad/stream/p2p_network_kad_stream_state.rs +++ b/p2p/src/network/kad/stream/p2p_network_kad_stream_state.rs @@ -2,73 +2,64 @@ use serde::{Deserialize, Serialize}; use crate::{P2pNetworkKademliaRpcReply, P2pNetworkKademliaRpcRequest}; -#[derive(Clone, Copy, Debug, Serialize, Deserialize)] -pub enum P2pNetworkKadStreamKind { - Incoming, - Outgoing, +#[derive(Clone, Debug, Serialize, Deserialize)] +pub enum P2pNetworkKadStreamState { + Incoming(P2pNetworkKadIncomingStreamState), + Outgoing(P2pNetworkKadOutgoingStreamState), } -impl From for P2pNetworkKadStreamKind { - fn from(incoming: bool) -> Self { +impl P2pNetworkKadStreamState { + pub fn new(incoming: bool) -> Self { if incoming { - P2pNetworkKadStreamKind::Incoming + P2pNetworkKadStreamState::Incoming(Default::default()) } else { - P2pNetworkKadStreamKind::Outgoing + P2pNetworkKadStreamState::Outgoing(Default::default()) } } } +/// Incoming Kademlia stream is used by a remote peer to perform a Kademlia request. #[derive(Clone, Debug, Default, Serialize, Deserialize)] -pub enum P2pNetworkKadStreamState { +pub enum P2pNetworkKadIncomingStreamState { #[default] Default, /// Waiting for the incoming request. - WaitingIncoming { - kind: P2pNetworkKadStreamKind, - expect_data: bool, - expect_close: bool, - }, + WaitingForRequest { expect_close: bool }, /// A portion of data from the stream is received. - IncomingPartialData { - kind: P2pNetworkKadStreamKind, - len: usize, - data: Vec, - }, + PartialRequestReceived { len: usize, data: Vec }, /// Request from the stream is received. - IncomingRequest { data: P2pNetworkKademliaRpcRequest }, - /// Request from the stream is received. - IncomingReply { data: P2pNetworkKademliaRpcReply }, + RequestIsReady { data: P2pNetworkKademliaRpcRequest }, /// Waiting for an outgoing data, or for finalization of the stream (iff `expect_fin` is `true`) - WaitingOutgoing { - kind: P2pNetworkKadStreamKind, - expect_close: bool, - }, + WaitingForReply, /// Response bytes for the remote request is ready to be written into the stream. - OutgoingBytes { - kind: P2pNetworkKadStreamKind, - bytes: Vec, - }, + ResponseBytesAreReady { bytes: Vec }, + /// Remote peer half-closed the stream. + Closing, /// The stream is closed. Closed, /// Error handling the stream. /// TODO: use enum for errors. Error(String), } - -impl P2pNetworkKadStreamState { - pub fn new() -> Self { - P2pNetworkKadStreamState::Default - } -} - -impl From for P2pNetworkKadStreamState { - fn from(data: P2pNetworkKademliaRpcRequest) -> Self { - P2pNetworkKadStreamState::IncomingRequest { data } - } -} - -impl From for P2pNetworkKadStreamState { - fn from(data: P2pNetworkKademliaRpcReply) -> Self { - P2pNetworkKadStreamState::IncomingReply { data } - } +#[derive(Clone, Debug, Default, Serialize, Deserialize)] +pub enum P2pNetworkKadOutgoingStreamState { + #[default] + Default, + /// Waiting for an outgoing data, or for finalization of the stream (iff `expect_close` is `true`) + WaitingForRequest { expect_close: bool }, + /// Response bytes for the remote request are ready to be written into the stream. + RequestBytesAreReady { bytes: Vec }, + /// Waiting for the incoming reply. + WaitingForReply, + /// A portion of data from the stream is received. + PartialReplyReceived { len: usize, data: Vec }, + /// Response from the stream is received. + ResponseIsReady { data: P2pNetworkKademliaRpcReply }, + /// Closing the stream. + Closing, + /// The stream is closed. + Closed, + /// Error handling the stream. + /// TODO: use enum for errors. + Error(String), } diff --git a/p2p/src/network/noise/p2p_network_noise_actions.rs b/p2p/src/network/noise/p2p_network_noise_actions.rs index 284a67d9a..5433913de 100644 --- a/p2p/src/network/noise/p2p_network_noise_actions.rs +++ b/p2p/src/network/noise/p2p_network_noise_actions.rs @@ -1,12 +1,14 @@ use std::net::SocketAddr; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::{Data, P2pNetworkAction, P2pState, PeerId}; use super::p2p_network_noise_state::{Pk, Sk}; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(level = trace, fields(display(addr), incoming, debug(data), display(peer_id)))] pub enum P2pNetworkNoiseAction { Init { addr: SocketAddr, @@ -36,6 +38,7 @@ pub enum P2pNetworkNoiseAction { data: Data, }, // the remote peer sends the data to internals thru noise + #[action_event(fields(display(addr), debug(data), debug(peer_id)))] DecryptedData { addr: SocketAddr, peer_id: Option, diff --git a/p2p/src/network/p2p_network_effects.rs b/p2p/src/network/p2p_network_effects.rs index 0e88dc326..2655e6d4d 100644 --- a/p2p/src/network/p2p_network_effects.rs +++ b/p2p/src/network/p2p_network_effects.rs @@ -16,7 +16,7 @@ impl P2pNetworkAction { Self::Yamux(v) => v.effects(meta, store), Self::Kad(v) => match v.effects(meta, store) { Ok(_) => {} - Err(e) => error!(meta.time(); "error dispatching Kademlia stream action: {e}"), + Err(e) => error!(meta.time(); "error dispatching Kademlia action: {e}"), }, Self::Rpc(v) => v.effects(meta, store), } diff --git a/p2p/src/network/pnet/p2p_network_pnet_actions.rs b/p2p/src/network/pnet/p2p_network_pnet_actions.rs index f2b80f0c7..213f6ea6f 100644 --- a/p2p/src/network/pnet/p2p_network_pnet_actions.rs +++ b/p2p/src/network/pnet/p2p_network_pnet_actions.rs @@ -1,10 +1,12 @@ use std::net::SocketAddr; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::{Data, P2pState}; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(addr), debug(data), incoming), level = trace)] pub enum P2pNetworkPnetAction { IncomingData { addr: SocketAddr, @@ -14,6 +16,7 @@ pub enum P2pNetworkPnetAction { addr: SocketAddr, data: Data, }, + #[action_event(level = debug)] SetupNonce { addr: SocketAddr, nonce: Data, diff --git a/p2p/src/network/rpc/p2p_network_rpc_actions.rs b/p2p/src/network/rpc/p2p_network_rpc_actions.rs index 9392462f8..e15a0ad2a 100644 --- a/p2p/src/network/rpc/p2p_network_rpc_actions.rs +++ b/p2p/src/network/rpc/p2p_network_rpc_actions.rs @@ -1,12 +1,14 @@ use std::net::SocketAddr; use mina_p2p_messages::rpc_kernel::{QueryHeader, ResponseHeader}; +use openmina_core::{action_debug, action_trace, ActionEvent}; use serde::{Deserialize, Serialize}; use super::{super::*, *}; use crate::{P2pState, PeerId}; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(addr), display(peer_id), incoming, stream_id, debug(data), fin))] pub enum P2pNetworkRpcAction { Init { addr: SocketAddr, @@ -14,12 +16,14 @@ pub enum P2pNetworkRpcAction { stream_id: StreamId, incoming: bool, }, + #[action_event(level = trace)] IncomingData { addr: SocketAddr, peer_id: PeerId, stream_id: StreamId, data: Data, }, + #[action_event(expr(log_message(context, message, addr, peer_id, stream_id)))] IncomingMessage { addr: SocketAddr, peer_id: PeerId, @@ -129,3 +133,46 @@ impl redux::EnablingCondition for P2pNetworkRpcAction { } } } + +fn log_message( + context: &T, + message: &RpcMessage, + addr: &SocketAddr, + peer_id: &PeerId, + stream_id: &u32, +) where + T: openmina_core::log::EventContext, +{ + match message { + RpcMessage::Handshake => action_trace!( + context, + addr = display(addr), + peer_id = display(peer_id), + stream_id, + message_kind = "handshake" + ), + RpcMessage::Heartbeat => action_trace!( + context, + addr = display(addr), + peer_id = display(peer_id), + stream_id, + message_kind = "heartbeat" + ), + RpcMessage::Query { header, .. } => action_debug!( + context, + addr = display(addr), + peer_id = display(peer_id), + stream_id, + message_kind = "query", + message_header = debug(header) + ), + RpcMessage::Response { header, .. } => action_debug!( + context, + addr = display(addr), + peer_id = display(peer_id), + stream_id, + message_kind = "response", + message_header = debug(header) + ), + } +} diff --git a/p2p/src/network/scheduler/p2p_network_scheduler_actions.rs b/p2p/src/network/scheduler/p2p_network_scheduler_actions.rs index c3fd79f82..0d718cd95 100644 --- a/p2p/src/network/scheduler/p2p_network_scheduler_actions.rs +++ b/p2p/src/network/scheduler/p2p_network_scheduler_actions.rs @@ -1,5 +1,6 @@ use std::net::{IpAddr, SocketAddr}; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use super::{ @@ -12,7 +13,8 @@ use super::{ use crate::{disconnection::P2pDisconnectionReason, P2pState, PeerId}; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(ip), display(listener), display(addr), debug(result), select_kind = debug(kind)))] pub enum P2pNetworkSchedulerAction { InterfaceDetected { ip: IpAddr, @@ -23,6 +25,7 @@ pub enum P2pNetworkSchedulerAction { IncomingConnectionIsReady { listener: SocketAddr, }, + #[action_event(fields(debug(addr), debug(result)))] IncomingDidAccept { addr: Option, result: Result<(), String>, diff --git a/p2p/src/network/scheduler/p2p_network_scheduler_state.rs b/p2p/src/network/scheduler/p2p_network_scheduler_state.rs index 750661520..cdaa4ebad 100644 --- a/p2p/src/network/scheduler/p2p_network_scheduler_state.rs +++ b/p2p/src/network/scheduler/p2p_network_scheduler_state.rs @@ -55,10 +55,12 @@ impl P2pNetworkConnectionState { } } -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, derive_more::From)] +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, thiserror::Error)] pub enum P2pNetworkConnectionCloseReason { - Disconnect(P2pDisconnectionReason), - Error(P2pNetworkConnectionError), + #[error("peer is disconnected: {0}")] + Disconnect(#[from] P2pDisconnectionReason), + #[error("connection error: {0}")] + Error(#[from] P2pNetworkConnectionError), } /// P2p connection error. diff --git a/p2p/src/network/select/p2p_network_select_actions.rs b/p2p/src/network/select/p2p_network_select_actions.rs index c8cb524e2..7a672280f 100644 --- a/p2p/src/network/select/p2p_network_select_actions.rs +++ b/p2p/src/network/select/p2p_network_select_actions.rs @@ -1,13 +1,17 @@ use std::net::SocketAddr; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use crate::{Data, P2pState, PeerId}; use super::{super::*, *}; -#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone)] +#[derive(derive_more::From, Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(addr), select_kind = debug(kind), debug(data), send_handshake, fin, debug(token), debug(tokens)))] pub enum P2pNetworkSelectAction { + /// Initialize protocol selection. + /// /// Multistream Select protocol is running multiple times: /// When Pnet protocol is done for newly established TCP connection. We don't have `peer_id` yet. /// When Noise protocol is done and we have a `peer_id`. @@ -18,6 +22,7 @@ pub enum P2pNetworkSelectAction { incoming: bool, send_handshake: bool, }, + #[action_event(level = trace)] IncomingData { addr: SocketAddr, kind: SelectKind, diff --git a/p2p/src/network/yamux/p2p_network_yamux_actions.rs b/p2p/src/network/yamux/p2p_network_yamux_actions.rs index 1ed902748..0a1dc6864 100644 --- a/p2p/src/network/yamux/p2p_network_yamux_actions.rs +++ b/p2p/src/network/yamux/p2p_network_yamux_actions.rs @@ -1,11 +1,13 @@ use std::net::SocketAddr; +use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use super::p2p_network_yamux_state::{StreamId, YamuxFrame, YamuxPing}; use crate::{token, Data, P2pState}; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(addr), stream_id, debug(data), fin, debug(stream_kind)))] pub enum P2pNetworkYamuxAction { IncomingData { addr: SocketAddr, @@ -17,10 +19,12 @@ pub enum P2pNetworkYamuxAction { data: Data, fin: bool, }, + #[action_event(level = trace)] IncomingFrame { addr: SocketAddr, frame: YamuxFrame, }, + #[action_event(level = trace)] OutgoingFrame { addr: SocketAddr, frame: YamuxFrame, diff --git a/p2p/src/peer/p2p_peer_actions.rs b/p2p/src/peer/p2p_peer_actions.rs index f27d7fbb8..cb111d734 100644 --- a/p2p/src/peer/p2p_peer_actions.rs +++ b/p2p/src/peer/p2p_peer_actions.rs @@ -1,4 +1,4 @@ -use openmina_core::block::ArcBlockWithHash; +use openmina_core::{block::ArcBlockWithHash, ActionEvent}; use serde::{Deserialize, Serialize}; use crate::{P2pState, PeerId}; @@ -6,12 +6,12 @@ use crate::{P2pState, PeerId}; pub type P2pPeerActionWithMeta = redux::ActionWithMeta; pub type P2pPeerActionWithMetaRef<'a> = redux::ActionWithMeta<&'a P2pPeerAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(level = info, fields(display(peer_id), best_tip = display(&best_tip.hash), incoming))] pub enum P2pPeerAction { - Ready { - peer_id: PeerId, - incoming: bool, - }, + /// Peer is ready. + Ready { peer_id: PeerId, incoming: bool }, + /// Peer's best tip is updated. BestTipUpdate { peer_id: PeerId, best_tip: ArcBlockWithHash, diff --git a/snark/Cargo.toml b/snark/Cargo.toml index 82794f347..bb94c764f 100644 --- a/snark/Cargo.toml +++ b/snark/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "snark" -version = "0.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0" @@ -28,6 +28,7 @@ mina-p2p-messages = { workspace = true } sha2 = "0.10" num-bigint = "0.4" bincode = "1.3.3" +thiserror = "1.0.50" rand = "0.8" rayon = "1.5" diff --git a/snark/src/work_verify/mod.rs b/snark/src/work_verify/mod.rs index 0401b123b..158106534 100644 --- a/snark/src/work_verify/mod.rs +++ b/snark/src/work_verify/mod.rs @@ -22,8 +22,10 @@ impl openmina_core::requests::RequestIdType for SnarkWorkVerifyIdType { pub type SnarkWorkVerifyId = openmina_core::requests::RequestId; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, thiserror::Error)] pub enum SnarkWorkVerifyError { + #[error("verification failed")] VerificationFailed, + #[error("validator thread crashed")] ValidatorThreadCrashed, } diff --git a/snark/src/work_verify/snark_work_verify_actions.rs b/snark/src/work_verify/snark_work_verify_actions.rs index f204bfebe..a0bd6155f 100644 --- a/snark/src/work_verify/snark_work_verify_actions.rs +++ b/snark/src/work_verify/snark_work_verify_actions.rs @@ -1,14 +1,16 @@ use serde::{Deserialize, Serialize}; -use openmina_core::snark::Snark; +use openmina_core::{snark::Snark, ActionEvent}; use super::{SnarkWorkVerifyError, SnarkWorkVerifyId}; pub type SnarkWorkVerifyActionWithMeta = redux::ActionWithMeta; pub type SnarkWorkVerifyActionWithMetaRef<'a> = redux::ActionWithMeta<&'a SnarkWorkVerifyAction>; -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(level = trace, fields(display(req_id), display(error)))] pub enum SnarkWorkVerifyAction { + #[action_event(level = info)] Init { req_id: SnarkWorkVerifyId, batch: Vec, @@ -21,6 +23,7 @@ pub enum SnarkWorkVerifyAction { req_id: SnarkWorkVerifyId, error: SnarkWorkVerifyError, }, + #[action_event(level = info)] Success { req_id: SnarkWorkVerifyId, }, diff --git a/tools/bootstrap-sandbox/Cargo.toml b/tools/bootstrap-sandbox/Cargo.toml index 694705afc..9ca43fb80 100644 --- a/tools/bootstrap-sandbox/Cargo.toml +++ b/tools/bootstrap-sandbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openmina-bootstrap-sandbox" -version = "0.3.0" +version = "0.3.1" edition = "2021" [dependencies] diff --git a/tools/hash-tool/Cargo.toml b/tools/hash-tool/Cargo.toml index cbcb9a422..d26755aba 100644 --- a/tools/hash-tool/Cargo.toml +++ b/tools/hash-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hash-tool" -version = "0.3.0" +version = "0.3.1" edition = "2021" [dependencies] diff --git a/tools/ledger-tool/Cargo.toml b/tools/ledger-tool/Cargo.toml index 39d7134d7..d5f82ae74 100644 --- a/tools/ledger-tool/Cargo.toml +++ b/tools/ledger-tool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ledger-tool" -version = "0.3.0" +version = "0.3.1" edition = "2021" [dependencies] diff --git a/tools/salsa-simple/Cargo.toml b/tools/salsa-simple/Cargo.toml index 24634ef50..594efcb08 100644 --- a/tools/salsa-simple/Cargo.toml +++ b/tools/salsa-simple/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "salsa-simple" -version = "0.3.0" +version = "0.3.1" edition = "2021" [dev-dependencies] diff --git a/tools/transport/Cargo.toml b/tools/transport/Cargo.toml index d19d34eed..0ffdad802 100644 --- a/tools/transport/Cargo.toml +++ b/tools/transport/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mina-transport" -version = "0.3.0" +version = "0.3.1" edition = "2021" [dependencies] diff --git a/vrf/Cargo.toml b/vrf/Cargo.toml index cadfc1277..3c5cbcaa0 100644 --- a/vrf/Cargo.toml +++ b/vrf/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vrf" -version = "0.3.0" +version = "0.3.1" edition = "2021" license = "Apache-2.0"