diff --git a/frontend/angular.json b/frontend/angular.json index b6f5338908..92c363c98c 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -29,8 +29,11 @@ "prefix": "mina", "architect": { "build": { - "builder": "@angular-devkit/build-angular:browser", + "builder": "@angular-builders/custom-webpack:browser", "options": { + "customWebpackConfig": { + "path": "./webpack.config.js" + }, "outputPath": "dist/frontend", "index": "src/index.html", "main": "src/main.ts", @@ -123,7 +126,7 @@ "defaultConfiguration": "production" }, "serve": { - "builder": "@angular-devkit/build-angular:dev-server", + "builder": "@angular-builders/custom-webpack:dev-server", "configurations": { "production": { "browserTarget": "frontend:build:production" diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 481aeab759..4a01166329 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -25,12 +25,14 @@ "@ngrx/store": "^16.2.0", "@openmina/shared": "^0.102.0", "base-x": "^5.0.0", + "bs58check": "^4.0.0", "buffer": "^6.0.3", "d3": "^7.8.4", "eigen": "^0.2.2", "mathjs": "^12.3.0", "mina-signer": "^3.0.7", "ngx-json-viewer": "^3.2.1", + "o1js": "^1.7.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", "zone.js": "~0.13.0" @@ -3556,6 +3558,17 @@ "webpack": "^5.54.0" } }, + "node_modules/@noble/hashes": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.5.0.tgz", + "integrity": "sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==", + "engines": { + "node": "^14.21.3 || >=16" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "dev": true, @@ -5373,6 +5386,23 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/bs58": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/bs58/-/bs58-6.0.0.tgz", + "integrity": "sha512-PD0wEnEYg6ijszw/u8s+iI3H17cTymlrwkKhDhPZq+Sokl3AU4htyBFTjAeNAlCCmg0f53g6ih3jATyCKftTfw==", + "dependencies": { + "base-x": "^5.0.0" + } + }, + "node_modules/bs58check": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/bs58check/-/bs58check-4.0.0.tgz", + "integrity": "sha512-FsGDOnFg9aVI9erdriULkd/JjEWONV/lQE5aYziB5PoBsXRind56lh8doIZIc9X4HoxT5x4bLjMWN1/NB8Zp5g==", + "dependencies": { + "@noble/hashes": "^1.2.0", + "bs58": "^6.0.0" + } + }, "node_modules/buffer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", @@ -5508,7 +5538,6 @@ }, "node_modules/cachedir": { "version": "2.4.0", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -7228,7 +7257,6 @@ }, "node_modules/encoding": { "version": "0.1.13", - "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -7237,7 +7265,6 @@ }, "node_modules/encoding/node_modules/iconv-lite": { "version": "0.6.3", - "dev": true, "license": "MIT", "optional": true, "dependencies": { @@ -9114,6 +9141,15 @@ "node": ">=0.10.0" } }, + "node_modules/isomorphic-fetch": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz", + "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==", + "dependencies": { + "node-fetch": "^2.6.1", + "whatwg-fetch": "^3.4.1" + } + }, "node_modules/isstream": { "version": "0.1.2", "dev": true, @@ -10734,6 +10770,44 @@ "license": "MIT", "optional": true }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/node-forge": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", @@ -11046,6 +11120,25 @@ "dev": true, "license": "MIT" }, + "node_modules/o1js": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/o1js/-/o1js-1.7.0.tgz", + "integrity": "sha512-/gQKJLRuqDrArdU/QkaU0F1lQl/K6/170U01JeU2xIpryN6vBwENfEHWpHt1FXOmGwyTsQHmrJLWfyFLjQOkeA==", + "dependencies": { + "blakejs": "1.2.1", + "cachedir": "^2.4.0", + "isomorphic-fetch": "^3.0.0", + "js-sha256": "^0.9.0", + "reflect-metadata": "^0.1.13", + "tslib": "^2.3.0" + }, + "bin": { + "snarky-run": "src/build/run.js" + }, + "engines": { + "node": ">=18.14.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "dev": true, @@ -12046,7 +12139,6 @@ }, "node_modules/reflect-metadata": { "version": "0.1.13", - "dev": true, "license": "Apache-2.0" }, "node_modules/regenerate": { @@ -14488,6 +14580,11 @@ "iconv-lite": "0.4.24" } }, + "node_modules/whatwg-fetch": { + "version": "3.6.20", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz", + "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==" + }, "node_modules/whatwg-mimetype": { "version": "2.3.0", "dev": true, diff --git a/frontend/package.json b/frontend/package.json index 3b366703e2..d4462fe897 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -31,12 +31,14 @@ "@ngrx/store": "^16.2.0", "@openmina/shared": "^0.102.0", "base-x": "^5.0.0", + "bs58check": "^4.0.0", "buffer": "^6.0.3", "d3": "^7.8.4", "eigen": "^0.2.2", "mathjs": "^12.3.0", "mina-signer": "^3.0.7", "ngx-json-viewer": "^3.2.1", + "o1js": "^1.7.0", "rxjs": "~7.8.0", "tslib": "^2.3.0", "zone.js": "~0.13.0" diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts index 5282bc8752..7009c8da28 100644 --- a/frontend/src/app/app.component.ts +++ b/frontend/src/app/app.component.ts @@ -8,6 +8,24 @@ import { AppSelectors } from '@app/app.state'; import { AppActions } from '@app/app.actions'; import { Observable, timer } from 'rxjs'; import { CONFIG } from '@shared/constants/config'; +// import { AccountUpdate, declareMethods, Field, method, Mina, PrivateKey, SmartContract, State, state } from 'o1js'; + +// export class Square extends SmartContract { +// @state(Field) num = State(); +// +// override init() { +// super.init(); +// this.num.set(Field(3)); +// } +// +// // @method +// async update(square: Field) { +// const currentState = this.num.get(); +// this.num.requireEquals(currentState); +// square.assertEquals(currentState.mul(currentState)); +// this.num.set(square); +// } +// } @Component({ selector: 'app-root', @@ -36,8 +54,80 @@ export class AppComponent extends ManualDetection implements OnInit { this.scheduleNodeUpdates(); } this.listenToWindowResizing(); + // console.log('Start'); + // this.startZK(); + // console.log('Finish!'); } + +// async startZK() { +// //@ts-ignore +// declareMethods(Square, { update: [Field] }); +// +// const useProof = false; +// +// const Local = await Mina.LocalBlockchain({ proofsEnabled: useProof }); +// Mina.setActiveInstance(Local); +// +// const deployerAccount = Local.testAccounts[0]; +// const deployerKey = deployerAccount.key; +// const senderAccount = Local.testAccounts[1]; +// const senderKey = senderAccount.key; +// // ---------------------------------------------------- +// +// // Create a public/private key pair. The public key is your address and where you deploy the zkApp to +// const zkAppPrivateKey = PrivateKey.random(); +// const zkAppAddress = zkAppPrivateKey.toPublicKey(); +// +// // create an instance of Square - and deploy it to zkAppAddress +// const zkAppInstance = new Square(zkAppAddress); +// const deployTxn = await Mina.transaction(deployerAccount, async () => { +// AccountUpdate.fundNewAccount(deployerAccount); +// await zkAppInstance.deploy(); +// }); +// await deployTxn.sign([deployerKey, zkAppPrivateKey]).send(); +// +// // get the initial state of Square after deployment +// const num0 = zkAppInstance.num.get(); +// console.log('state after init:', num0.toString()); +// +// // ---------------------------------------------------- +// +// const txn1 = await Mina.transaction(senderAccount, async () => { +// await zkAppInstance.update(Field(9)); +// }); +// await txn1.prove(); +// await txn1.sign([senderKey]).send(); +// +// const num1 = zkAppInstance.num.get(); +// console.log('state after txn1:', num1.toString()); +// +// // ---------------------------------------------------- +// +// try { +// const txn2 = await Mina.transaction(senderAccount, async () => { +// await zkAppInstance.update(Field(75)); +// }); +// await txn2.prove(); +// await txn2.sign([senderKey]).send(); +// } catch (error: any) { +// console.log(error.message); +// } +// const num2 = zkAppInstance.num.get(); +// console.log('state after txn2:', num2.toString()); +// +// // ---------------------------------------------------- +// +// const txn3 = await Mina.transaction(senderAccount, async () => { +// await zkAppInstance.update(Field(81)); +// }); +// await txn3.prove(); +// await txn3.sign([senderKey]).send(); +// +// const num3 = zkAppInstance.num.get(); +// console.log('state after txn3:', num3.toString()); +// } + private scheduleNodeUpdates(): void { timer(1000, 5000).subscribe(() => this.store.dispatch(AppActions.getNodeDetails())); } diff --git a/frontend/src/app/app.effects.ts b/frontend/src/app/app.effects.ts index 3adfcc79ea..31c3c99799 100644 --- a/frontend/src/app/app.effects.ts +++ b/frontend/src/app/app.effects.ts @@ -12,6 +12,9 @@ import { getFirstFeature, isFeatureEnabled } from '@shared/constants/config'; import { RustService } from '@core/services/rust.service'; import { BaseEffect } from '@shared/base-classes/mina-rust-base.effect'; import { WebNodeService } from '@core/services/web-node.service'; +import { catchErrorAndRepeat2 } from '@shared/constants/store-functions'; +import { MinaErrorType } from '@shared/types/error-preview/mina-error-type.enum'; +import { AppNodeStatus } from '@shared/types/app/app-node-details.type'; const INIT_EFFECTS = '@ngrx/effects/init'; @@ -82,6 +85,18 @@ export class AppEffects extends BaseEffect { switchMap(() => this.appService.getActiveNodeDetails()), tap(() => this.requestInProgress = false), map(details => AppActions.getNodeDetailsSuccess({ details })), + catchErrorAndRepeat2(MinaErrorType.GENERIC, AppActions.getNodeDetailsSuccess({ + details: { + status: AppNodeStatus.OFFLINE, + blockHeight: null, + blockTime: null, + peers: 0, + download: 0, + upload: 0, + transactions: 0, + snarks: 0, + }, + })), )); } } diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index f0337190f0..f48340bf60 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -5,6 +5,7 @@ import { AppComponent } from './app.component'; import { AppRouting } from './app.routing'; import { MatSidenavModule } from '@angular/material/sidenav'; import { + CopyComponent, GlobalErrorHandlerService, HorizontalMenuComponent, NgrxRouterStoreModule, @@ -79,6 +80,7 @@ export class AppGlobalErrorhandler implements ErrorHandler { OpenminaEagerSharedModule, HorizontalMenuComponent, ReactiveFormsModule, + CopyComponent, ], providers: [ THEME_PROVIDER, diff --git a/frontend/src/app/app.routing.ts b/frontend/src/app/app.routing.ts index 7918f7fd26..aa4c02e7da 100644 --- a/frontend/src/app/app.routing.ts +++ b/frontend/src/app/app.routing.ts @@ -68,6 +68,11 @@ const routes: Routes = [ loadChildren: () => import('./features/benchmarks/benchmarks.module').then(m => m.BenchmarksModule), title: BENCHMARKS_TITLE, }, + { + path: 'zk', + loadChildren: () => import('./features/zk/zk.module').then(m => m.ZkModule), + title: BENCHMARKS_TITLE, + }, { path: '**', redirectTo: getFirstFeature(), diff --git a/frontend/src/app/app.service.ts b/frontend/src/app/app.service.ts index a078a38b98..91ed8f51a2 100644 --- a/frontend/src/app/app.service.ts +++ b/frontend/src/app/app.service.ts @@ -38,16 +38,7 @@ export class AppService { upload: 0, snarks: data.snark_pool.snarks, transactions: data.transaction_pool.transactions, - } as AppNodeDetails)), - catchError(() => of({ - status: AppNodeStatus.OFFLINE, - blockHeight: null, - blockTime: null, - peers: 0, - download: 0, - upload: 0, - transactions: 0, - snarks: 0, + chainId: data.chain_id, } as AppNodeDetails)), ); } @@ -71,6 +62,7 @@ export interface NodeDetailsResponse { transaction_pool: { transactions: number }; peers: Peer[]; snark_pool: SnarkPool; + chain_id: string | undefined; } interface TransitionFrontier { diff --git a/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets.service.ts b/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets.service.ts index 2e630d61d5..5e8676020d 100644 --- a/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets.service.ts +++ b/frontend/src/app/features/benchmarks/wallets/benchmarks-wallets.service.ts @@ -7,10 +7,12 @@ import { RustService } from '@core/services/rust.service'; import { MempoolTransaction, MempoolTransactionKind, - SignedCommand, ZkappCommand, + SignedCommand, + ZkappCommand, } from '@shared/types/mempool/mempool-transaction.type'; -import { getTimeFromMemo, removeUnicodeEscapes } from '@shared/helpers/transaction.helper'; -import { any, ONE_BILLION } from '@openmina/shared'; +import { decodeMemo, getTimeFromMemo, removeUnicodeEscapes } from '@shared/helpers/transaction.helper'; +import { ONE_BILLION } from '@openmina/shared'; +import { MempoolTransactionResponseKind } from '@app/features/mempool/mempool.service'; export const WALLETS: { privateKey: string, publicKey: string }[] = [ { @@ -4098,28 +4100,40 @@ export class BenchmarksWalletsService { } getAllIncludedTransactions(): Observable { - return this.rust.get>('/best-chain-user-commands').pipe( + return this.rust.get>('/best-chain-user-commands').pipe( map(data => this.mapTxPoolResponse(data)), ); } - private mapTxPoolResponse(response: Array<{ SignedCommand: SignedCommand } | { - ZkappCommand: ZkappCommand - }>): MempoolTransaction[] { + private mapTxPoolResponse(response: Array<[MempoolTransactionResponseKind, SignedCommand | ZkappCommand]>): MempoolTransaction[] { + // return response + // .filter(tx => !!any(tx).SignedCommand) + // .map(tx => tx as { SignedCommand: SignedCommand }) + // .map((tx: { SignedCommand: SignedCommand }) => ({ + // kind: MempoolTransactionKind.PAYMENT, + // sender: tx.SignedCommand.payload.common.fee_payer_pk, + // fee: Number(tx.SignedCommand.payload.common.fee), + // nonce: Number(tx.SignedCommand.payload.common.nonce), + // memo: removeUnicodeEscapes(tx.SignedCommand.payload.common.memo), + // transactionData: tx.SignedCommand, + // sentFromStressingTool: tx.SignedCommand.payload.common.memo.includes('S.T.'), + // sentByMyBrowser: tx.SignedCommand.payload.common.memo.includes(localStorage.getItem('browserId')), + // } as MempoolTransaction)); return response - .filter(tx => !!any(tx).SignedCommand) - .map(tx => tx as { SignedCommand: SignedCommand }) - .map((tx: { SignedCommand: SignedCommand }) => ({ - kind: MempoolTransactionKind.PAYMENT, - sender: tx.SignedCommand.payload.common.fee_payer_pk, - fee: Number(tx.SignedCommand.payload.common.fee), - nonce: Number(tx.SignedCommand.payload.common.nonce), - memo: removeUnicodeEscapes(tx.SignedCommand.payload.common.memo), - transactionData: tx.SignedCommand, - sentFromStressingTool: tx.SignedCommand.payload.common.memo.includes('S.T.'), - sentByMyBrowser: tx.SignedCommand.payload.common.memo.includes(localStorage.getItem('browserId')), - } as MempoolTransaction)); + .filter(tx => tx[0] === MempoolTransactionResponseKind.SignedCommand) + .map(tx => tx[1] as SignedCommand) + .map((tx: SignedCommand) => { + const memo = decodeMemo(tx.payload.common.memo); + return { + kind: MempoolTransactionKind.PAYMENT, + sender: tx.payload.common.fee_payer_pk, + fee: Number(tx.payload.common.fee), + nonce: Number(tx.payload.common.nonce), + memo: removeUnicodeEscapes(memo), + transactionData: tx, + sentFromStressingTool: memo.includes('S.T.'), + sentByMyBrowser: memo.includes(localStorage.getItem('browserId')), + } as MempoolTransaction; + }); } } diff --git a/frontend/src/app/features/mempool/mempool.service.ts b/frontend/src/app/features/mempool/mempool.service.ts index d44b402100..7f06fbc57e 100644 --- a/frontend/src/app/features/mempool/mempool.service.ts +++ b/frontend/src/app/features/mempool/mempool.service.ts @@ -7,7 +7,7 @@ import { SignedCommand, ZkappCommand, } from '@shared/types/mempool/mempool-transaction.type'; -import { removeUnicodeEscapes } from '@shared/helpers/transaction.helper'; +import { decodeMemo, removeUnicodeEscapes } from '@shared/helpers/transaction.helper'; import { ONE_BILLION } from '@openmina/shared'; @Injectable({ @@ -19,275 +19,6 @@ export class MempoolService { getTransactionPool(limit?: number, from?: number): Observable<{ txs: MempoolTransaction[] }> { return this.rust.get('/transaction-pool').pipe( - // return of({ - // txs: [ - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256530, - // kind: 'ZKApp command', - // txHash: 'bIUYGOUgouYgO68gwra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 1, - // nonce: 1, - // memo: 'memo1', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256745, - // kind: 'Payment', - // txHash: '3rg45gqq3gr3wqrg3wqgZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 2, - // nonce: 2, - // memo: 'memo2', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256847, - // kind: 'Delegation', - // txHash: 'q3wr4gw34gtq3tg35rMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 3, - // nonce: 3, - // memo: 'memo3', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256677, - // kind: 'ZKApp command', - // txHash: '5JthxoBLYoSawergfwegrewVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 4, - // nonce: 4, - // memo: 'memo4', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256099, - // kind: 'Payment', - // txHash: '5JthxorweagsgvfergvawergvfnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 5, - // nonce: 5, - // memo: 'memo5', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Delegation', - // txHash: '5r3eg35g5rgwe4g5wg3qr3awrg5RZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 6, - // nonce: 6, - // memo: 'memo6', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'ZKApp command', - // txHash: 'q354ht3hu563qthuyeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 7, - // nonce: 7, - // memo: 'memo7', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Payment', - // txHash: 'q346uh34q3hteu6ExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 8, - // nonce: 8, - // memo: 'memo8', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Delegation', - // txHash: 'hj4q3et6yj34ju6hjtUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 9, - // nonce: 9, - // memo: 'memo9', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'ZKApp command', - // txHash: '3q54uhUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 10, - // nonce: 10, - // memo: 'memo10', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Payment', - // txHash: 'q3uhj6t54e5uUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 11, - // nonce: 11, - // memo: 'memo11', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Delegation', - // txHash: 'q3euhj6BLYoSExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 12, - // nonce: 12, - // memo: 'memo12', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'ZKApp command', - // txHash: 'w465uYoSExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 13, - // nonce: 13, - // memo: 'memo13', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Payment', - // txHash: 'w456ujtoSExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 14, - // nonce: 14, - // memo: 'memo14', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Delegation', - // txHash: '46tewtu4wtExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 15, - // nonce: 15, - // memo: 'memo15', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'ZKApp command', - // txHash: 'je56yhtes456uUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 16, - // nonce: 16, - // memo: 'memo16', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Payment', - // txHash: '46qhet6u4yh4thewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 17, - // nonce: 17, - // memo: 'memo17', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Delegation', - // txHash: '426thy42yExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 18, - // nonce: 18, - // memo: 'memo18', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'ZKApp command', - // txHash: '5435tghSExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 19, - // nonce: 19, - // memo: 'memo19', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Payment', - // txHash: '23q4th654334yxUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 20, - // nonce: 20, - // memo: 'memo20', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Delegation', - // txHash: 'wrht3YoSExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 21, - // nonce: 21, - // memo: 'memo21', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'ZKApp command', - // txHash: '5245436t43rExUMDeDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62hgre082fuehevC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 22, - // nonce: 22, - // memo: 'memo22', - // }, - // { - // status: 'Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Payment', - // txHash: '5JthxoBLYoSExUMDe62wra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 23, - // nonce: 23, - // memo: 'memo23', - // }, - // { - // status: 'Not Applicable', - // date: '2021-07-14T11:00:00Z', - // timestamp: 1626256800, - // kind: 'Delegation', - // txHash: '5JthxoBL745eDewra8LRZpnDjvCVFfTcRq2EjKL3EwUVTho', - // sender: 'B62qif1RJqNXWmv5evC6tGpebdALcHKdCmn4CYFFTGiizauoEftYFWV', - // fee: 24, - // nonce: 24, - // memo: 'memo24', - // }, - // ], - // } as any).pipe( - // delay(1000), map(data => ({ txs: this.mapTxPoolResponse(data) })), map(({ txs }: { txs: any }) => ({ txs: [...txs] })), ); @@ -295,32 +26,35 @@ export class MempoolService { private mapTxPoolResponse(response: MempoolTransactionResponse[]): MempoolTransaction[] { return response.map((tx: MempoolTransactionResponse) => { - if (tx.data.SignedCommand) { - return { - kind: MempoolTransactionKind.PAYMENT, - txHash: tx.hash.join(''), - sender: tx.data.SignedCommand.payload.common.fee_payer_pk, - fee: Number(tx.data.SignedCommand.payload.common.fee) / ONE_BILLION, - amount: Number(tx.data.SignedCommand.payload.body.Payment.amount) / ONE_BILLION, - nonce: Number(tx.data.SignedCommand.payload.common.nonce), - memo: removeUnicodeEscapes(tx.data.SignedCommand.payload.common.memo), - transactionData: tx.data.SignedCommand, - sentFromStressingTool: tx.data.SignedCommand.payload.common.memo.includes('S.T.'), - sentByMyBrowser: tx.data.SignedCommand.payload.common.memo.includes(localStorage.getItem('browserId')), - } as MempoolTransaction; - } else { - return { - kind: MempoolTransactionKind.ZK_APP, - txHash: tx.hash.join(''), - sender: tx.data.ZkappCommand.fee_payer.body.public_key, - fee: Number(tx.data.ZkappCommand.fee_payer.body.fee) / ONE_BILLION, - amount: null, - nonce: Number(tx.data.ZkappCommand.fee_payer.body.nonce), - memo: tx.data.ZkappCommand.memo, - transactionData: tx.data.ZkappCommand, - sentFromStressingTool: false, - sentByMyBrowser: false, - } as MempoolTransaction; + switch (tx.data[0]) { + case MempoolTransactionResponseKind.SignedCommand: + const memo = decodeMemo(tx.data[1].payload.common.memo); + return { + kind: MempoolTransactionKind.PAYMENT, + txHash: tx.hash.join(''), + sender: tx.data[1].payload.common.fee_payer_pk, + fee: Number(tx.data[1].payload.common.fee), + amount: Number(tx.data[1].payload.body[1].amount) / ONE_BILLION, + nonce: Number(tx.data[1].payload.common.nonce), + memo: removeUnicodeEscapes(memo), + transactionData: tx.data[1], + sentFromStressingTool: memo.includes('S.T.'), + sentByMyBrowser: memo.includes(localStorage.getItem('browserId')), + } as MempoolTransaction; + case MempoolTransactionResponseKind.ZkappCommand: + const zkapp = tx.data[1] as ZkappCommand; + return { + kind: MempoolTransactionKind.ZK_APP, + txHash: tx.hash.join(''), + sender: zkapp.fee_payer.body.public_key, + fee: Number(zkapp.fee_payer.body.fee), + amount: null, + nonce: Number(zkapp.fee_payer.body.nonce), + memo: zkapp.memo, + transactionData: tx.data[1], + sentFromStressingTool: false, + sentByMyBrowser: false, + } as MempoolTransaction; } }); } @@ -328,11 +62,11 @@ export class MempoolService { export interface MempoolTransactionResponse { - data: Data; + data: [MempoolTransactionResponseKind, SignedCommand | ZkappCommand]; hash: number[]; } -interface Data { - SignedCommand?: SignedCommand; - ZkappCommand?: ZkappCommand; +export enum MempoolTransactionResponseKind { + SignedCommand = 'Signed_command', + ZkappCommand = 'Zkapp_command', } diff --git a/frontend/src/app/features/zk/zk.component.html b/frontend/src/app/features/zk/zk.component.html new file mode 100644 index 0000000000..7f6167bb5f --- /dev/null +++ b/frontend/src/app/features/zk/zk.component.html @@ -0,0 +1 @@ +

zk works!

diff --git a/frontend/src/app/features/zk/zk.component.scss b/frontend/src/app/features/zk/zk.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frontend/src/app/features/zk/zk.component.ts b/frontend/src/app/features/zk/zk.component.ts new file mode 100644 index 0000000000..7d03185eed --- /dev/null +++ b/frontend/src/app/features/zk/zk.component.ts @@ -0,0 +1,103 @@ +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { AccountUpdate, Field, method, Mina, PrivateKey, Provable, PublicKey, SmartContract, state, State } from 'o1js'; + +class HelloWorld extends SmartContract {} + + +export class Square extends SmartContract { + @state(Field) num = State(); + + override init() { + super.init(); + this.num.set(Field(3)); + } + + @method + async update(square: Field) { + const currentState = this.num.get(); + this.num.requireEquals(currentState); + square.assertEquals(currentState.mul(currentState)); + this.num.set(square); + } +} + +@Component({ + selector: 'mina-zk', + templateUrl: './zk.component.html', + styleUrls: ['./zk.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class ZkComponent implements OnInit { + + ngOnInit() { + console.log('Start'); + this.startZK(); + console.log('Finish!'); + } + + async startZK() { + + const useProof = false; + + const Local = await Mina.LocalBlockchain({ proofsEnabled: useProof }); + Mina.setActiveInstance(Local); + + const deployerAccount = Local.testAccounts[0]; + const deployerKey = deployerAccount.key; + const senderAccount = Local.testAccounts[1]; + const senderKey = senderAccount.key; +// ---------------------------------------------------- + +// Create a public/private key pair. The public key is your address and where you deploy the zkApp to + const zkAppPrivateKey = PrivateKey.random(); + const zkAppAddress = zkAppPrivateKey.toPublicKey(); + +// create an instance of Square - and deploy it to zkAppAddress + const zkAppInstance = new Square(zkAppAddress); + const deployTxn = await Mina.transaction(deployerAccount, async () => { + AccountUpdate.fundNewAccount(deployerAccount); + await zkAppInstance.deploy(); + }); + await deployTxn.sign([deployerKey, zkAppPrivateKey]).send(); + +// get the initial state of Square after deployment + const num0 = zkAppInstance.num.get(); + console.log('state after init:', num0.toString()); + +// ---------------------------------------------------- + + const txn1 = await Mina.transaction(senderAccount, async () => { + await zkAppInstance.update(Field(9)); + }); + await txn1.prove(); + await txn1.sign([senderKey]).send(); + + const num1 = zkAppInstance.num.get(); + console.log('state after txn1:', num1.toString()); + +// ---------------------------------------------------- + + try { + const txn2 = await Mina.transaction(senderAccount, async () => { + await zkAppInstance.update(Field(75)); + }); + await txn2.prove(); + await txn2.sign([senderKey]).send(); + } catch (error: any) { + console.log(error.message); + } + const num2 = zkAppInstance.num.get(); + console.log('state after txn2:', num2.toString()); + +// ---------------------------------------------------- + + const txn3 = await Mina.transaction(senderAccount, async () => { + await zkAppInstance.update(Field(81)); + }); + await txn3.prove(); + await txn3.sign([senderKey]).send(); + + const num3 = zkAppInstance.num.get(); + console.log('state after txn3:', num3.toString()); + } +} diff --git a/frontend/src/app/features/zk/zk.module.ts b/frontend/src/app/features/zk/zk.module.ts new file mode 100644 index 0000000000..404533b538 --- /dev/null +++ b/frontend/src/app/features/zk/zk.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { ZkComponent } from './zk.component'; +import { RouterModule } from '@angular/router'; +import { ZKRouting } from '@app/features/zk/zk.routing'; + + +@NgModule({ + declarations: [ + ZkComponent, + ], + imports: [ + CommonModule, + ZKRouting, + ], +}) +export class ZkModule {} diff --git a/frontend/src/app/features/zk/zk.routing.ts b/frontend/src/app/features/zk/zk.routing.ts new file mode 100644 index 0000000000..aa2bd5d0b6 --- /dev/null +++ b/frontend/src/app/features/zk/zk.routing.ts @@ -0,0 +1,23 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { STATE_TITLE } from '@app/app.routing'; +import { StateComponent } from '@app/features/state/state.component'; +import { ZkComponent } from '@app/features/zk/zk.component'; + +const routes: Routes = [ + { + path: '', + component: ZkComponent, + }, + { + path: '**', + redirectTo: '', + pathMatch: 'full', + }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ZKRouting {} diff --git a/frontend/src/app/layout/menu/menu.component.html b/frontend/src/app/layout/menu/menu.component.html index 24e8335381..474dbd42f5 100644 --- a/frontend/src/app/layout/menu/menu.component.html +++ b/frontend/src/app/layout/menu/menu.component.html @@ -1,8 +1,8 @@
- - + {{ !menu.isMobile ? 'first_page' : 'close' }} + + {{ item.icon }} {{ item.name }} - +
-
- -
+
+
+ +
{{ appIdentifier }} -
+
+
+ +
+
+
+ wifi_tethering + {{ network }} +
+
+ {{ chainId.slice(0, 6) }}.. + content_copy +
+
+
diff --git a/frontend/src/app/layout/menu/menu.component.scss b/frontend/src/app/layout/menu/menu.component.scss index 0a6137fcee..1e8329053b 100644 --- a/frontend/src/app/layout/menu/menu.component.scss +++ b/frontend/src/app/layout/menu/menu.component.scss @@ -1,176 +1,195 @@ @import 'openmina'; .menu { - .menu-toggle { - padding: 8px 12px; - border: none; - border-radius: 0; - border-bottom: 1px solid $base-divider; - background-color: unset; - transition: width 200ms ease-out, background-color 80ms; - - .mina-icon { - font-size: 20px; - color: $base-tertiary; - font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 20; - transition: transform 200ms ease-out, color 80ms; - - &.flipped { - transform: rotateY(180deg); - } - } - - span:nth-child(1) { - overflow: hidden; - //max-width: 100px; - opacity: 1; - transition: 200ms ease-out; - - svg { - margin-right: 4px; - margin-left: -4px; - min-width: 25px; - min-height: 25px; - } - } - - &:hover { - background-color: $base-container; - - .mina-icon { - color: $base-primary; - } - } - } - - .item { - color: $base-secondary; - cursor: pointer; - padding-left: 4px; - display: flex; - align-items: center; - - .item-content { - width: 80%; - border-radius: 6px; - padding: 5px 7px; - display: flex; - flex-direction: row; - align-items: center; - font-weight: 600; - - .mina-icon { - font-size: 20px; - padding-right: 7px; - color: $base-tertiary; - font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 20; - } - - span:nth-child(2) { - opacity: 1; - transition: opacity 200ms ease-out; - } - } - - &:hover:not(.active) { - background-color: $base-container; - color: $base-secondary; - } - - &.active { - color: $selected-primary; - - .item-content .mina-icon { - color: $selected-primary; - font-variation-settings: 'FILL' 1, 'wght' 300, 'GRAD' 0, 'opsz' 20; - } - } - } - - &.collapsed { - .menu-toggle { - width: 44px; - - span:nth-child(1) { - max-width: 0; - opacity: 0; - } - } - - .item .item-content span:nth-child(2) { - opacity: 0; - } - } + .menu-toggle { + padding: 8px 12px; + border: none; + border-radius: 0; + border-bottom: 1px solid $base-divider; + background-color: unset; + transition: width 200ms ease-out, background-color 80ms; + + .mina-icon { + font-size: 20px; + color: $base-tertiary; + font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 20; + transition: transform 200ms ease-out, color 80ms; + + &.flipped { + transform: rotateY(180deg); + } + } + + span:nth-child(1) { + overflow: hidden; + //max-width: 100px; + opacity: 1; + transition: 200ms ease-out; + + svg { + margin-right: 4px; + margin-left: -4px; + min-width: 25px; + min-height: 25px; + } + } + + &:hover { + background-color: $base-container; + + .mina-icon { + color: $base-primary; + } + } + } + + .item { + color: $base-secondary; + cursor: pointer; + padding-left: 4px; + display: flex; + align-items: center; + + .item-content { + width: 80%; + border-radius: 6px; + padding: 5px 7px; + display: flex; + flex-direction: row; + align-items: center; + font-weight: 600; + + .mina-icon { + font-size: 20px; + padding-right: 7px; + color: $base-tertiary; + font-variation-settings: 'FILL' 0, 'wght' 300, 'GRAD' 0, 'opsz' 20; + } + + span:nth-child(2) { + opacity: 1; + transition: opacity 200ms ease-out; + } + } + + &:hover:not(.active) { + background-color: $base-container; + color: $base-secondary; + } + + &.active { + color: $selected-primary; + + .item-content .mina-icon { + color: $selected-primary; + font-variation-settings: 'FILL' 1, 'wght' 300, 'GRAD' 0, 'opsz' 20; + } + } + } + + &.collapsed { + .menu-toggle { + width: 44px; + + span:nth-child(1) { + max-width: 0; + opacity: 0; + } + } + + .item .item-content span:nth-child(2) { + opacity: 0; + } + } } @media (max-width: 768px) { - .menu { - .menu-toggle { - height: 56px !important; - font-size: 20px !important; - } - - .mina-icon { - font-size: 24px !important; - } - - .item { - height: 54px !important; - - .item-content { - font-size: 18px; - } - } - } + .menu { + .menu-toggle { + height: 56px !important; + font-size: 20px !important; + } + + .mina-icon { + font-size: 24px !important; + } + + .item { + height: 54px !important; + + .item-content { + font-size: 18px; + } + } + } } .switcher { - background-color: $base-container; + background-color: transparent; - .mina-icon { - color: $base-secondary; - font-variation-settings: 'FILL' 1, 'wght' 200; - } + .mina-icon { + color: $base-secondary; + font-variation-settings: 'FILL' 1, 'wght' 200; + } - &:hover { - background-color: $base-divider; + &:hover { + background-color: $base-surface-top; - .mina-icon { - color: $base-primary; - } - } + .mina-icon { + color: $base-primary; + } + } } .identifier { - left: 47px; - top: 0; - transition: 0.3s ease-in-out; - transform: translate(0) rotate(0); - animation: rottWithOpc 0.3s linear; - - @media (min-width: 769px) { - left: 42px; - &.collapsed { - transform: translate(-75px, -76px) rotate(-90deg); - animation-name: rottWithOpc2; - } - } + left: 47px; + top: 0; + transition: 0.3s ease-in-out; + transform: translate(0) rotate(0); + animation: rotWithOpc 0.3s linear; + + @media (min-width: 769px) { + left: 42px; + &.collapsed { + transform: translate(-75px, -76px) rotate(-90deg); + animation-name: rotWithOpc2; + } + } } -@keyframes rottWithOpc { - 0%, 100% { - opacity: 1; - } - 20%, 80% { - opacity: 0; - } +.bottom-btn-action { + padding: 0 4px; + animation: rotWithOpc 0.3s linear; + + &:hover { + background: $base-surface-top; + } + + .network, + .chain-id { + transition: 0.3s 0.2s linear; + + &.hid { + opacity: 0; + transition: 0.1s linear; + } + } +} + +@keyframes rotWithOpc { + 0%, 100% { + opacity: 1; + } + 20%, 80% { + opacity: 0; + } } -@keyframes rottWithOpc2 { - 0%, 100% { - opacity: 1; - } - 20%, 80% { - opacity: 0; - } +@keyframes rotWithOpc2 { + 0%, 100% { + opacity: 1; + } + 20%, 80% { + opacity: 0; + } } diff --git a/frontend/src/app/layout/menu/menu.component.ts b/frontend/src/app/layout/menu/menu.component.ts index cc00975537..e240c6bd89 100644 --- a/frontend/src/app/layout/menu/menu.component.ts +++ b/frontend/src/app/layout/menu/menu.component.ts @@ -16,6 +16,7 @@ import { MinaNode } from '@shared/types/core/environment/mina-env.type'; import { filter, map, tap } from 'rxjs'; import { CONFIG, getAvailableFeatures } from '@shared/constants/config'; import { NavigationEnd, Router } from '@angular/router'; +import { MinaNetwork } from '@shared/types/core/mina/mina.type'; interface MenuItem { name: string; @@ -54,6 +55,8 @@ export class MenuComponent extends ManualDetection implements OnInit { appIdentifier: string = CONFIG.identifier; activeNode: MinaNode; activeRoute: string; + network: string; + chainId?: string; constructor(private router: Router, private store: Store, @@ -99,9 +102,21 @@ export class MenuComponent extends ManualDetection implements OnInit { ) .subscribe((node: MinaNode) => { this.activeNode = node; + this.network = node.minaExplorerNetwork ?? CONFIG.globalConfig?.minaExplorerNetwork; + this.network = this.network.charAt(0).toUpperCase() + this.network.slice(1); this.menuItems = this.allowedMenuItems; this.detect(); }); + + this.store.select(AppSelectors.activeNodeDetails) + .pipe( + filter(Boolean), + untilDestroyed(this), + ) + .subscribe(({ chainId }) => { + this.chainId = chainId; + this.detect(); + }); } private get allowedMenuItems(): MenuItem[] { diff --git a/frontend/src/app/layout/new-node/new-node.component.ts b/frontend/src/app/layout/new-node/new-node.component.ts index 93256431c9..ebfa753b64 100644 --- a/frontend/src/app/layout/new-node/new-node.component.ts +++ b/frontend/src/app/layout/new-node/new-node.component.ts @@ -96,6 +96,7 @@ export class NewNodeComponent extends StoreDispatcher implements OnInit { checked: true, subFeatures: [ { name: 'scan state', checked: true }, + { name: 'work pool', checked: true }, ], }, { 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 82642bf6d9..dc9225e4ec 100644 --- a/frontend/src/app/layout/server-status/server-status.component.html +++ b/frontend/src/app/layout/server-status/server-status.component.html @@ -98,7 +98,7 @@
+ class="node-status-popup bg-surface-top border-rad-8 popup-box-shadow-weak p-8 pb-5 w-100 h-100 text-nowrap">
Node Status
MINA short history
diff --git a/frontend/src/app/layout/server-status/server-status.component.scss b/frontend/src/app/layout/server-status/server-status.component.scss index 5de03cae85..fff193019b 100644 --- a/frontend/src/app/layout/server-status/server-status.component.scss +++ b/frontend/src/app/layout/server-status/server-status.component.scss @@ -42,6 +42,10 @@ span { color: $warn-secondary; + + &.mina-icon { + color: $warn-primary; + } } &::before { @@ -61,6 +65,10 @@ span { color: $aware-secondary; + + &.mina-icon { + color: $aware-primary; + } } &::before { @@ -78,6 +86,10 @@ span { color: $success-secondary; + + &.mina-icon { + color: $success-primary; + } } &::before { 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 793019d1d3..dbae0becad 100644 --- a/frontend/src/app/layout/server-status/server-status.component.ts +++ b/frontend/src/app/layout/server-status/server-status.component.ts @@ -11,7 +11,7 @@ import { } from '@angular/core'; import { AppSelectors } from '@app/app.state'; import { filter, take } from 'rxjs'; -import { isMobile, MAX_WIDTH_700, ONE_MILLION } from '@openmina/shared'; +import { isDesktop, isMobile, MAX_WIDTH_700, ONE_MILLION } from '@openmina/shared'; import { AppMenu } from '@shared/types/app/app-menu.type'; import { MinaNode } from '@shared/types/core/environment/mina-env.type'; import { ComponentPortal, TemplatePortal } from '@angular/cdk/portal'; @@ -109,7 +109,7 @@ export class ServerStatusComponent extends StoreDispatcher implements OnInit { } this.tooltipOverlayRef = this.overlay.create({ hasBackdrop: false, - width: 188, + width: isDesktop() ? 188 : 205, positionStrategy: this.overlay.position() .flexibleConnectedTo(anchor) .withPositions([{ diff --git a/frontend/src/app/layout/submenu-tabs/submenu-tabs.component.ts b/frontend/src/app/layout/submenu-tabs/submenu-tabs.component.ts index 18deabac5e..29840ac72b 100644 --- a/frontend/src/app/layout/submenu-tabs/submenu-tabs.component.ts +++ b/frontend/src/app/layout/submenu-tabs/submenu-tabs.component.ts @@ -67,7 +67,7 @@ export class SubmenuTabsComponent extends StoreDispatcher implements OnInit { } private getSubMenusMap(features: string[]): SubMenu[] { - return features.map((feature: string) => ({ + return features?.map((feature: string) => ({ name: feature.split('-').join(' '), route: feature, })); diff --git a/frontend/src/app/shared/helpers/transaction.helper.ts b/frontend/src/app/shared/helpers/transaction.helper.ts index e62713f742..365200f6a5 100644 --- a/frontend/src/app/shared/helpers/transaction.helper.ts +++ b/frontend/src/app/shared/helpers/transaction.helper.ts @@ -1,4 +1,37 @@ import { toReadableDate } from '@openmina/shared'; +import bs58check from 'bs58check'; + +export function decodeMemo(memo: string): string { + try { + const buffer = bs58check.decode(memo); + + // The first byte is the version, we can skip it + const payload = buffer.slice(1); + + // Convert the payload to a string + const tag = payload[0]; + const len = payload[1]; + let result = ''; + if (tag === 0) { + result = toHexString(payload.slice(0)); + } else { + for (let i = 2; i < len + 2; i++) { + result += String.fromCharCode(payload[i]); + } + } + + return result; + } catch (error) { + console.error('Error decoding memo:', error); + throw error; + } +} + +function toHexString(byteArray: Uint8Array) { + return Array.from(byteArray, (byte) => { + return ('0' + (byte & 0xFF).toString(16)).slice(-2); + }).join(''); +} export function removeUnicodeEscapes(str: string): string { let cleaned = str; diff --git a/frontend/src/app/shared/types/app/app-node-details.type.ts b/frontend/src/app/shared/types/app/app-node-details.type.ts index c4d236d0ec..df46aefd37 100644 --- a/frontend/src/app/shared/types/app/app-node-details.type.ts +++ b/frontend/src/app/shared/types/app/app-node-details.type.ts @@ -9,6 +9,8 @@ export interface AppNodeDetails { transactions: number; snarks: number; + + chainId?: string; } export enum AppNodeStatus { 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 dc729cadbc..bbfc5d2d96 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 @@ -35,6 +35,7 @@ export type FeaturesConfig = Partial<{ 'block-production': string[]; 'mempool': string[]; 'benchmarks': string[]; + 'zk': string[]; }>; export type FeatureType = keyof FeaturesConfig; diff --git a/frontend/src/app/shared/types/mempool/mempool-transaction.type.ts b/frontend/src/app/shared/types/mempool/mempool-transaction.type.ts index d7b50704e1..b6e13019c5 100644 --- a/frontend/src/app/shared/types/mempool/mempool-transaction.type.ts +++ b/frontend/src/app/shared/types/mempool/mempool-transaction.type.ts @@ -26,26 +26,18 @@ export interface SignedCommand { interface Payload { common: Common; - body: Body; + body: [string, Body]; } interface Common { fee: string; fee_payer_pk: string; nonce: string; - valid_until: ValidUntil; + valid_until: string; memo: string; } -interface ValidUntil { - SinceGenesis: string; -} - interface Body { - Payment: Payment; -} - -interface Payment { receiver_pk: string; amount: string; } @@ -54,6 +46,9 @@ export interface ZkappCommand { fee_payer: FeePayer; account_updates: AccountUpdate[]; memo: string; + payload: Payload; + signer: string; + signature: string; } interface FeePayer { @@ -81,7 +76,7 @@ interface Elt { interface AccountUpdate2 { body: Body3; - authorization: Authorization; + authorization: string[]; } interface Body3 { @@ -96,19 +91,19 @@ interface Body3 { preconditions: Preconditions; use_full_commitment: boolean; implicit_account_creation_fee: boolean; - may_use_token: string; - authorization_kind: string; + may_use_token: string[]; + authorization_kind: string[]; } interface Update { - app_state: string[]; - delegate: string; - verification_key: any; - permissions: string; - zkapp_uri: string; + app_state: string[][]; + delegate: string[]; + verification_key: string[]; + permissions: string[]; + zkapp_uri: string[]; token_symbol: string; - timing: string; - voting_for: string; + timing: string[]; + voting_for: string[]; } interface BalanceChange { @@ -119,58 +114,54 @@ interface BalanceChange { interface Preconditions { network: Network; account: Account; - valid_while: string; + valid_while: string[]; } interface Network { - snarked_ledger_hash: string; - blockchain_length: string; - min_window_density: string; - total_currency: string; - global_slot_since_genesis: string; + snarked_ledger_hash: string[]; + blockchain_length: string[]; + min_window_density: string[]; + total_currency: string[]; + global_slot_since_genesis: string[]; staking_epoch_data: StakingEpochData; next_epoch_data: NextEpochData; } interface StakingEpochData { ledger: Ledger; - seed: string; - start_checkpoint: string; - lock_checkpoint: string; - epoch_length: string; + seed: string[]; + start_checkpoint: string[]; + lock_checkpoint: string[]; + epoch_length: string[]; } interface Ledger { - hash: string; - total_currency: string; + hash: string[]; + total_currency: string[]; } interface NextEpochData { ledger: Ledger2; - seed: string; - start_checkpoint: string; - lock_checkpoint: string; - epoch_length: string; + seed: string[]; + start_checkpoint: string[]; + lock_checkpoint: string[]; + epoch_length: string[]; } interface Ledger2 { - hash: string; - total_currency: string; + hash: string[]; + total_currency: string[]; } interface Account { - balance: string; - nonce: any; - receipt_chain_hash: string; - delegate: string; - state: string[]; - action_state: string; - proved_state: string; - is_new: string; -} - -interface Authorization { - Signature: string; + balance: string[]; + nonce: string[]; + receipt_chain_hash: string[]; + delegate: string[]; + state: string[][]; + action_state: string[]; + proved_state: string[]; + is_new: string[]; } interface Call { @@ -186,7 +177,7 @@ interface Elt2 { interface AccountUpdate3 { body: Body4; - authorization: string; + authorization: string[]; } interface Body4 { @@ -202,18 +193,18 @@ interface Body4 { use_full_commitment: boolean; implicit_account_creation_fee: boolean; may_use_token: string; - authorization_kind: string; + authorization_kind: string[]; } interface Update2 { - app_state: string[]; - delegate: string; - verification_key: string; - permissions: string; - zkapp_uri: string; + app_state: string[][]; + delegate: string[]; + verification_key: string[]; + permissions: string[]; + zkapp_uri: string[]; token_symbol: string; - timing: string; - voting_for: string; + timing: string[]; + voting_for: string[]; } interface BalanceChange2 { @@ -224,52 +215,52 @@ interface BalanceChange2 { interface Preconditions2 { network: Network2; account: Account2; - valid_while: string; + valid_while: string[]; } interface Network2 { - snarked_ledger_hash: string; - blockchain_length: string; - min_window_density: string; - total_currency: string; - global_slot_since_genesis: string; + snarked_ledger_hash: string[]; + blockchain_length: string[]; + min_window_density: string[]; + total_currency: string[]; + global_slot_since_genesis: string[]; staking_epoch_data: StakingEpochData2; next_epoch_data: NextEpochData2; } interface StakingEpochData2 { ledger: Ledger3; - seed: string; - start_checkpoint: string; - lock_checkpoint: string; - epoch_length: string; + seed: string[]; + start_checkpoint: string[]; + lock_checkpoint: string[]; + epoch_length: string[]; } interface Ledger3 { - hash: string; - total_currency: string; + hash: string[]; + total_currency: string[]; } interface NextEpochData2 { ledger: Ledger4; - seed: string; - start_checkpoint: string; - lock_checkpoint: string; - epoch_length: string; + seed: string[]; + start_checkpoint: string[]; + lock_checkpoint: string[]; + epoch_length: string[]; } interface Ledger4 { - hash: string; - total_currency: string; + hash: string[]; + total_currency: string[]; } interface Account2 { - balance: string; - nonce: string; - receipt_chain_hash: string; - delegate: string; - state: string[]; - action_state: string; - proved_state: string; - is_new: string; + balance: string[]; + nonce: string[]; + receipt_chain_hash: string[]; + delegate: string[]; + state: string[][]; + action_state: string[]; + proved_state: string[]; + is_new: string[]; } diff --git a/frontend/src/assets/styles/openmina.scss b/frontend/src/assets/styles/openmina.scss index 4c64d26126..3a9f54fe6a 100644 --- a/frontend/src/assets/styles/openmina.scss +++ b/frontend/src/assets/styles/openmina.scss @@ -1259,18 +1259,26 @@ span.mina-icon { -webkit-font-feature-settings: 'liga'; -webkit-font-smoothing: antialiased; font-variation-settings: 'FILL' 0, 'wght' 200; -} -.icon-100 { - font-variation-settings: 'FILL' 0, 'wght' 100; -} + &.icon-100 { + font-variation-settings: 'FILL' 0, 'wght' 100; + } -.icon-200 { - font-variation-settings: 'FILL' 0, 'wght' 200; -} + &.icon-200 { + font-variation-settings: 'FILL' 0, 'wght' 200; + } -.icon-300 { - font-variation-settings: 'FILL' 0, 'wght' 300; + &.icon-300 { + font-variation-settings: 'FILL' 0, 'wght' 300; + } + + &.icon-400 { + font-variation-settings: 'FILL' 0, 'wght' 400; + } + + &.icon-500 { + font-variation-settings: 'FILL' 0, 'wght' 500; + } } diff --git a/frontend/src/environments/environment.ts b/frontend/src/environments/environment.ts index f9ef1f7b8b..4c65411bbc 100644 --- a/frontend/src/environments/environment.ts +++ b/frontend/src/environments/environment.ts @@ -2,6 +2,7 @@ import { MinaEnv } from '@shared/types/core/environment/mina-env.type'; export const environment: Readonly = { production: false, + identifier: 'Docker image', globalConfig: { features: { dashboard: [], @@ -14,8 +15,9 @@ export const environment: Readonly = { 'block-production': ['overview', 'won-slots'], mempool: [], benchmarks: ['wallets'], + zk: ['test'], }, - canAddNodes: false, + canAddNodes: true, minaExplorerNetwork: 'devnet', }, configs: [ diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js new file mode 100644 index 0000000000..02f8b7391b --- /dev/null +++ b/frontend/webpack.config.js @@ -0,0 +1,5 @@ +module.exports = { + experiments: { + topLevelAwait: true, + }, +} diff --git a/node/src/action_kind.rs b/node/src/action_kind.rs index 4eb9cb6250..65b1d47595 100644 --- a/node/src/action_kind.rs +++ b/node/src/action_kind.rs @@ -45,10 +45,12 @@ use crate::p2p::network::kad::stream::P2pNetworkKademliaStreamAction; use crate::p2p::network::kad::{P2pNetworkKadAction, P2pNetworkKademliaAction}; use crate::p2p::network::noise::P2pNetworkNoiseAction; use crate::p2p::network::pnet::P2pNetworkPnetAction; +use crate::p2p::network::pnet_effectful::P2pNetworkPnetEffectfulAction; use crate::p2p::network::pubsub::pubsub_effectful::P2pNetworkPubsubEffectfulAction; use crate::p2p::network::pubsub::P2pNetworkPubsubAction; use crate::p2p::network::rpc::P2pNetworkRpcAction; use crate::p2p::network::scheduler::P2pNetworkSchedulerAction; +use crate::p2p::network::scheduler_effectful::P2pNetworkSchedulerEffectfulAction; use crate::p2p::network::select::P2pNetworkSelectAction; use crate::p2p::network::yamux::P2pNetworkYamuxAction; use crate::p2p::network::P2pNetworkAction; @@ -306,6 +308,8 @@ pub enum ActionKind { P2pNetworkPnetOutgoingData, P2pNetworkPnetSetupNonce, P2pNetworkPnetTimeout, + P2pNetworkPnetEffectfulOutgoingData, + P2pNetworkPnetEffectfulSetupNonce, P2pNetworkPubsubBroadcast, P2pNetworkPubsubBroadcastSigned, P2pNetworkPubsubGraft, @@ -331,7 +335,6 @@ pub enum ActionKind { P2pNetworkSchedulerDisconnect, P2pNetworkSchedulerDisconnected, P2pNetworkSchedulerError, - P2pNetworkSchedulerIncomingConnectionIsReady, P2pNetworkSchedulerIncomingDataDidReceive, P2pNetworkSchedulerIncomingDataIsReady, P2pNetworkSchedulerIncomingDidAccept, @@ -347,6 +350,16 @@ pub enum ActionKind { P2pNetworkSchedulerSelectDone, P2pNetworkSchedulerSelectError, P2pNetworkSchedulerYamuxDidInit, + P2pNetworkSchedulerEffectfulDisconnect, + P2pNetworkSchedulerEffectfulError, + P2pNetworkSchedulerEffectfulIncomingConnectionIsReady, + P2pNetworkSchedulerEffectfulIncomingDataIsReady, + P2pNetworkSchedulerEffectfulIncomingDidAccept, + P2pNetworkSchedulerEffectfulInterfaceDetected, + P2pNetworkSchedulerEffectfulNoiseSelectDone, + P2pNetworkSchedulerEffectfulOutgoingConnect, + P2pNetworkSchedulerEffectfulOutgoingDidConnect, + P2pNetworkSchedulerEffectfulSelectError, P2pNetworkSelectIncomingData, P2pNetworkSelectIncomingDataAuth, P2pNetworkSelectIncomingDataMux, @@ -548,7 +561,7 @@ pub enum ActionKind { } impl ActionKind { - pub const COUNT: u16 = 454; + pub const COUNT: u16 = 465; } impl std::fmt::Display for ActionKind { @@ -946,7 +959,9 @@ impl ActionKindGet for P2pNetworkAction { fn kind(&self) -> ActionKind { match self { Self::Scheduler(a) => a.kind(), + Self::SchedulerEffectful(a) => a.kind(), Self::Pnet(a) => a.kind(), + Self::PnetEffectful(a) => a.kind(), Self::Select(a) => a.kind(), Self::Noise(a) => a.kind(), Self::Yamux(a) => a.kind(), @@ -1371,13 +1386,10 @@ impl ActionKindGet for P2pNetworkSchedulerAction { Self::InterfaceExpired { .. } => ActionKind::P2pNetworkSchedulerInterfaceExpired, Self::ListenerReady { .. } => ActionKind::P2pNetworkSchedulerListenerReady, Self::ListenerError { .. } => ActionKind::P2pNetworkSchedulerListenerError, - Self::IncomingConnectionIsReady { .. } => { - ActionKind::P2pNetworkSchedulerIncomingConnectionIsReady - } Self::IncomingDidAccept { .. } => ActionKind::P2pNetworkSchedulerIncomingDidAccept, + Self::IncomingDataIsReady { .. } => ActionKind::P2pNetworkSchedulerIncomingDataIsReady, Self::OutgoingConnect { .. } => ActionKind::P2pNetworkSchedulerOutgoingConnect, Self::OutgoingDidConnect { .. } => ActionKind::P2pNetworkSchedulerOutgoingDidConnect, - Self::IncomingDataIsReady { .. } => ActionKind::P2pNetworkSchedulerIncomingDataIsReady, Self::IncomingDataDidReceive { .. } => { ActionKind::P2pNetworkSchedulerIncomingDataDidReceive } @@ -1394,6 +1406,33 @@ impl ActionKindGet for P2pNetworkSchedulerAction { } } +impl ActionKindGet for P2pNetworkSchedulerEffectfulAction { + fn kind(&self) -> ActionKind { + match self { + Self::InterfaceDetected { .. } => { + ActionKind::P2pNetworkSchedulerEffectfulInterfaceDetected + } + Self::IncomingConnectionIsReady { .. } => { + ActionKind::P2pNetworkSchedulerEffectfulIncomingConnectionIsReady + } + Self::IncomingDidAccept { .. } => { + ActionKind::P2pNetworkSchedulerEffectfulIncomingDidAccept + } + Self::OutgoingConnect { .. } => ActionKind::P2pNetworkSchedulerEffectfulOutgoingConnect, + Self::OutgoingDidConnect { .. } => { + ActionKind::P2pNetworkSchedulerEffectfulOutgoingDidConnect + } + Self::IncomingDataIsReady { .. } => { + ActionKind::P2pNetworkSchedulerEffectfulIncomingDataIsReady + } + Self::NoiseSelectDone { .. } => ActionKind::P2pNetworkSchedulerEffectfulNoiseSelectDone, + Self::SelectError { .. } => ActionKind::P2pNetworkSchedulerEffectfulSelectError, + Self::Disconnect { .. } => ActionKind::P2pNetworkSchedulerEffectfulDisconnect, + Self::Error { .. } => ActionKind::P2pNetworkSchedulerEffectfulError, + } + } +} + impl ActionKindGet for P2pNetworkPnetAction { fn kind(&self) -> ActionKind { match self { @@ -1405,6 +1444,15 @@ impl ActionKindGet for P2pNetworkPnetAction { } } +impl ActionKindGet for P2pNetworkPnetEffectfulAction { + fn kind(&self) -> ActionKind { + match self { + Self::OutgoingData { .. } => ActionKind::P2pNetworkPnetEffectfulOutgoingData, + Self::SetupNonce { .. } => ActionKind::P2pNetworkPnetEffectfulSetupNonce, + } + } +} + impl ActionKindGet for P2pNetworkSelectAction { fn kind(&self) -> ActionKind { match self { diff --git a/node/src/event_source/event_source_effects.rs b/node/src/event_source/event_source_effects.rs index 103355d23d..8fd60ee704 100644 --- a/node/src/event_source/event_source_effects.rs +++ b/node/src/event_source/event_source_effects.rs @@ -1,6 +1,7 @@ use p2p::channels::snark::P2pChannelsSnarkAction; use p2p::channels::streaming_rpc::P2pChannelsStreamingRpcAction; use p2p::channels::transaction::P2pChannelsTransactionAction; +use p2p::P2pNetworkSchedulerEffectfulAction; use snark::user_command_verify::{SnarkUserCommandVerifyAction, SnarkUserCommandVerifyError}; use crate::action::CheckTimeoutsAction; @@ -73,9 +74,11 @@ pub fn event_source_effects(store: &mut Store, action: EventSourc .dispatch(P2pNetworkSchedulerAction::ListenerError { listener, error }); } MioEvent::IncomingConnectionIsReady { listener } => { - store.dispatch(P2pNetworkSchedulerAction::IncomingConnectionIsReady { - listener, - }); + store.dispatch( + P2pNetworkSchedulerEffectfulAction::IncomingConnectionIsReady { + listener, + }, + ); } MioEvent::IncomingConnectionDidAccept(addr, result) => { store.dispatch(P2pNetworkSchedulerAction::IncomingDidAccept { diff --git a/node/src/logger/logger_effects.rs b/node/src/logger/logger_effects.rs index 7d86f8c197..b1abff613d 100644 --- a/node/src/logger/logger_effects.rs +++ b/node/src/logger/logger_effects.rs @@ -68,7 +68,9 @@ pub fn logger_effects(store: &Store, action: ActionWithMetaRef<'_ P2pAction::Peer(action) => action.action_event(&context), P2pAction::Network(action) => match action { P2pNetworkAction::Scheduler(action) => action.action_event(&context), + P2pNetworkAction::SchedulerEffectful(action) => action.action_event(&context), P2pNetworkAction::Pnet(action) => action.action_event(&context), + P2pNetworkAction::PnetEffectful(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), diff --git a/node/src/p2p/mod.rs b/node/src/p2p/mod.rs index 4fe021516f..22ad8e679d 100644 --- a/node/src/p2p/mod.rs +++ b/node/src/p2p/mod.rs @@ -112,5 +112,7 @@ impl_into_global_action!(p2p::P2pNetworkSelectAction); impl_into_global_action!(p2p::P2pNetworkPnetAction); impl_into_global_action!(p2p::P2pNetworkNoiseAction); impl_into_global_action!(p2p::P2pNetworkRpcAction); +impl_into_global_action!(p2p::P2pNetworkSchedulerEffectfulAction); +impl_into_global_action!(p2p::P2pNetworkPnetEffectfulAction); impl p2p::P2pActionTrait for crate::Action {} diff --git a/node/src/p2p/network/mod.rs b/node/src/p2p/network/mod.rs index ee7e775360..70aec00742 100644 --- a/node/src/p2p/network/mod.rs +++ b/node/src/p2p/network/mod.rs @@ -77,3 +77,9 @@ impl redux::EnablingCondition for P2pNetworkPubsubAction { state.p2p.is_enabled(self, time) } } + +impl redux::EnablingCondition for P2pNetworkSchedulerEffectfulAction { + fn is_enabled(&self, state: &crate::State, time: redux::Timestamp) -> bool { + state.p2p.is_enabled(self, time) + } +} diff --git a/p2p/src/lib.rs b/p2p/src/lib.rs index b94bfcb676..1f50efbfbd 100644 --- a/p2p/src/lib.rs +++ b/p2p/src/lib.rs @@ -4,11 +4,11 @@ pub mod connection; pub mod disconnection; pub mod discovery; pub mod identity; -pub mod peer; use bootstrap::P2pNetworkKadBootstrapState; use channels::{ - rpc::P2pChannelsRpcAction, snark::P2pChannelsSnarkAction, - transaction::P2pChannelsTransactionAction, + best_tip::P2pChannelsBestTipAction, rpc::P2pChannelsRpcAction, snark::P2pChannelsSnarkAction, + snark_job_commitment::P2pChannelsSnarkJobCommitmentAction, + streaming_rpc::P2pChannelsStreamingRpcAction, transaction::P2pChannelsTransactionAction, }; use connection::incoming::P2pConnectionIncomingAction; use disconnection::P2pDisconnectionAction; @@ -27,6 +27,9 @@ pub mod identify; pub mod network; pub use self::network::*; +pub mod peer; +pub use peer::*; + mod p2p_config; pub use p2p_config::*; @@ -106,6 +109,7 @@ pub trait P2pActionTrait: + From + From + From + + From + From + From + From @@ -115,5 +119,9 @@ pub trait P2pActionTrait: + From + From + From + + From + + From + + From + + From { } diff --git a/p2p/src/network/mod.rs b/p2p/src/network/mod.rs index 6f666ad8db..49c1fc9f15 100644 --- a/p2p/src/network/mod.rs +++ b/p2p/src/network/mod.rs @@ -22,9 +22,15 @@ mod p2p_network_effects; pub mod scheduler; pub use self::scheduler::*; +pub mod scheduler_effectful; +pub use self::scheduler_effectful::*; + pub mod pnet; pub use self::pnet::*; +pub mod pnet_effectful; +pub use self::pnet_effectful::*; + pub mod select; pub use self::select::*; diff --git a/p2p/src/network/p2p_network_actions.rs b/p2p/src/network/p2p_network_actions.rs index e138f14f1a..e724e813b7 100644 --- a/p2p/src/network/p2p_network_actions.rs +++ b/p2p/src/network/p2p_network_actions.rs @@ -2,7 +2,8 @@ use openmina_core::ActionEvent; use serde::{Deserialize, Serialize}; use super::{ - identify::*, kad::*, noise::*, pnet::*, pubsub::*, rpc::*, scheduler::*, select::*, yamux::*, + identify::*, kad::*, noise::*, pnet::*, pnet_effectful::*, pubsub::*, rpc::*, scheduler::*, + select::*, yamux::*, P2pNetworkSchedulerEffectfulAction, }; use crate::P2pState; @@ -10,7 +11,9 @@ use crate::P2pState; #[derive(derive_more::From, Serialize, Deserialize, Debug, Clone, ActionEvent)] pub enum P2pNetworkAction { Scheduler(P2pNetworkSchedulerAction), + SchedulerEffectful(P2pNetworkSchedulerEffectfulAction), Pnet(P2pNetworkPnetAction), + PnetEffectful(P2pNetworkPnetEffectfulAction), Select(P2pNetworkSelectAction), Noise(P2pNetworkNoiseAction), Yamux(P2pNetworkYamuxAction), @@ -25,7 +28,9 @@ impl redux::EnablingCondition for P2pNetworkAction { fn is_enabled(&self, state: &P2pState, time: redux::Timestamp) -> bool { match self { Self::Scheduler(v) => v.is_enabled(state, time), + Self::SchedulerEffectful(v) => v.is_enabled(state, time), Self::Pnet(v) => v.is_enabled(state, time), + Self::PnetEffectful(v) => v.is_enabled(state, time), Self::Select(v) => v.is_enabled(state, time), Self::Noise(v) => v.is_enabled(state, time), Self::Yamux(v) => v.is_enabled(state, time), diff --git a/p2p/src/network/p2p_network_effects.rs b/p2p/src/network/p2p_network_effects.rs index 1d89e42711..ef7ef05043 100644 --- a/p2p/src/network/p2p_network_effects.rs +++ b/p2p/src/network/p2p_network_effects.rs @@ -9,21 +9,23 @@ impl P2pNetworkAction { Store::Service: P2pMioService + P2pCryptoService + P2pNetworkService, { match self { - P2pNetworkAction::Scheduler(v) => v.effects(meta, store), - P2pNetworkAction::Pnet(v) => v.effects(meta, store), P2pNetworkAction::Identify(v) => match v.effects(meta, store) { Ok(_) => {} Err(e) => error!(meta.time(); "error dispatching Identify stream action: {e}"), }, - P2pNetworkAction::Select(_) + P2pNetworkAction::Pnet(_) + | P2pNetworkAction::Select(_) | P2pNetworkAction::Noise(_) | P2pNetworkAction::Yamux(_) | P2pNetworkAction::Kad(_) | P2pNetworkAction::Pubsub(_) - | P2pNetworkAction::Rpc(_) => { + | P2pNetworkAction::Rpc(_) + | P2pNetworkAction::Scheduler(_) => { // handled by reducer } + P2pNetworkAction::SchedulerEffectful(v) => v.effects(meta, store), P2pNetworkAction::PubsubEffectful(v) => v.effects(meta, store), + P2pNetworkAction::PnetEffectful(v) => v.effects(meta, store), } } } diff --git a/p2p/src/network/p2p_network_reducer.rs b/p2p/src/network/p2p_network_reducer.rs index f1bf1924b0..92944a4c90 100644 --- a/p2p/src/network/p2p_network_reducer.rs +++ b/p2p/src/network/p2p_network_reducer.rs @@ -6,7 +6,7 @@ use super::*; impl P2pNetworkState { pub fn reducer( - mut state_context: Substate, + state_context: Substate, action: redux::ActionWithMeta<&P2pNetworkAction>, limits: &P2pLimits, ) -> Result<(), String> @@ -14,20 +14,16 @@ impl P2pNetworkState { State: crate::P2pStateTrait, Action: crate::P2pActionTrait, { - let state = state_context.get_substate_mut()?; - let (action, meta) = action.split(); match action { - P2pNetworkAction::Scheduler(a) => { - state.scheduler.reducer(meta.with_action(a)); - Ok(()) - } - P2pNetworkAction::Pnet(a) => { - if let Some(cn) = state.scheduler.connections.get_mut(a.addr()) { - cn.pnet.reducer(meta.with_action(a)) - } - Ok(()) - } + P2pNetworkAction::Pnet(a) => P2pNetworkPnetState::reducer( + Substate::from_compatible_substate(state_context), + meta.with_action(a), + ), + P2pNetworkAction::Scheduler(a) => P2pNetworkSchedulerState::reducer( + Substate::from_compatible_substate(state_context), + meta.with_action(a), + ), P2pNetworkAction::Select(a) => P2pNetworkSelectState::reducer( Substate::from_compatible_substate(state_context), meta.with_action(a), @@ -54,15 +50,17 @@ impl P2pNetworkState { Substate::from_compatible_substate(state_context), meta.with_action(a), ), - P2pNetworkAction::PubsubEffectful(_) => { - // Effectful action; no reducer - Ok(()) - } P2pNetworkAction::Rpc(a) => P2pNetworkRpcState::reducer( Substate::from_compatible_substate(state_context), meta.with_action(a), limits, ), + P2pNetworkAction::PubsubEffectful(_) + | P2pNetworkAction::SchedulerEffectful(_) + | P2pNetworkAction::PnetEffectful(_) => { + // Effectful action; no reducer + Ok(()) + } } } diff --git a/p2p/src/network/pnet/mod.rs b/p2p/src/network/pnet/mod.rs index ec3a63a275..c8a8871678 100644 --- a/p2p/src/network/pnet/mod.rs +++ b/p2p/src/network/pnet/mod.rs @@ -6,6 +6,3 @@ pub use self::p2p_network_pnet_state::P2pNetworkPnetState; #[cfg(feature = "p2p-libp2p")] mod p2p_network_pnet_reducer; - -#[cfg(feature = "p2p-libp2p")] -mod p2p_network_pnet_effects; diff --git a/p2p/src/network/pnet/p2p_network_pnet_actions.rs b/p2p/src/network/pnet/p2p_network_pnet_actions.rs index f0eeb28b6c..d4b26ab4d3 100644 --- a/p2p/src/network/pnet/p2p_network_pnet_actions.rs +++ b/p2p/src/network/pnet/p2p_network_pnet_actions.rs @@ -42,7 +42,11 @@ impl From for crate::P2pAction { } impl redux::EnablingCondition for P2pNetworkPnetAction { - fn is_enabled(&self, _state: &P2pState, _time: redux::Timestamp) -> bool { - true + fn is_enabled(&self, state: &P2pState, _time: redux::Timestamp) -> bool { + state + .network + .scheduler + .connection_state(self.addr()) + .is_some() } } diff --git a/p2p/src/network/pnet/p2p_network_pnet_effects.rs b/p2p/src/network/pnet/p2p_network_pnet_effects.rs deleted file mode 100644 index 9c3fc5cd88..0000000000 --- a/p2p/src/network/pnet/p2p_network_pnet_effects.rs +++ /dev/null @@ -1,63 +0,0 @@ -use openmina_core::fuzzed_maybe; - -use crate::disconnection::P2pDisconnectionReason; - -use super::{super::*, *}; - -use super::p2p_network_pnet_state::Half; - -impl P2pNetworkPnetAction { - pub fn effects(self, _meta: &redux::ActionMeta, store: &mut Store) - where - Store: crate::P2pStore, - Store::Service: P2pMioService, - { - let (state, service) = store.state_and_service(); - let connections = &state.network.scheduler.connections; - let Some(state) = connections.get(self.addr()) else { - return; - }; - let state = &state.pnet; - match self { - P2pNetworkPnetAction::IncomingData { addr, .. } => match &state.incoming { - Half::Done { to_send, .. } if !to_send.is_empty() => { - let data = to_send.clone().into(); - store.dispatch(P2pNetworkSelectAction::IncomingDataAuth { - addr, - data, - fin: false, - }); - } - _ => {} - }, - P2pNetworkPnetAction::OutgoingData { addr, .. } => match &state.outgoing { - Half::Done { to_send, .. } if !to_send.is_empty() => { - fuzzed_maybe!(to_send.clone(), crate::fuzzer::mutate_pnet); - service.send_mio_cmd(crate::MioCmd::Send( - addr, - to_send.clone().into_boxed_slice(), - )); - } - _ => {} - }, - P2pNetworkPnetAction::SetupNonce { - addr, - nonce, - incoming, - } => { - service.send_mio_cmd(crate::MioCmd::Send(addr, nonce.to_vec().into_boxed_slice())); - store.dispatch(P2pNetworkSelectAction::Init { - addr, - kind: SelectKind::Authentication, - incoming, - }); - } - P2pNetworkPnetAction::Timeout { addr } => { - store.dispatch(P2pNetworkSchedulerAction::Disconnect { - addr, - reason: P2pDisconnectionReason::Timeout, - }); - } - } - } -} diff --git a/p2p/src/network/pnet/p2p_network_pnet_reducer.rs b/p2p/src/network/pnet/p2p_network_pnet_reducer.rs index 034a1e46b2..c7cd98ca70 100644 --- a/p2p/src/network/pnet/p2p_network_pnet_reducer.rs +++ b/p2p/src/network/pnet/p2p_network_pnet_reducer.rs @@ -1,5 +1,11 @@ +use openmina_core::{bug_condition, Substate}; use salsa_simple::XSalsa20; +use crate::{ + disconnection::P2pDisconnectionReason, Data, P2pNetworkPnetEffectfulAction, + P2pNetworkSchedulerAction, P2pNetworkSchedulerState, P2pNetworkSelectAction, +}; + use super::{ p2p_network_pnet_state::{Half, P2pNetworkPnetState}, *, @@ -34,21 +40,108 @@ impl Half { } impl P2pNetworkPnetState { - pub fn reducer(&mut self, action: redux::ActionWithMeta<&P2pNetworkPnetAction>) { - let (action, meta) = action.split(); + /// Substate is accessed + pub fn reducer( + mut state_context: Substate, + action: redux::ActionWithMeta<&P2pNetworkPnetAction>, + ) -> Result<(), String> + where + State: crate::P2pStateTrait, + Action: crate::P2pActionTrait, + { + let (action, _meta) = action.split(); + let pnet_state = &mut state_context + .get_substate_mut()? + .connection_state_mut(action.addr()) + .ok_or_else(|| format!("Missing connection for action: {:?}", action))? + .pnet; match action { - P2pNetworkPnetAction::IncomingData { data, .. } => { - self.incoming.reduce(&self.shared_secret, data); + P2pNetworkPnetAction::IncomingData { data, addr } => { + pnet_state.incoming.reduce(&pnet_state.shared_secret, data); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let scheduler_state: &P2pNetworkSchedulerState = state.substate()?; + let pnet_state = &scheduler_state + .connection_state(addr) + .ok_or_else(|| format!("Missing connection for action: {:?}", action))? + .pnet; + + let Half::Done { to_send, .. } = &pnet_state.incoming else { + // this should be only if incoming state didn't receive enough data + return Ok(()); + }; + + if !to_send.is_empty() { + let data = Data::from(to_send.clone()); + dispatcher.push(P2pNetworkSelectAction::IncomingDataAuth { + addr: *addr, + data, + fin: false, + }); + } + + Ok(()) } - P2pNetworkPnetAction::OutgoingData { data, .. } => { - self.outgoing.reduce(&self.shared_secret, data) + P2pNetworkPnetAction::OutgoingData { data, addr } => { + pnet_state.outgoing.reduce(&pnet_state.shared_secret, data); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let scheduler_state: &P2pNetworkSchedulerState = state.substate()?; + let pnet_state = &scheduler_state + .connection_state(addr) + .ok_or_else(|| format!("Missing connection for action: {:?}", action))? + .pnet; + + let Half::Done { to_send, .. } = &pnet_state.outgoing else { + // this should be only if we haven't set enough data to change from `Buffering` to `Done` + return Ok(()); + }; + + if !to_send.is_empty() { + dispatcher.push(P2pNetworkPnetEffectfulAction::OutgoingData { + addr: *addr, + data: to_send.clone(), + }); + } + Ok(()) } - P2pNetworkPnetAction::SetupNonce { nonce, .. } => { - self.outgoing.reduce(&self.shared_secret, nonce) + P2pNetworkPnetAction::SetupNonce { + nonce, + addr, + incoming, + } => { + pnet_state.outgoing.reduce(&pnet_state.shared_secret, nonce); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let scheduler_state: &P2pNetworkSchedulerState = state.substate()?; + let pnet_state = &scheduler_state + .connection_state(addr) + .ok_or_else(|| format!("Missing connection for action: {:?}", action))? + .pnet; + + if !matches!(&pnet_state.outgoing, Half::Done { .. }) { + bug_condition!( + "Invalid state for `P2pNetworkPnetAction::SetupNonce`, state: {:?}", + pnet_state.outgoing + ); + return Ok(()); + }; + + dispatcher.push(P2pNetworkPnetEffectfulAction::SetupNonce { + addr: *addr, + nonce: nonce.clone(), + incoming: *incoming, + }); + Ok(()) } - P2pNetworkPnetAction::Timeout { .. } => { - openmina_core::warn!(meta.time(); "timeout"); + P2pNetworkPnetAction::Timeout { addr } => { + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(P2pNetworkSchedulerAction::Disconnect { + addr: *addr, + reason: P2pDisconnectionReason::Timeout, + }); + Ok(()) } } } diff --git a/p2p/src/network/pnet_effectful/mod.rs b/p2p/src/network/pnet_effectful/mod.rs new file mode 100644 index 0000000000..384d098c4b --- /dev/null +++ b/p2p/src/network/pnet_effectful/mod.rs @@ -0,0 +1,5 @@ +mod p2p_network_pnet_effectful_actions; +pub use self::p2p_network_pnet_effectful_actions::*; + +#[cfg(feature = "p2p-libp2p")] +mod p2p_network_pnet_effectful_effects; diff --git a/p2p/src/network/pnet_effectful/p2p_network_pnet_effectful_actions.rs b/p2p/src/network/pnet_effectful/p2p_network_pnet_effectful_actions.rs new file mode 100644 index 0000000000..ba9215798e --- /dev/null +++ b/p2p/src/network/pnet_effectful/p2p_network_pnet_effectful_actions.rs @@ -0,0 +1,39 @@ +use crate::{ConnectionAddr, Data, P2pState}; +use openmina_core::ActionEvent; +use serde::{Deserialize, Serialize}; + +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(addr), debug(data), incoming), level = trace)] +pub enum P2pNetworkPnetEffectfulAction { + OutgoingData { + addr: ConnectionAddr, + data: Vec, + }, + #[action_event(level = debug)] + SetupNonce { + addr: ConnectionAddr, + nonce: Data, + incoming: bool, + }, +} + +impl P2pNetworkPnetEffectfulAction { + pub fn addr(&self) -> &ConnectionAddr { + match self { + Self::OutgoingData { addr, .. } => addr, + Self::SetupNonce { addr, .. } => addr, + } + } +} + +impl From for crate::P2pAction { + fn from(a: P2pNetworkPnetEffectfulAction) -> Self { + Self::Network(a.into()) + } +} + +impl redux::EnablingCondition for P2pNetworkPnetEffectfulAction { + fn is_enabled(&self, _state: &P2pState, _time: redux::Timestamp) -> bool { + true + } +} diff --git a/p2p/src/network/pnet_effectful/p2p_network_pnet_effectful_effects.rs b/p2p/src/network/pnet_effectful/p2p_network_pnet_effectful_effects.rs new file mode 100644 index 0000000000..8784011eba --- /dev/null +++ b/p2p/src/network/pnet_effectful/p2p_network_pnet_effectful_effects.rs @@ -0,0 +1,34 @@ +use openmina_core::fuzzed_maybe; + +use super::P2pNetworkPnetEffectfulAction; +use crate::P2pMioService; +use crate::{P2pNetworkSelectAction, SelectKind}; + +impl P2pNetworkPnetEffectfulAction { + pub fn effects(self, _meta: &redux::ActionMeta, store: &mut Store) + where + Store: crate::P2pStore, + Store::Service: P2pMioService, + { + let service = store.service(); + + match self { + P2pNetworkPnetEffectfulAction::OutgoingData { addr, data } => { + let data = fuzzed_maybe!(data, crate::fuzzer::mutate_pnet); + service.send_mio_cmd(crate::MioCmd::Send(addr, data.into_boxed_slice())); + } + P2pNetworkPnetEffectfulAction::SetupNonce { + addr, + nonce, + incoming, + } => { + service.send_mio_cmd(crate::MioCmd::Send(addr, nonce.to_vec().into_boxed_slice())); + store.dispatch(P2pNetworkSelectAction::Init { + addr, + kind: SelectKind::Authentication, + incoming, + }); + } + } + } +} diff --git a/p2p/src/network/scheduler/mod.rs b/p2p/src/network/scheduler/mod.rs index c2b78a83a0..7be20061cc 100644 --- a/p2p/src/network/scheduler/mod.rs +++ b/p2p/src/network/scheduler/mod.rs @@ -6,6 +6,3 @@ pub use self::p2p_network_scheduler_state::*; #[cfg(feature = "p2p-libp2p")] mod p2p_network_scheduler_reducer; - -#[cfg(feature = "p2p-libp2p")] -mod p2p_network_scheduler_effects; diff --git a/p2p/src/network/scheduler/p2p_network_scheduler_actions.rs b/p2p/src/network/scheduler/p2p_network_scheduler_actions.rs index 22ced57cee..80bfc19807 100644 --- a/p2p/src/network/scheduler/p2p_network_scheduler_actions.rs +++ b/p2p/src/network/scheduler/p2p_network_scheduler_actions.rs @@ -32,14 +32,14 @@ pub enum P2pNetworkSchedulerAction { listener: SocketAddr, error: String, }, - IncomingConnectionIsReady { - listener: SocketAddr, - }, #[action_event(fields(debug(addr), debug(result)))] IncomingDidAccept { addr: Option, result: Result<(), String>, }, + IncomingDataIsReady { + addr: ConnectionAddr, + }, /// Initialize outgoing connection. OutgoingConnect { addr: SocketAddr, @@ -49,9 +49,6 @@ pub enum P2pNetworkSchedulerAction { addr: ConnectionAddr, result: Result<(), String>, }, - IncomingDataIsReady { - addr: ConnectionAddr, - }, IncomingDataDidReceive { addr: ConnectionAddr, result: Result, @@ -124,15 +121,14 @@ impl From for crate::P2pAction { impl redux::EnablingCondition for P2pNetworkSchedulerAction { fn is_enabled(&self, state: &P2pState, _time: redux::Timestamp) -> bool { - let conn = |addr| state.network.scheduler.connections.get(addr); - #[allow(unused_variables)] match self { - P2pNetworkSchedulerAction::InterfaceDetected { ip } => true, - P2pNetworkSchedulerAction::InterfaceExpired { ip } => true, - P2pNetworkSchedulerAction::ListenerReady { listener } => true, - P2pNetworkSchedulerAction::ListenerError { listener, error } => true, - P2pNetworkSchedulerAction::IncomingConnectionIsReady { listener } => true, - P2pNetworkSchedulerAction::IncomingDidAccept { addr, result } => { + P2pNetworkSchedulerAction::InterfaceDetected { .. } + | P2pNetworkSchedulerAction::InterfaceExpired { .. } + | P2pNetworkSchedulerAction::ListenerReady { .. } + | P2pNetworkSchedulerAction::ListenerError { .. } + | P2pNetworkSchedulerAction::SelectDone { .. } + | P2pNetworkSchedulerAction::SelectError { .. } => true, + P2pNetworkSchedulerAction::IncomingDidAccept { addr, .. } => { addr.as_ref().map_or(false, |addr| { !state.network.scheduler.connections.contains_key(addr) }) @@ -145,25 +141,17 @@ impl redux::EnablingCondition for P2pNetworkSchedulerAction { sock_addr: *addr, incoming: false, }), - P2pNetworkSchedulerAction::OutgoingDidConnect { addr, result } => state + P2pNetworkSchedulerAction::OutgoingDidConnect { addr, .. } => state .network .scheduler .connections .get(addr) .map_or(false, |conn_state| !conn_state.incoming), - P2pNetworkSchedulerAction::IncomingDataIsReady { addr } => conn(addr).is_some(), - P2pNetworkSchedulerAction::IncomingDataDidReceive { addr, result } => { - conn(addr).is_some() + P2pNetworkSchedulerAction::IncomingDataDidReceive { addr, .. } + | P2pNetworkSchedulerAction::IncomingDataIsReady { addr } + | P2pNetworkSchedulerAction::YamuxDidInit { addr, .. } => { + state.network.scheduler.connections.contains_key(addr) } - P2pNetworkSchedulerAction::SelectDone { - addr, - kind, - protocol, - incoming, - expected_peer_id, - } => true, - P2pNetworkSchedulerAction::SelectError { addr, kind, error } => true, - P2pNetworkSchedulerAction::YamuxDidInit { addr, peer_id, .. } => true, P2pNetworkSchedulerAction::Disconnect { addr, .. } | P2pNetworkSchedulerAction::Error { addr, .. } => state .network diff --git a/p2p/src/network/scheduler/p2p_network_scheduler_effects.rs b/p2p/src/network/scheduler/p2p_network_scheduler_effects.rs deleted file mode 100644 index 64001cfeea..0000000000 --- a/p2p/src/network/scheduler/p2p_network_scheduler_effects.rs +++ /dev/null @@ -1,417 +0,0 @@ -use std::{net::SocketAddr, sync::OnceLock}; - -use openmina_core::{error, warn}; -use redux::ActionMeta; - -use crate::{ - connection::{ - incoming::P2pConnectionIncomingAction, outgoing::P2pConnectionOutgoingAction, - P2pConnectionState, - }, - disconnection::P2pDisconnectionAction, - identify::P2pIdentifyAction, - network::identify::P2pNetworkIdentifyStreamAction, - request::{P2pNetworkKadRequestState, P2pNetworkKadRequestStatus}, - token::{RpcAlgorithm, StreamKind}, - MioCmd, P2pCryptoService, P2pMioService, P2pPeerStatus, -}; - -use super::{super::*, *}; - -fn keep_connection_with_unknown_stream() -> bool { - static VAL: OnceLock = OnceLock::new(); - *VAL.get_or_init(|| { - std::env::var("KEEP_CONNECTION_WITH_UNKNOWN_STREAM") - .ok() - .and_then(|v| v.parse().ok()) - .unwrap_or(false) - }) -} - -impl P2pNetworkSchedulerAction { - pub fn effects(self, meta: &ActionMeta, store: &mut Store) - where - Store: crate::P2pStore, - Store::Service: P2pMioService + P2pCryptoService, - { - match self { - P2pNetworkSchedulerAction::InterfaceDetected { ip, .. } => { - if let Some(port) = store.state().config.libp2p_port { - store - .service() - .send_mio_cmd(MioCmd::ListenOn(SocketAddr::new(ip, port))); - } - } - P2pNetworkSchedulerAction::InterfaceExpired { .. } => {} - P2pNetworkSchedulerAction::ListenerReady { listener: _ } => {} - P2pNetworkSchedulerAction::ListenerError { - listener: _, - error: _, - } => { - // TODO: handle this error? - } - P2pNetworkSchedulerAction::IncomingConnectionIsReady { listener, .. } => { - let state = store.state(); - if state.network.scheduler.connections.len() - >= state.config.limits.max_connections() - { - store.service().send_mio_cmd(MioCmd::Refuse(listener)); - } else { - store.service().send_mio_cmd(MioCmd::Accept(listener)); - } - } - P2pNetworkSchedulerAction::IncomingDidAccept { addr, .. } => { - let Some(addr) = addr else { - return; - }; - - let nonce = store.service().generate_random_nonce(); - store.dispatch(P2pNetworkPnetAction::SetupNonce { - addr, - nonce: nonce.to_vec().into(), - incoming: true, - }); - } - P2pNetworkSchedulerAction::OutgoingConnect { addr } => { - store.service().send_mio_cmd(MioCmd::Connect(addr)); - } - P2pNetworkSchedulerAction::OutgoingDidConnect { addr, result } => match result { - Ok(_) => { - let nonce = store.service().generate_random_nonce(); - store.dispatch(P2pNetworkPnetAction::SetupNonce { - addr, - nonce: nonce.to_vec().into(), - incoming: false, - }); - } - Err(err) => { - let Some((peer_id, peer_state)) = store.state().peer_with_connection(addr) - else { - error!(meta.time(); "outgoing connection to {addr} failed, but there is no peer for it"); - return; - }; - if matches!( - peer_state.status, - P2pPeerStatus::Connecting(P2pConnectionState::Outgoing(_)) - ) { - store.dispatch(P2pConnectionOutgoingAction::FinalizeError { - peer_id, - error: err.to_string(), - }); - } - } - }, - P2pNetworkSchedulerAction::IncomingDataIsReady { addr } => { - let Some(state) = store.state().network.scheduler.connections.get(&addr) else { - return; - }; - - let limit = state.limit(); - if limit > 0 { - store - .service() - .send_mio_cmd(MioCmd::Recv(addr, vec![0; limit].into_boxed_slice())); - } - } - P2pNetworkSchedulerAction::IncomingDataDidReceive { result, addr } => match result { - Ok(data) => { - store.dispatch(P2pNetworkPnetAction::IncomingData { - addr, - data: data.clone(), - }); - } - Err(e) => { - store.dispatch(P2pNetworkSchedulerAction::Error { - addr, - error: P2pNetworkConnectionError::MioError(e), - }); - } - }, - P2pNetworkSchedulerAction::SelectDone { - addr, - protocol, - kind: select_kind, - incoming, - .. - } => { - use self::token::*; - - match protocol { - Some(Protocol::Auth(AuthKind::Noise)) => { - let ephemeral_sk = Sk::from_random(store.service().ephemeral_sk()); - let static_sk = Sk::from_random(store.service().static_sk()); - let static_pk = static_sk.pk(); - - let signature = store.service().sign_key(static_pk.0.as_bytes()).into(); - - store.dispatch(P2pNetworkNoiseAction::Init { - addr, - incoming, - ephemeral_sk, - static_sk, - signature, - }); - } - Some(Protocol::Mux(MuxKind::Yamux1_0_0 | MuxKind::YamuxNoNewLine1_0_0)) => { - let SelectKind::Multiplexing(peer_id) = select_kind else { - error!(meta.time(); "wrong kind for multiplexing protocol action: {select_kind:?}"); - return; - }; - let message_size_limit = store.state().config.limits.yamux_message_size(); - store.dispatch(P2pNetworkSchedulerAction::YamuxDidInit { - addr, - peer_id, - message_size_limit, - }); - } - Some(Protocol::Stream(kind)) => { - let SelectKind::Stream(peer_id, stream_id) = select_kind else { - error!(meta.time(); "wrong kind for stream protocol action: {kind:?}"); - return; - }; - match kind { - StreamKind::Status(_) => { - //unimplemented!() - } - StreamKind::Bitswap(_) => { - //unimplemented!() - } - StreamKind::Identify(IdentifyAlgorithm::Identify1_0_0) => { - store.dispatch(P2pNetworkIdentifyStreamAction::New { - addr, - peer_id, - stream_id, - incoming, - }); - } - StreamKind::Identify(IdentifyAlgorithm::IdentifyPush1_0_0) => { - //unimplemented!() - } - StreamKind::Ping(PingAlgorithm::Ping1_0_0) => { - //unimplemented!() - } - StreamKind::Broadcast(protocol) => { - store.dispatch(P2pNetworkPubsubAction::NewStream { - incoming, - peer_id, - addr, - stream_id, - protocol, - }); - } - StreamKind::Discovery(DiscoveryAlgorithm::Kademlia1_0_0) => { - if let Some(discovery_state) = - store.state().network.scheduler.discovery_state() - { - let request = - !incoming && discovery_state.request(&peer_id).is_some(); - store.dispatch(P2pNetworkKademliaStreamAction::New { - addr, - peer_id, - stream_id, - incoming, - }); - // if our node initiated a request to the peer, notify that the stream is ready. - if request { - store.dispatch(P2pNetworkKadRequestAction::StreamReady { - peer_id, - addr, - stream_id, - }); - } - } - } - StreamKind::Rpc(RpcAlgorithm::Rpc0_0_1) => { - store.dispatch(P2pNetworkRpcAction::Init { - addr, - peer_id, - stream_id, - incoming, - }); - } - } - } - None => { - match &select_kind { - SelectKind::Authentication => { - // TODO: close the connection - } - SelectKind::MultiplexingNoPeerId => { - // WARNING: must not happen - } - SelectKind::Multiplexing(_) => { - // TODO: close the connection - } - SelectKind::Stream(peer_id, stream_id) => { - if let Some(discovery_state) = - store.state().network.scheduler.discovery_state() - { - if let Some(P2pNetworkKadRequestState { - status: P2pNetworkKadRequestStatus::WaitingForKadStream(id), - .. - }) = discovery_state.request(peer_id) - { - if id == stream_id { - store.dispatch(P2pNetworkKadRequestAction::Error { - peer_id: *peer_id, - error: "stream protocol is not negotiated".into(), - }); - } - } - } - } - } - } - } - } - P2pNetworkSchedulerAction::SelectError { addr, kind, .. } => { - match kind { - SelectKind::Stream(peer_id, stream_id) - if keep_connection_with_unknown_stream() => - { - warn!(meta.time(); summary="select error for stream", addr = display(addr), peer_id = display(peer_id)); - // just close the stream - store.dispatch(P2pNetworkYamuxAction::OutgoingData { - addr, - stream_id, - data: Data::default(), - flags: YamuxFlags::RST, - }); - store.dispatch(P2pNetworkSchedulerAction::PruneStream { - peer_id, - stream_id, - }); - } - _ => { - store.dispatch(P2pNetworkSchedulerAction::Error { - addr, - error: P2pNetworkConnectionError::SelectError, - }); - } - } - // Close state is set by reducer for the non-stream case - if let Some(conn_state) = store.state().network.scheduler.connections.get(&addr) { - if let Some(reason) = conn_state.closed.clone() { - store.service().send_mio_cmd(MioCmd::Disconnect(addr)); - store.dispatch(P2pNetworkSchedulerAction::Disconnected { addr, reason }); - } - } - } - P2pNetworkSchedulerAction::YamuxDidInit { peer_id, addr, .. } => { - if let Some(cn) = store.state().network.scheduler.connections.get(&addr) { - let incoming = cn.incoming; - if incoming { - store.dispatch(P2pConnectionIncomingAction::Libp2pReceived { peer_id }); - } else { - store.dispatch(P2pConnectionOutgoingAction::FinalizeSuccess { peer_id }); - } - - // for each negotiated yamux conenction open a new outgoing RPC stream - // TODO(akoptelov,vlad): should we do that? shouldn't upper layer decide when to open RPC streams? - // Also rpc streams are short-living -- they only persist for a single request-response (?) - let stream_id = YamuxStreamKind::Rpc.stream_id(incoming); - store.dispatch(P2pNetworkYamuxAction::OpenStream { - addr, - stream_id, - stream_kind: StreamKind::Rpc(RpcAlgorithm::Rpc0_0_1), - }); - store.dispatch(P2pNetworkYamuxAction::OpenStream { - addr, - stream_id: stream_id + 2, - stream_kind: StreamKind::Broadcast(token::BroadcastAlgorithm::Meshsub1_1_0), - }); - - // TODO: open RPC and Kad connections only after identify reports support for it? - store.dispatch(P2pIdentifyAction::NewRequest { peer_id, addr }); - - // Kademlia: if the connection is initiated by Kademlia request, notify that it is ready. - if store - .state() - .network - .scheduler - .discovery_state() - .map_or(false, |state| state.request(&peer_id).is_some()) - { - store.dispatch(P2pNetworkKadRequestAction::MuxReady { peer_id, addr }); - } - } - } - P2pNetworkSchedulerAction::Disconnect { addr, .. } => { - if let Some(conn_state) = store.state().network.scheduler.connections.get(&addr) { - if let Some(reason) = conn_state.closed.clone() { - store.service().send_mio_cmd(MioCmd::Disconnect(addr)); - store.dispatch(P2pNetworkSchedulerAction::Disconnected { addr, reason }); - } - } - } - P2pNetworkSchedulerAction::Error { addr, .. } => { - if let Some(conn_state) = store.state().network.scheduler.connections.get(&addr) { - if let Some(reason) = conn_state.closed.clone() { - store.service().send_mio_cmd(MioCmd::Disconnect(addr)); - store.dispatch(P2pNetworkSchedulerAction::Disconnected { addr, reason }); - } - } - } - P2pNetworkSchedulerAction::Disconnected { addr, reason } => { - if let Some(conn_state) = store.state().network.scheduler.connections.get(&addr) { - let incoming = conn_state.incoming; - let peer_with_state = store.state().peer_with_connection(addr); - - store.dispatch(P2pNetworkSchedulerAction::Prune { addr }); - - if reason.is_disconnected() { - // statemachine behaviour should continue with this, i.e. dispatch P2pDisconnectionAction::Finish - return; - } - - match peer_with_state { - Some((peer_id, peer_state)) => { - // TODO: connection state type should tell if it is finalized - match &peer_state.status { - crate::P2pPeerStatus::Connecting( - crate::connection::P2pConnectionState::Incoming(_), - ) => { - store.dispatch(P2pConnectionIncomingAction::FinalizeError { - peer_id, - error: reason.to_string(), - }); - } - crate::P2pPeerStatus::Connecting( - crate::connection::P2pConnectionState::Outgoing(_), - ) => { - store.dispatch(P2pConnectionOutgoingAction::FinalizeError { - peer_id, - error: reason.to_string(), - }); - } - crate::P2pPeerStatus::Disconnected { .. } => { - // sanity check, should be incoming connection - if !incoming { - error!(meta.time(); "disconnected peer connection for address {addr}"); - } else { - // TODO: introduce action for incoming connection finalization without peer_id - } - } - crate::P2pPeerStatus::Ready(_) => { - store.dispatch(P2pDisconnectionAction::Finish { peer_id }); - } - } - store.dispatch(P2pNetworkSchedulerAction::PruneStreams { peer_id }); - } - None => { - // sanity check, should be incoming connection - if !incoming { - // TODO: error!(meta.time(); "non-existing peer connection for address {addr}"); - } else { - // TODO: introduce action for incoming connection finalization without peer_id - } - } - } - } - } - P2pNetworkSchedulerAction::Prune { .. } - | P2pNetworkSchedulerAction::PruneStreams { .. } - | P2pNetworkSchedulerAction::PruneStream { .. } => {} - } - } -} diff --git a/p2p/src/network/scheduler/p2p_network_scheduler_reducer.rs b/p2p/src/network/scheduler/p2p_network_scheduler_reducer.rs index fe4acac489..c580133098 100644 --- a/p2p/src/network/scheduler/p2p_network_scheduler_reducer.rs +++ b/p2p/src/network/scheduler/p2p_network_scheduler_reducer.rs @@ -1,54 +1,123 @@ -use std::collections::BTreeMap; +use std::{collections::BTreeMap, sync::OnceLock}; -use openmina_core::error; +use identify::P2pNetworkIdentifyStreamAction; +use openmina_core::{bug_condition, error, warn, Substate}; +use redux::Dispatcher; +use request::{P2pNetworkKadRequestState, P2pNetworkKadRequestStatus}; +use token::{ + AuthKind, DiscoveryAlgorithm, IdentifyAlgorithm, MuxKind, PingAlgorithm, Protocol, + RpcAlgorithm, StreamKind, +}; + +use crate::{ + connection::{ + incoming::P2pConnectionIncomingAction, outgoing::P2pConnectionOutgoingAction, + P2pConnectionState, + }, + disconnection::P2pDisconnectionAction, + identify::P2pIdentifyAction, + P2pConfig, P2pPeerStatus, P2pState, PeerId, +}; use super::{super::*, p2p_network_scheduler_state::P2pNetworkConnectionState, *}; impl P2pNetworkSchedulerState { - pub fn reducer(&mut self, action: redux::ActionWithMeta<&P2pNetworkSchedulerAction>) { + pub fn reducer( + mut state_context: Substate, + action: redux::ActionWithMeta<&P2pNetworkSchedulerAction>, + ) -> Result<(), String> + where + State: crate::P2pStateTrait, + Action: crate::P2pActionTrait, + { let (action, meta) = action.split(); + let scheduler_state = state_context.get_substate_mut()?; + match action { P2pNetworkSchedulerAction::InterfaceDetected { ip, .. } => { - self.interfaces.insert(*ip); + scheduler_state.interfaces.insert(*ip); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let p2p_config: &P2pConfig = state.substate()?; + + if let Some(port) = p2p_config.libp2p_port { + dispatcher.push(P2pNetworkSchedulerEffectfulAction::InterfaceDetected { + ip: *ip, + port, + }); + } + + Ok(()) } P2pNetworkSchedulerAction::InterfaceExpired { ip, .. } => { - self.interfaces.remove(ip); + scheduler_state.interfaces.remove(ip); + Ok(()) } P2pNetworkSchedulerAction::ListenerReady { listener } => { - self.listeners.insert(*listener); + scheduler_state.listeners.insert(*listener); + Ok(()) } - P2pNetworkSchedulerAction::ListenerError { listener, error: _ } => { - self.listeners.remove(listener); + P2pNetworkSchedulerAction::ListenerError { listener, .. } => { + scheduler_state.listeners.remove(listener); + Ok(()) } - P2pNetworkSchedulerAction::IncomingConnectionIsReady { .. } => {} - P2pNetworkSchedulerAction::IncomingDidAccept { addr, .. } => { - let Some(addr) = addr else { - return; + P2pNetworkSchedulerAction::IncomingDataIsReady { addr } => { + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let scheduler: &Self = state.substate()?; + let Some(connection_state) = scheduler.connection_state(addr) else { + bug_condition!( + "Invalid state for `P2pNetworkSchedulerAction::IncomingDataIsReady`" + ); + return Ok(()); }; - self.connections.insert( - *addr, - P2pNetworkConnectionState { - incoming: true, - pnet: P2pNetworkPnetState::new(self.pnet_key, meta.time()), - select_auth: P2pNetworkSelectState::default(), - auth: None, - select_mux: P2pNetworkSelectState::default(), - mux: None, - streams: BTreeMap::default(), - closed: None, - limit: P2pNetworkConnectionState::INITIAL_LIMIT, - }, - ); + + let limit = connection_state.limit(); + if limit > 0 { + dispatcher.push(P2pNetworkSchedulerEffectfulAction::IncomingDataIsReady { + addr: *addr, + limit, + }); + } + + Ok(()) + } + P2pNetworkSchedulerAction::IncomingDidAccept { addr, result } => { + if let Some(addr) = addr { + scheduler_state.connections.insert( + *addr, + P2pNetworkConnectionState { + incoming: true, + pnet: P2pNetworkPnetState::new(scheduler_state.pnet_key, meta.time()), + select_auth: P2pNetworkSelectState::default(), + auth: None, + select_mux: P2pNetworkSelectState::default(), + mux: None, + streams: BTreeMap::default(), + closed: None, + limit: P2pNetworkConnectionState::INITIAL_LIMIT, + }, + ); + }; + + let dispatcher = state_context.into_dispatcher(); + if let Some(addr) = addr { + dispatcher.push(P2pNetworkSchedulerEffectfulAction::IncomingDidAccept { + addr: *addr, + result: result.clone(), + }); + } + + Ok(()) } P2pNetworkSchedulerAction::OutgoingConnect { addr } => { - self.connections.insert( + scheduler_state.connections.insert( ConnectionAddr { sock_addr: *addr, incoming: false, }, P2pNetworkConnectionState { incoming: false, - pnet: P2pNetworkPnetState::new(self.pnet_key, meta.time()), + pnet: P2pNetworkPnetState::new(scheduler_state.pnet_key, meta.time()), select_auth: P2pNetworkSelectState::initiator_auth( token::AuthKind::Noise, meta.time(), @@ -64,19 +133,72 @@ impl P2pNetworkSchedulerState { limit: P2pNetworkConnectionState::INITIAL_LIMIT, }, ); + + let dispatcher = state_context.into_dispatcher(); + dispatcher + .push(P2pNetworkSchedulerEffectfulAction::OutgoingConnect { addr: *addr }); + Ok(()) } - P2pNetworkSchedulerAction::OutgoingDidConnect { .. } => { + P2pNetworkSchedulerAction::OutgoingDidConnect { addr, result } => { // TODO: change to connected + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let p2p_state: &P2pState = state.substate()?; + + match result { + Ok(()) => { + dispatcher.push(P2pNetworkSchedulerEffectfulAction::OutgoingDidConnect { + addr: *addr, + }); + } + Err(error) => { + let Some((peer_id, peer_state)) = p2p_state.peer_with_connection(*addr) + else { + bug_condition!( + "outgoing connection to {addr} failed, but there is no peer for it" + ); + return Ok(()); + }; + if matches!( + peer_state.status, + P2pPeerStatus::Connecting(P2pConnectionState::Outgoing(_)) + ) { + dispatcher.push(P2pConnectionOutgoingAction::FinalizeError { + peer_id, + error: error.to_string(), + }); + } else { + bug_condition!("Invalid status for `P2pNetworkSchedulerAction::OutgoingDidConnect`: {:?}", peer_state.status); + } + } + } + Ok(()) } - P2pNetworkSchedulerAction::IncomingDataIsReady { .. } => {} P2pNetworkSchedulerAction::IncomingDataDidReceive { result, addr } => { - let Some(state) = self.connections.get_mut(addr) else { - return; + // since both actions dispatcher later require connection state, if we can't find it we shouldn't dispatcher them + let Some(state) = scheduler_state.connection_state_mut(addr) else { + bug_condition!("Unable to find connection for `P2pNetworkSchedulerAction::IncomingDataDidReceive`"); + return Ok(()); }; if let Ok(data) = result { state.consume(data.len()); + }; + + let dispatcher = state_context.into_dispatcher(); + match result { + Ok(data) => { + dispatcher.push(P2pNetworkPnetAction::IncomingData { + addr: *addr, + data: data.clone(), + }); + } + Err(error) => dispatcher.push(P2pNetworkSchedulerAction::Error { + addr: *addr, + error: P2pNetworkConnectionError::MioError(error.clone()), + }), } + Ok(()) } P2pNetworkSchedulerAction::SelectDone { addr, @@ -84,128 +206,443 @@ impl P2pNetworkSchedulerState { protocol, incoming, expected_peer_id, - .. } => { - let Some(connection) = self.connections.get_mut(addr) else { - return; - }; - match protocol { - Some(token::Protocol::Auth(token::AuthKind::Noise)) => { - connection.auth = Some(P2pNetworkAuthState::Noise( - P2pNetworkNoiseState::new(self.local_pk.clone(), *expected_peer_id), - )); - } - Some(token::Protocol::Mux( - token::MuxKind::Yamux1_0_0 | token::MuxKind::YamuxNoNewLine1_0_0, - )) => { - connection.mux = - Some(P2pNetworkConnectionMuxState::Yamux(P2pNetworkYamuxState { - init: true, - ..Default::default() - })); - } - Some(token::Protocol::Stream(stream_kind)) => { - let SelectKind::Stream(peer_id, stream_id) = kind else { - error!(meta.time(); "incorrect stream kind {kind:?} for protocol stream: {stream_kind:?}"); - return; - }; - match stream_kind { - token::StreamKind::Rpc(_) => { - if *incoming { - self.rpc_incoming_streams - .entry(*peer_id) - .or_default() - .insert( - *stream_id, - P2pNetworkRpcState::new(*addr, *stream_id), - ); - } else { - self.rpc_outgoing_streams - .entry(*peer_id) - .or_default() - .insert( - *stream_id, - P2pNetworkRpcState::new(*addr, *stream_id), - ); - } - } - token::StreamKind::Broadcast(_) => {} - token::StreamKind::Identify(_) => {} - token::StreamKind::Discovery(_) => {} - token::StreamKind::Ping(_) => {} - token::StreamKind::Bitswap(_) => {} - token::StreamKind::Status(_) => {} - } + scheduler_state.reducer_select_done( + *addr, + *kind, + *protocol, + *incoming, + *expected_peer_id, + ); + + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let p2p_state: &P2pState = state.substate()?; + Self::forward_select_done( + dispatcher, p2p_state, *protocol, *addr, *incoming, *kind, + ); + Ok(()) + } + P2pNetworkSchedulerAction::SelectError { addr, kind, error } => { + let dispatcher = state_context.into_dispatcher(); + + match kind { + SelectKind::Stream(peer_id, stream_id) + if keep_connection_with_unknown_stream() => + { + warn!(meta.time(); summary="select error for stream", addr = display(addr), peer_id = display(peer_id)); + // just close the stream + dispatcher.push(P2pNetworkYamuxAction::OutgoingData { + addr: *addr, + stream_id: *stream_id, + data: Data::default(), + flags: YamuxFlags::RST, + }); + dispatcher.push(P2pNetworkSchedulerAction::PruneStream { + peer_id: *peer_id, + stream_id: *stream_id, + }); + } + _ => { + dispatcher.push(P2pNetworkSchedulerAction::Error { + addr: *addr, + error: P2pNetworkConnectionError::SelectError, + }); } - None => {} } - } - P2pNetworkSchedulerAction::SelectError { .. } => { - // NOOP, error should be triggered + + dispatcher.push(P2pNetworkSchedulerEffectfulAction::SelectError { + addr: *addr, + kind: *kind, + error: error.to_owned(), + }); + + Ok(()) } P2pNetworkSchedulerAction::YamuxDidInit { addr, message_size_limit, - .. + peer_id, } => { - if let Some(cn) = self.connections.get_mut(addr) { - if let Some(P2pNetworkConnectionMuxState::Yamux(yamux)) = &mut cn.mux { - yamux.init = true; - yamux.message_size_limit = *message_size_limit; - } + let Some(cn) = scheduler_state.connections.get_mut(addr) else { + bug_condition!( + "Missing connection state for `P2pNetworkSchedulerAction::YamuxDidInit`" + ); + return Ok(()); + }; + if let Some(P2pNetworkConnectionMuxState::Yamux(yamux)) = &mut cn.mux { + yamux.init = true; + yamux.message_size_limit = *message_size_limit; + } + + let incoming = cn.incoming; + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let peer_id = *peer_id; + let addr = *addr; + + // TODO: move code bellow to happen only after identify message is exchange + if incoming { + dispatcher.push(P2pConnectionIncomingAction::Libp2pReceived { peer_id }); + } else { + dispatcher.push(P2pConnectionOutgoingAction::FinalizeSuccess { peer_id }); + } + + // for each negotiated yamux conenction open a new outgoing RPC stream + // TODO(akoptelov,vlad): should we do that? shouldn't upper layer decide when to open RPC streams? + // Also rpc streams are short-living -- they only persist for a single request-response (?) + let stream_id = YamuxStreamKind::Rpc.stream_id(incoming); + dispatcher.push(P2pNetworkYamuxAction::OpenStream { + addr, + stream_id, + stream_kind: StreamKind::Rpc(RpcAlgorithm::Rpc0_0_1), + }); + dispatcher.push(P2pNetworkYamuxAction::OpenStream { + addr, + stream_id: stream_id + 2, + stream_kind: StreamKind::Broadcast(token::BroadcastAlgorithm::Meshsub1_1_0), + }); + + // TODO: open RPC and Kad connections only after identify reports support for it? + dispatcher.push(P2pIdentifyAction::NewRequest { peer_id, addr }); + + // Kademlia: if the connection is initiated by Kademlia request, notify that it is ready. + let kad_state: Option<&P2pNetworkKadState> = state.substate().ok(); + + if kad_state.map_or(false, |state| state.request(&peer_id).is_some()) { + dispatcher.push(P2pNetworkKadRequestAction::MuxReady { peer_id, addr }); } + Ok(()) } P2pNetworkSchedulerAction::Disconnect { addr, reason } => { - let Some(conn_state) = self.connections.get_mut(addr) else { - error!(meta.time(); "P2pNetworkSchedulerAction::Disconnect: connection {addr} does not exist"); - return; + let Some(conn_state) = scheduler_state.connections.get_mut(addr) else { + bug_condition!( + "`P2pNetworkSchedulerAction::Disconnect`: connection {addr} does not exist" + ); + return Ok(()); }; if conn_state.closed.is_some() { - error!(meta.time(); "P2pNetworkSchedulerAction::Disconnect: {addr} already disconnected"); - return; + bug_condition!( + "`P2pNetworkSchedulerAction::Disconnect`: {addr} already disconnected" + ); + return Ok(()); } conn_state.closed = Some(reason.clone().into()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(P2pNetworkSchedulerEffectfulAction::Disconnect { + addr: *addr, + reason: reason.clone(), + }); + Ok(()) } P2pNetworkSchedulerAction::Error { addr, error } => { - let Some(conn_state) = self.connections.get_mut(addr) else { - error!(meta.time(); "P2pNetworkSchedulerAction::Disconnect: connection {addr} does not exist"); - return; + let Some(conn_state) = scheduler_state.connections.get_mut(addr) else { + bug_condition!( + "`P2pNetworkSchedulerAction::Error`: connection {addr} does not exist" + ); + return Ok(()); }; if conn_state.closed.is_some() { - error!(meta.time(); "P2pNetworkSchedulerAction::Disconnect: {addr} already disconnected"); - return; + bug_condition!( + "`P2pNetworkSchedulerAction::Error`: {addr} already disconnected" + ); + return Ok(()); } conn_state.closed = Some(error.clone().into()); + + let dispatcher = state_context.into_dispatcher(); + dispatcher.push(P2pNetworkSchedulerEffectfulAction::Error { + addr: *addr, + error: error.clone(), + }); + Ok(()) } - P2pNetworkSchedulerAction::Disconnected { addr, .. } => { - let Some(cn) = self.connections.get_mut(addr) else { - error!(meta.time(); "P2pNetworkSchedulerAction::Disconnected: connection {addr} does not exist"); - return; + P2pNetworkSchedulerAction::Disconnected { addr, reason } => { + let Some(cn) = scheduler_state.connections.get_mut(addr) else { + bug_condition!( + "P2pNetworkSchedulerAction::Disconnected: connection {addr} does not exist" + ); + return Ok(()); }; if cn.closed.is_none() { - error!(meta.time(); "P2pNetworkSchedulerAction::Disconnect: {addr} is not disconnecting"); + bug_condition!( + "P2pNetworkSchedulerAction::Disconnect: {addr} is not disconnecting" + ); + } + + let incoming = cn.incoming; + let (dispatcher, state) = state_context.into_dispatcher_and_state(); + let state: &P2pState = state.substate()?; + + let peer_with_state = state.peer_with_connection(*addr); + dispatcher.push(P2pNetworkSchedulerAction::Prune { addr: *addr }); + + if reason.is_disconnected() { + // statemachine behaviour should continue with this, i.e. dispatch P2pDisconnectionAction::Finish + return Ok(()); } + + match peer_with_state { + Some((peer_id, peer_state)) => { + // TODO: connection state type should tell if it is finalized + match &peer_state.status { + P2pPeerStatus::Connecting( + crate::connection::P2pConnectionState::Incoming(_), + ) => { + dispatcher.push(P2pConnectionIncomingAction::FinalizeError { + peer_id, + error: reason.to_string(), + }); + } + P2pPeerStatus::Connecting( + crate::connection::P2pConnectionState::Outgoing(_), + ) => { + dispatcher.push(P2pConnectionOutgoingAction::FinalizeError { + peer_id, + error: reason.to_string(), + }); + } + P2pPeerStatus::Disconnected { .. } => { + // sanity check, should be incoming connection + if !incoming { + error!(meta.time(); "disconnected peer connection for address {addr}"); + } else { + // TODO: introduce action for incoming connection finalization without peer_id + } + } + P2pPeerStatus::Ready(_) => { + dispatcher.push(P2pDisconnectionAction::Finish { peer_id }); + } + } + dispatcher.push(P2pNetworkSchedulerAction::PruneStreams { peer_id }); + } + None => { + // sanity check, should be incoming connection + if !incoming { + // TODO: error!(meta.time(); "non-existing peer connection for address {addr}"); + } else { + // TODO: introduce action for incoming connection finalization without peer_id + } + } + } + Ok(()) } P2pNetworkSchedulerAction::Prune { addr } => { - let _ = self.connections.remove(addr); + let _ = scheduler_state.connections.remove(addr); + Ok(()) } P2pNetworkSchedulerAction::PruneStreams { peer_id } => { - self.prune_peer_state(peer_id); + scheduler_state.prune_peer_state(peer_id); + Ok(()) } P2pNetworkSchedulerAction::PruneStream { peer_id, stream_id } => { - let Some((_, conn_state)) = self + let Some((_, conn_state)) = scheduler_state .connections .iter_mut() .find(|(_, conn_state)| conn_state.peer_id() == Some(peer_id)) else { - error!(meta.time(); "PruneStream: peer {peer_id} not found"); - return; + bug_condition!("PruneStream: peer {peer_id} not found"); + return Ok(()); }; if conn_state.streams.remove(stream_id).is_none() { - error!(meta.time(); "PruneStream: peer {peer_id} does not have stream {stream_id}"); + bug_condition!("PruneStream: peer {peer_id} does not have stream {stream_id}"); } + + Ok(()) } } } + + fn reducer_select_done( + &mut self, + addr: ConnectionAddr, + kind: SelectKind, + protocol: Option, + incoming: bool, + expected_peer_id: Option, + ) { + let Some(connection) = self.connections.get_mut(&addr) else { + bug_condition!("Missing connection state for `P2pNetworkSchedulerAction::SelectDone`"); + return; + }; + + match protocol { + Some(token::Protocol::Auth(token::AuthKind::Noise)) => { + connection.auth = Some(P2pNetworkAuthState::Noise(P2pNetworkNoiseState::new( + self.local_pk.clone(), + expected_peer_id, + ))); + } + Some(token::Protocol::Mux( + token::MuxKind::Yamux1_0_0 | token::MuxKind::YamuxNoNewLine1_0_0, + )) => { + connection.mux = Some(P2pNetworkConnectionMuxState::Yamux(P2pNetworkYamuxState { + init: true, + ..Default::default() + })); + } + Some(token::Protocol::Stream(stream_kind)) => { + let SelectKind::Stream(peer_id, stream_id) = kind else { + bug_condition!( + "incorrect stream kind {kind:?} for protocol stream: {stream_kind:?}" + ); + return; + }; + match stream_kind { + token::StreamKind::Rpc(_) => { + if incoming { + self.rpc_incoming_streams + .entry(peer_id) + .or_default() + .insert(stream_id, P2pNetworkRpcState::new(addr, stream_id)); + } else { + self.rpc_outgoing_streams + .entry(peer_id) + .or_default() + .insert(stream_id, P2pNetworkRpcState::new(addr, stream_id)); + } + } + token::StreamKind::Broadcast(_) => {} + token::StreamKind::Identify(_) => {} + token::StreamKind::Discovery(_) => {} + token::StreamKind::Ping(_) => {} + token::StreamKind::Bitswap(_) => {} + token::StreamKind::Status(_) => {} + } + } + None => {} + } + } + + fn forward_select_done( + dispatcher: &mut Dispatcher, + p2p_state: &P2pState, + protocol: Option, + addr: ConnectionAddr, + incoming: bool, + select_kind: SelectKind, + ) where + State: crate::P2pStateTrait, + Action: crate::P2pActionTrait, + { + match protocol { + Some(Protocol::Auth(AuthKind::Noise)) => { + dispatcher + .push(P2pNetworkSchedulerEffectfulAction::NoiseSelectDone { addr, incoming }); + } + Some(Protocol::Mux(MuxKind::Yamux1_0_0 | MuxKind::YamuxNoNewLine1_0_0)) => { + let SelectKind::Multiplexing(peer_id) = select_kind else { + bug_condition!("wrong kind for multiplexing protocol action: {select_kind:?}"); + return; + }; + let message_size_limit = p2p_state.config.limits.yamux_message_size(); + dispatcher.push(P2pNetworkSchedulerAction::YamuxDidInit { + addr, + peer_id, + message_size_limit, + }); + } + Some(Protocol::Stream(kind)) => { + let SelectKind::Stream(peer_id, stream_id) = select_kind else { + bug_condition!("wrong kind for stream protocol action: {kind:?}"); + return; + }; + match kind { + StreamKind::Status(_) + | StreamKind::Identify(IdentifyAlgorithm::IdentifyPush1_0_0) + | StreamKind::Bitswap(_) + | StreamKind::Ping(PingAlgorithm::Ping1_0_0) => { + //unimplemented!() + } + StreamKind::Identify(IdentifyAlgorithm::Identify1_0_0) => { + dispatcher.push(P2pNetworkIdentifyStreamAction::New { + addr, + peer_id, + stream_id, + incoming, + }); + } + + StreamKind::Broadcast(protocol) => { + dispatcher.push(P2pNetworkPubsubAction::NewStream { + incoming, + peer_id, + addr, + stream_id, + protocol, + }); + } + StreamKind::Discovery(DiscoveryAlgorithm::Kademlia1_0_0) => { + if let Some(discovery_state) = p2p_state.network.scheduler.discovery_state() + { + let request = !incoming && discovery_state.request(&peer_id).is_some(); + dispatcher.push(P2pNetworkKademliaStreamAction::New { + addr, + peer_id, + stream_id, + incoming, + }); + // if our node initiated a request to the peer, notify that the stream is ready. + if request { + dispatcher.push(P2pNetworkKadRequestAction::StreamReady { + peer_id, + addr, + stream_id, + }); + } + } + } + StreamKind::Rpc(RpcAlgorithm::Rpc0_0_1) => { + dispatcher.push(P2pNetworkRpcAction::Init { + addr, + peer_id, + stream_id, + incoming, + }); + } + } + } + None => { + match &select_kind { + SelectKind::Authentication => { + // TODO: close the connection + } + SelectKind::MultiplexingNoPeerId => { + bug_condition!("`SelectKind::MultiplexingNoPeerId` not handled"); + // WARNING: must not happen + } + SelectKind::Multiplexing(_) => { + // TODO: close the connection + } + SelectKind::Stream(peer_id, stream_id) => { + if let Some(discovery_state) = p2p_state.network.scheduler.discovery_state() + { + if let Some(P2pNetworkKadRequestState { + status: P2pNetworkKadRequestStatus::WaitingForKadStream(id), + .. + }) = discovery_state.request(peer_id) + { + if id == stream_id { + dispatcher.push(P2pNetworkKadRequestAction::Error { + peer_id: *peer_id, + error: "stream protocol is not negotiated".into(), + }); + } + } + } + } + } + } + } + } +} + +fn keep_connection_with_unknown_stream() -> bool { + static VAL: OnceLock = OnceLock::new(); + *VAL.get_or_init(|| { + std::env::var("KEEP_CONNECTION_WITH_UNKNOWN_STREAM") + .ok() + .and_then(|v| v.parse().ok()) + .unwrap_or(false) + }) } diff --git a/p2p/src/network/scheduler_effectful/mod.rs b/p2p/src/network/scheduler_effectful/mod.rs new file mode 100644 index 0000000000..de6e6878fd --- /dev/null +++ b/p2p/src/network/scheduler_effectful/mod.rs @@ -0,0 +1,5 @@ +mod p2p_network_scheduler_effectful_actions; +pub use self::p2p_network_scheduler_effectful_actions::*; + +#[cfg(feature = "p2p-libp2p")] +mod p2p_network_scheduler_effectful_effects; diff --git a/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_actions.rs b/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_actions.rs new file mode 100644 index 0000000000..8d6d82becd --- /dev/null +++ b/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_actions.rs @@ -0,0 +1,74 @@ +use std::net::{IpAddr, SocketAddr}; + +use openmina_core::ActionEvent; +use serde::{Deserialize, Serialize}; + +use crate::{ + disconnection::P2pDisconnectionReason, select::SelectKind, ConnectionAddr, + P2pNetworkConnectionError, P2pState, +}; + +#[derive(Serialize, Deserialize, Debug, Clone, ActionEvent)] +#[action_event(fields(display(ip), display(listener), display(addr), debug(result), select_kind = debug(kind), display(error)))] +pub enum P2pNetworkSchedulerEffectfulAction { + InterfaceDetected { + ip: IpAddr, + port: u16, + }, + IncomingConnectionIsReady { + listener: SocketAddr, + }, + #[action_event(fields(debug(addr), debug(result)))] + IncomingDidAccept { + addr: ConnectionAddr, + result: Result<(), String>, + }, + /// Initialize outgoing connection. + OutgoingConnect { + addr: SocketAddr, + }, + /// Outgoing TCP stream is established. + OutgoingDidConnect { + addr: ConnectionAddr, + }, + IncomingDataIsReady { + addr: ConnectionAddr, + limit: usize, + }, + NoiseSelectDone { + addr: ConnectionAddr, + incoming: bool, + }, + SelectError { + addr: ConnectionAddr, + kind: SelectKind, + error: String, + }, + /// Action that initiate the specified peer disconnection. + Disconnect { + /// Connection address. + addr: ConnectionAddr, + /// Reason why disconnection is triggered. + reason: P2pDisconnectionReason, + }, + + /// Fatal connection error. + Error { + /// Connection address. + addr: ConnectionAddr, + /// Reason why disconnection is triggered. + error: P2pNetworkConnectionError, + }, +} + +impl From for crate::P2pAction { + fn from(value: P2pNetworkSchedulerEffectfulAction) -> Self { + crate::P2pAction::Network(value.into()) + } +} + +impl redux::EnablingCondition for P2pNetworkSchedulerEffectfulAction { + fn is_enabled(&self, _state: &P2pState, _time: redux::Timestamp) -> bool { + true + } +} diff --git a/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_effects.rs b/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_effects.rs new file mode 100644 index 0000000000..3189bc7cea --- /dev/null +++ b/p2p/src/network/scheduler_effectful/p2p_network_scheduler_effectful_effects.rs @@ -0,0 +1,82 @@ +use redux::ActionMeta; +use std::net::SocketAddr; + +use crate::{MioCmd, P2pCryptoService, P2pMioService}; + +use super::{super::*, *}; + +impl P2pNetworkSchedulerEffectfulAction { + pub fn effects(self, _meta: &ActionMeta, store: &mut Store) + where + Store: crate::P2pStore, + Store::Service: P2pMioService + P2pCryptoService, + { + match self { + P2pNetworkSchedulerEffectfulAction::InterfaceDetected { ip, port } => { + store + .service() + .send_mio_cmd(MioCmd::ListenOn(SocketAddr::new(ip, port))); + } + P2pNetworkSchedulerEffectfulAction::IncomingConnectionIsReady { listener, .. } => { + let state = store.state(); + if state.network.scheduler.connections.len() + >= state.config.limits.max_connections() + { + store.service().send_mio_cmd(MioCmd::Refuse(listener)); + } else { + store.service().send_mio_cmd(MioCmd::Accept(listener)); + } + } + P2pNetworkSchedulerEffectfulAction::IncomingDidAccept { addr, .. } => { + let nonce = store.service().generate_random_nonce(); + store.dispatch(P2pNetworkPnetAction::SetupNonce { + addr, + nonce: nonce.to_vec().into(), + incoming: true, + }); + } + P2pNetworkSchedulerEffectfulAction::OutgoingConnect { addr } => { + store.service().send_mio_cmd(MioCmd::Connect(addr)); + } + P2pNetworkSchedulerEffectfulAction::OutgoingDidConnect { addr } => { + let nonce = store.service().generate_random_nonce(); + store.dispatch(P2pNetworkPnetAction::SetupNonce { + addr, + nonce: nonce.to_vec().into(), + incoming: false, + }); + } + P2pNetworkSchedulerEffectfulAction::IncomingDataIsReady { addr, limit } => { + store + .service() + .send_mio_cmd(MioCmd::Recv(addr, vec![0; limit].into_boxed_slice())); + } + P2pNetworkSchedulerEffectfulAction::NoiseSelectDone { addr, incoming } => { + let ephemeral_sk = Sk::from_random(store.service().ephemeral_sk()); + let static_sk = Sk::from_random(store.service().static_sk()); + let static_pk = static_sk.pk(); + + let signature = store.service().sign_key(static_pk.0.as_bytes()).into(); + + store.dispatch(P2pNetworkNoiseAction::Init { + addr, + incoming, + ephemeral_sk, + static_sk, + signature, + }); + } + // TODO: remove state access + P2pNetworkSchedulerEffectfulAction::SelectError { addr, .. } + | P2pNetworkSchedulerEffectfulAction::Disconnect { addr, .. } + | P2pNetworkSchedulerEffectfulAction::Error { addr, .. } => { + if let Some(conn_state) = store.state().network.scheduler.connections.get(&addr) { + if let Some(reason) = conn_state.closed.clone() { + store.service().send_mio_cmd(MioCmd::Disconnect(addr)); + store.dispatch(P2pNetworkSchedulerAction::Disconnected { addr, reason }); + } + } + } + } + } +} diff --git a/p2p/src/network/select/p2p_network_select_actions.rs b/p2p/src/network/select/p2p_network_select_actions.rs index 2aa75b0b93..e8579e5b49 100644 --- a/p2p/src/network/select/p2p_network_select_actions.rs +++ b/p2p/src/network/select/p2p_network_select_actions.rs @@ -183,7 +183,17 @@ impl From for crate::P2pAction { } } impl redux::EnablingCondition for P2pNetworkSelectAction { - fn is_enabled(&self, _state: &P2pState, _time: redux::Timestamp) -> bool { + fn is_enabled(&self, state: &P2pState, _time: redux::Timestamp) -> bool { + if state + .network + .scheduler + .connection_state(self.addr()) + .and_then(|conn| conn.select_state(&self.select_kind())) + .is_none() + { + return false; + } + match self { Self::Init { .. } => true, Self::IncomingDataAuth { .. } => true, diff --git a/p2p/testing/src/redux.rs b/p2p/testing/src/redux.rs index 654073d9f1..73a158cf74 100644 --- a/p2p/testing/src/redux.rs +++ b/p2p/testing/src/redux.rs @@ -12,8 +12,9 @@ use openmina_core::{ use p2p::{ bootstrap::P2pNetworkKadBootstrapState, channels::{ - rpc::P2pChannelsRpcAction, snark::P2pChannelsSnarkAction, - transaction::P2pChannelsTransactionAction, + best_tip::P2pChannelsBestTipAction, rpc::P2pChannelsRpcAction, + snark::P2pChannelsSnarkAction, snark_job_commitment::P2pChannelsSnarkJobCommitmentAction, + streaming_rpc::P2pChannelsStreamingRpcAction, transaction::P2pChannelsTransactionAction, }, connection::outgoing::P2pConnectionOutgoingAction, disconnection::P2pDisconnectionAction, @@ -25,7 +26,7 @@ use p2p::{ peer::P2pPeerAction, MioEvent, P2pAction, P2pEvent, P2pNetworkKadBootstrapAction, P2pNetworkKadRequestAction, P2pNetworkKademliaAction, P2pNetworkKademliaStreamAction, P2pNetworkSchedulerAction, - P2pNetworkYamuxAction, P2pState, P2pStateTrait, PeerId, + P2pNetworkSchedulerEffectfulAction, P2pNetworkYamuxAction, P2pState, P2pStateTrait, PeerId, }; use redux::{ActionMeta, EnablingCondition, SubStore}; @@ -186,7 +187,7 @@ pub(super) fn event_effect(store: &mut crate::redux::Store, event: P2pEvent) -> ), MioEvent::IncomingConnectionIsReady { listener } => SubStore::dispatch( store, - P2pNetworkSchedulerAction::IncomingConnectionIsReady { listener }, + P2pNetworkSchedulerEffectfulAction::IncomingConnectionIsReady { listener }, ), MioEvent::IncomingConnectionDidAccept(addr, result) => SubStore::dispatch( store, @@ -264,5 +265,10 @@ impl_from_p2p!(P2pChannelsSnarkAction); impl_from_p2p!(p2p::P2pNetworkRpcAction); impl_from_p2p!(P2pChannelsRpcAction); impl_from_p2p!(P2pDisconnectionAction); +impl_from_p2p!(p2p::P2pNetworkSchedulerEffectfulAction); +impl_from_p2p!(p2p::P2pNetworkPnetEffectfulAction); +impl_from_p2p!(P2pChannelsBestTipAction); +impl_from_p2p!(P2pChannelsSnarkJobCommitmentAction); +impl_from_p2p!(P2pChannelsStreamingRpcAction); impl p2p::P2pActionTrait for Action {}