diff --git a/.circleci/config.yml b/.circleci/config.yml index 94ce882b3..214db73f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: - run: sudo apt-get update && sudo apt-get install python3-pip && sudo pip3 install codespell - run: name: CodeSpell Checking - command: codespell --version && codespell -S=node_modules,dist,packages,.git,./src/assets,*mock-data,*terms-txt.ts,*yarn.lock,*package.json -L=datas,sortings,Ether,iif,inflight --ignore-regex "\W\'data\:image\/.*" + command: codespell --version && codespell -S=node_modules,dist,packages,.git,./src/assets,*mock-data,*terms-txt.ts,*yarn.lock,*package.json -L=datas,sortings,Ether,iif,inflight,forin --ignore-regex "\W\'data\:image\/.*" no_output_timeout: 2m - run: name: Lint Codebase diff --git a/package.json b/package.json index 03d0233e8..1f7ba69a0 100644 --- a/package.json +++ b/package.json @@ -189,7 +189,7 @@ "@ngx-gallery/gallerize": "^5.0.0-beta.0", "@ngx-gallery/lightbox": "^5.0.0-beta.0", "@ngxs/store": "^3.6.0", - "@zasmilingidiot/particl-marketplace": "0.3.12", + "@zasmilingidiot/particl-marketplace": "0.3.13", "@zasmilingidiot/particl-zmq": "1.0.7", "adm-zip": "^0.5.9", "ajv": "^8.11.0", diff --git a/src/app/main-core-config/settings-pages/network/network.component.ts b/src/app/main-core-config/settings-pages/network/network.component.ts index 7e4873ea4..3524f2308 100644 --- a/src/app/main-core-config/settings-pages/network/network.component.ts +++ b/src/app/main-core-config/settings-pages/network/network.component.ts @@ -46,7 +46,7 @@ export class NetworkComponent implements OnInit, OnDestroy { private destroy$: Subject = new Subject(); - private allowEditingNetwork: boolean = false; + private allowMainNetwork: boolean = false; private controlNetworkPrefix: NetworkPrefix = ''; @@ -59,7 +59,7 @@ export class NetworkComponent implements OnInit, OnDestroy { ngOnInit(): void { - this.allowEditingNetwork = !this._store.selectSnapshot(ApplicationConfigState).requestedTestingNetworks; + this.allowMainNetwork = !this._store.selectSnapshot(ApplicationConfigState).requestedTestingNetworks; const settings$ = this._coreConfigService.getSettings().pipe( filter(settings => settings !== null), @@ -131,27 +131,27 @@ export class NetworkComponent implements OnInit, OnDestroy { private loadSettings(settings: Settings): void { let selectedNetwork: NetworkPrefixType = ''; - if (this.allowEditingNetwork) { - if (settings[Controls.network_main] || settings[Controls.network_test] || settings[Controls.network_regtest]) { - switch (true) { - case settings[Controls.network_main] && settings[Controls.network_main].value: selectedNetwork = 'mainnet'; break; - case settings[Controls.network_test] && settings[Controls.network_test].value: selectedNetwork = 'testnet'; break; - case settings[Controls.network_regtest] && settings[Controls.network_regtest].value: selectedNetwork = 'regtest'; break; - } + if (settings[Controls.network_main] || settings[Controls.network_test] || settings[Controls.network_regtest]) { + switch (true) { + case this.allowMainNetwork && settings[Controls.network_main] && settings[Controls.network_main].value: + selectedNetwork = 'mainnet'; + this.networkLabel = TextContent.NETWORK_LABEL_MAINNET; + break; + case settings[Controls.network_test] && settings[Controls.network_test].value: + selectedNetwork = 'testnet'; + this.networkLabel = TextContent.NETWORK_LABEL_TESTNET; + break; + case settings[Controls.network_regtest] && settings[Controls.network_regtest].value: + selectedNetwork = 'regtest'; + this.networkLabel = TextContent.NETWORK_LABEL_REGTEST; + break; + default: + this.networkLabel = ''; } - } else { - selectedNetwork = 'testnet'; } this.controlNetworkPrefix = selectedNetwork.length > 0 ? `${selectedNetwork}.` : ''; - switch (selectedNetwork) { - case 'mainnet': this.networkLabel = TextContent.NETWORK_LABEL_MAINNET; break; - case 'testnet': this.networkLabel = TextContent.NETWORK_LABEL_TESTNET; break; - case 'regtest': this.networkLabel = TextContent.NETWORK_LABEL_REGTEST; break; - default: this.networkLabel = ''; - } - for (const field of [Controls.rpcIP, Controls.rpcPort, Controls.zmqIP, Controls.zmqPort]) { const fieldName = `${this.controlNetworkPrefix}${field}`; diff --git a/src/app/main-core-config/settings-pages/startup/startup.component.html b/src/app/main-core-config/settings-pages/startup/startup.component.html index 3f136ba7b..333413e5b 100644 --- a/src/app/main-core-config/settings-pages/startup/startup.component.html +++ b/src/app/main-core-config/settings-pages/startup/startup.component.html @@ -44,14 +44,14 @@

Allows for selecting which network to connect to when starting a new Particl Core node.

Note that this selection only applies when starting a new Particl Core node. If Particl Core is already running, it will need to be stopped or disconnected from, and a new node started afterwards, in order to to take effect.

-

This is currently disabled since the application has been forced into a testing state, in which case the relevant testing network will be enforced (this helps to ensure that testing builds do not result in real funds being used).

-

This should only typically be changed away from the main network when wanting to test functionality!

+

The main network is currently disabled since the application has been forced into a testing state, in which case the relevant testing network will be enforced (this helps to ensure that testing builds do not result in real funds being used).

+

This should only typically be changed away from the main network when wanting to test functionality!

-
Main
 +
Main
Test
RegTest
 diff --git a/src/app/main-core-config/settings-pages/startup/startup.component.ts b/src/app/main-core-config/settings-pages/startup/startup.component.ts index f8b316985..f89366595 100644 --- a/src/app/main-core-config/settings-pages/startup/startup.component.ts +++ b/src/app/main-core-config/settings-pages/startup/startup.component.ts @@ -37,7 +37,7 @@ export class StartupComponent implements OnInit, OnDestroy { controlNetwork: FormControl = new FormControl({ value: '', disabled: true}); controlDataDir: FormControl = new FormControl({ value: '', disabled: true}); - allowEditingNetwork: boolean = false; + allowMainNetwork: boolean = false; private destroy$: Subject = new Subject(); @@ -52,7 +52,7 @@ export class StartupComponent implements OnInit, OnDestroy { ngOnInit(): void { - this.allowEditingNetwork = !this._store.selectSnapshot(ApplicationConfigState).requestedTestingNetworks; + this.allowMainNetwork = !this._store.selectSnapshot(ApplicationConfigState).requestedTestingNetworks; const settings$ = this._coreConfigService.getSettings().pipe( filter(settings => settings !== null), @@ -98,7 +98,11 @@ export class StartupComponent implements OnInit, OnDestroy { [Controls.network_regtest]: false, }; switch (value) { - case 'main': updatedValue[Controls.network_main] = true; break; + case 'main': + if (this.allowMainNetwork) { + updatedValue[Controls.network_main] = true; + } + break; case 'test': updatedValue[Controls.network_test] = true; break; case 'regtest': updatedValue[Controls.network_regtest] = true; break; } @@ -187,22 +191,18 @@ export class StartupComponent implements OnInit, OnDestroy { this.controlStartNew.enable({emitEvent: false}); } - let networkSelection = 'main'; - if (!this.allowEditingNetwork) { - networkSelection = 'test'; - } else { - if (settings[Controls.network_main] || settings[Controls.network_test] || settings[Controls.network_regtest]) { - switch (true) { - case settings[Controls.network_main] && settings[Controls.network_main].value: networkSelection = 'main'; break; - case settings[Controls.network_test] && settings[Controls.network_test].value: networkSelection = 'test'; break; - case settings[Controls.network_regtest] && settings[Controls.network_regtest].value: networkSelection = 'regtest'; break; - } + let networkSelection = this.allowMainNetwork ? 'main' : 'test'; + + if (settings[Controls.network_main] || settings[Controls.network_test] || settings[Controls.network_regtest]) { + switch (true) { + case this.allowMainNetwork && settings[Controls.network_main] && settings[Controls.network_main].value: networkSelection = 'main'; break; + case settings[Controls.network_test] && settings[Controls.network_test].value: networkSelection = 'test'; break; + case settings[Controls.network_regtest] && settings[Controls.network_regtest].value: networkSelection = 'regtest'; break; } } + this.controlNetwork.setValue(networkSelection, {onlySelf: true, emitEvent: false}); - if (this.allowEditingNetwork) { - this.controlNetwork.enable({emitEvent: false}); - } + this.controlNetwork.enable({emitEvent: false}); if (settings[Controls.datadir]) { this.controlDataDir.setValue(settings[Controls.datadir].value, {onlySelf: true, emitEvent: false}); diff --git a/src/app/main-market/base/market-base.component.html b/src/app/main-market/base/market-base.component.html index aedb3b6ab..cc2598f5b 100644 --- a/src/app/main-market/base/market-base.component.html +++ b/src/app/main-market/base/market-base.component.html @@ -66,12 +66,12 @@ - -
- + +
+ Wallet is currently locked diff --git a/src/app/main-market/base/market-base.component.ts b/src/app/main-market/base/market-base.component.ts index eca05d8df..96dbb3d2a 100644 --- a/src/app/main-market/base/market-base.component.ts +++ b/src/app/main-market/base/market-base.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { MatDialog, MatExpansionPanel } from '@angular/material'; import { Subject, Observable, iif, defer, of, merge, combineLatest } from 'rxjs'; -import { takeUntil, tap, map, startWith, finalize, concatMap, mapTo, catchError } from 'rxjs/operators'; +import { takeUntil, tap, map, startWith, finalize, concatMap, mapTo, catchError, take } from 'rxjs/operators'; import { Store, Select } from '@ngxs/store'; import { MarketState } from '../store/market.state'; @@ -264,6 +264,10 @@ export class MarketBaseComponent implements OnInit, OnDestroy { ).subscribe(); } + openWalletUnlockModal() { + this._unlocker.changeCurrentStatus().pipe(take(1), takeUntil(this.destroy$)).subscribe(); + } + identitySelected(identity: RenderedIdentity) { diff --git a/src/app/main-market/store/market.state.ts b/src/app/main-market/store/market.state.ts index c8c5c3626..b1bc0f55b 100644 --- a/src/app/main-market/store/market.state.ts +++ b/src/app/main-market/store/market.state.ts @@ -1,7 +1,7 @@ import { of, defer, iif, timer, throwError, merge } from 'rxjs'; import { tap, catchError, concatMap, retryWhen, map, mapTo } from 'rxjs/operators'; -import { State, StateToken, Action, StateContext, Selector, createSelector } from '@ngxs/store'; +import { State, StateToken, Action, StateContext, Selector, createSelector, Store } from '@ngxs/store'; import { patch, updateItem, removeItem, iif as nxgsIif } from '@ngxs/store/operators'; import { Particl } from 'app/networks/networks.module'; import { MarketStateActions, MarketUserActions } from './market.actions'; @@ -18,6 +18,7 @@ import { MarketNotifications, ChatNotifications, IPCResponses } from './market.models'; import { ChatChannelType } from '../services/chats/chats.models'; +import { WalletInfoStateModel } from 'app/networks/particl/particl.models'; const MARKET_STATE_TOKEN = new StateToken('market'); @@ -191,6 +192,7 @@ export class MarketState { private _marketService: MarketRpcService, private _socketService: MarketSocketService, private _backendService: BackendService, + private _store: Store, ) {} @@ -433,7 +435,7 @@ export class MarketState { } } - // Selected identity is not in the list returned, or there is no selected identity + // Selected identity is not in the list returned, or there is no selected identity: attempt the default identity const savedID = ctx.getState().settings.defaultIdentityID; if (savedID) { @@ -443,11 +445,20 @@ export class MarketState { } } - // No valid current identity and no saved identity... get first identity from list + // No valid current identity and no saved identity... check if the current selected particl wallet is a valid identity + const activeParticlWalletInfo = this._store.selectSnapshot(Particl.State.Wallet.Info); + const current = identities.find(identity => identity.name === activeParticlWalletInfo.walletname); + if (current) { + return ctx.dispatch(new MarketStateActions.SetCurrentIdentity(current)); + } + + // welp, nothing else worked: use first identity found from the marketplace (if it has any) const selected = JSON.parse(JSON.stringify(identities)).sort((a: Identity, b: Identity) => a.id - b.id)[0]; if (selected) { return ctx.dispatch(new MarketStateActions.SetCurrentIdentity(selected)); } + + // now bail... the null identity is the chosen one }) ); } diff --git a/src/app/main-wallet/shared/transaction-table/transaction-table.component.html b/src/app/main-wallet/shared/transaction-table/transaction-table.component.html index 31df961af..6137248c4 100644 --- a/src/app/main-wallet/shared/transaction-table/transaction-table.component.html +++ b/src/app/main-wallet/shared/transaction-table/transaction-table.component.html @@ -218,7 +218,7 @@
- diff --git a/src/app/networks/particl/particl.state.ts b/src/app/networks/particl/particl.state.ts index 7d34f14d9..be05128bb 100644 --- a/src/app/networks/particl/particl.state.ts +++ b/src/app/networks/particl/particl.state.ts @@ -349,7 +349,11 @@ export class ParticlZMQState { })); if (message.channel === 'hashblock') { - return ctx.dispatch(new ParticlActions.WalletActions.RefreshBalances); + return ctx.dispatch([ + new ParticlActions.WalletActions.RefreshBalances(), + new ParticlActions.WalletActions.RefreshWalletInfo(), + new ParticlActions.WalletActions.UpdateColdStakingInfo(), + ]); } } } @@ -761,8 +765,18 @@ export class WalletInfoState { } + @Action(ParticlInternalActions.WalletActions.WalletLoaded) + initializeWalletBalances( + ctx: StateContext, + { walletName }: ParticlInternalActions.WalletActions.WalletLoaded + ) { + return this._walletService.setSmsgActiveWallet(walletName); + } + + private updateWalletInfo( - ctx: StateContext, newWalletLoaded: boolean = false + ctx: StateContext, + newWalletLoaded: boolean = false ): Observable { return this._walletService.getWalletInfo(1).pipe( tap((info) => { @@ -961,14 +975,7 @@ export class WalletBalanceState { if (resKey in currentState) { if (!result[resKey].length) { updatedValues[resKey] = []; - } else if ( - (currentState[resKey].length !== result[resKey].length) || - (xorWith( - currentState[resKey], - result[resKey], - (val, otherVal) => (val.txid === otherVal.txid) && (val.vout === otherVal.vout) - ).length > 0) - ) { + } else { updatedValues[resKey] = result[resKey]; } } diff --git a/yarn.lock b/yarn.lock index a3e320046..539b3d372 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1805,10 +1805,10 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -"@zasmilingidiot/omp-lib@0.1.155": - version "0.1.155" - resolved "https://registry.yarnpkg.com/@zasmilingidiot/omp-lib/-/omp-lib-0.1.155.tgz#6a7e6c13b22203103cae23169f681cb2abccd990" - integrity sha512-NviSRimOtB90xP8FIh9/3l3SI54QvhdrDVaaZAEnvtxnJ/MtUpLok4Af8uKg5IUdwFLWkf6lyevDBt4UypOmsw== +"@zasmilingidiot/omp-lib@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@zasmilingidiot/omp-lib/-/omp-lib-0.2.0.tgz#d57a1e767a49f7eda294bd9c210986a1595fb7d0" + integrity sha512-GJCYdFXNZ2mYt4RADF70RiDdUq+3snB84jP/Ig5Dzy00HK8ybeLSIpd1qYxIP3s0O490O4ELDwhtU+yMkcODlA== dependencies: inversify "^4.13.0" js-sha256 "^0.9.0" @@ -1822,12 +1822,12 @@ tslib "^1.9.3" web-request "^1.0.7" -"@zasmilingidiot/particl-marketplace@0.3.12": - version "0.3.12" - resolved "https://registry.yarnpkg.com/@zasmilingidiot/particl-marketplace/-/particl-marketplace-0.3.12.tgz#f98bdc78b7b59bfecbc7e934f15f5c9062ad0ab3" - integrity sha512-UBkq4ITIXJxiCjhuO96MXoGXnbpB79B11wfOr+OMMQmv9GRvGVHApo7QxBuc+HpZ8vKOMjt5JmmmkJOCMmf+bw== +"@zasmilingidiot/particl-marketplace@0.3.13": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@zasmilingidiot/particl-marketplace/-/particl-marketplace-0.3.13.tgz#f4a42b4b70df1507a6c7eed2b62b63d6f654a596" + integrity sha512-jsk0DsuCWQA+3VipWtUAJOR94LhLUz7GQjMSU0RYXP3jokqNSVLniDVsx/dT2tpFUyTEUJVAcLCCI/O68obp1g== dependencies: - "@zasmilingidiot/omp-lib" "0.1.155" + "@zasmilingidiot/omp-lib" "0.2.0" "@zasmilingidiot/particl-zmq" "1.0.7" basic-auth "^2.0.0" body-parser "^1.20.0" @@ -9756,15 +9756,7 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -plist@^3.0.1: - version "3.0.5" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" - integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA== - dependencies: - base64-js "^1.5.1" - xmlbuilder "^9.0.7" - -plist@^3.0.4: +plist@^3.0.1, plist@^3.0.4: version "3.0.5" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==