From 27033eaef4edc8dc962d33000cfc34b242ed5c5f Mon Sep 17 00:00:00 2001 From: Lazy Nina Date: Thu, 29 Feb 2024 10:02:36 -0500 Subject: [PATCH 1/4] Devnet deployment config --- Caddyfile | 1 + src/environments/environment.prod.ts | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Caddyfile b/Caddyfile index d79ca3b6..81975a3c 100644 --- a/Caddyfile +++ b/Caddyfile @@ -30,6 +30,7 @@ header @html Content-Security-Policy " connect-src 'self' media.deso.org node.deso.org + *.deso.run amp.deso.org bithunt.deso.org bitclout.com:* diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 96c62bef..9c50ad95 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,9 +1,9 @@ export const environment = { production: true, - uploadImageHostname: 'node.deso.org', - verificationEndpointHostname: 'https://node.deso.org', + uploadImageHostname: 'devnet-0.deso.run', + verificationEndpointHostname: 'https://devnet-0.deso.run', uploadVideoHostname: 'media.deso.org', - identityURL: 'https://identity.deso.org', + identityURL: 'https://identity.deso.run', supportEmail: '', dd: { apiKey: 'DCEB26AC8BF47F1D7B4D87440EDCA6', From d19b8ccbc97db0f2850106a49058e4852d67a298 Mon Sep 17 00:00:00 2001 From: Lazy Nina Date: Thu, 11 Apr 2024 21:07:25 -0400 Subject: [PATCH 2/4] Add remote node connections to admin panel --- .../network-info/network-info.component.html | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/app/network-info/network-info.component.html b/src/app/network-info/network-info.component.html index a44918e8..8f57b668 100644 --- a/src/app/network-info/network-info.component.html +++ b/src/app/network-info/network-info.component.html @@ -211,6 +211,27 @@ DeSo Node Info +
+ Remote Node Connections + + + + + + + + + + + + +
IPStatusValidator Info
{{ connection.PeerResponse.IP + ':' + connection.PeerResponse.ProtocolPort }} + + {{ connection.RemoteNodeStatus }} + + {{ connection?.ValidatorResponse?.ValidatorPublicKeyBase58Check }} +
+
Updating DeSo peers...
From 9726b4f847eace0bbc7b7606851475ef5a2216c6 Mon Sep 17 00:00:00 2001 From: iamsofonias Date: Mon, 17 Jun 2024 15:00:36 -0400 Subject: [PATCH 3/4] Revert env changes --- src/environments/environment.prod.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 9c50ad95..96c62bef 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,9 +1,9 @@ export const environment = { production: true, - uploadImageHostname: 'devnet-0.deso.run', - verificationEndpointHostname: 'https://devnet-0.deso.run', + uploadImageHostname: 'node.deso.org', + verificationEndpointHostname: 'https://node.deso.org', uploadVideoHostname: 'media.deso.org', - identityURL: 'https://identity.deso.run', + identityURL: 'https://identity.deso.org', supportEmail: '', dd: { apiKey: 'DCEB26AC8BF47F1D7B4D87440EDCA6', From 2939a1b6749f2a32c4895e9ad2bbe200b2bc989e Mon Sep 17 00:00:00 2001 From: Lazy Nina <81658138+lazynina@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:27:17 -0400 Subject: [PATCH 4/4] Testnet deployment config (#651) * Add remote node connections to admin panel * Testnet deployment config * Revert prod environment changes * Fix merge --------- Co-authored-by: iamsofonias --- Dockerfile | 2 +- package-lock.json | 42 +++++++++++++++++++ ...ransfer-lockup-dao-coin-modal.component.ts | 1 + .../unlock-dao-coin-modal.component.ts | 1 + .../network-info/network-info.component.html | 37 +++++++++++----- .../network-info/network-info.component.ts | 9 ++++ 6 files changed, 81 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2fa82a1b..e3d6991e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ COPY ./src/environments/environment.$environment.ts ./src/environments/environme RUN npm run build_prod # build minified version of frontend, served using caddy -FROM caddy:2.3.0-alpine +FROM caddy:2.7.6-alpine WORKDIR /frontend diff --git a/package-lock.json b/package-lock.json index 00ee8ebc..023e84a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6642,6 +6642,15 @@ "node": ">=8" } }, + "node_modules/bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, "node_modules/bl": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz", @@ -12168,6 +12177,12 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "node_modules/fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -16774,6 +16789,12 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "node_modules/nan": { + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", + "optional": true + }, "node_modules/nano-json-stream-parser": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz", @@ -33239,6 +33260,15 @@ "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "devOptional": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bl": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz", @@ -37590,6 +37620,12 @@ } } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -41194,6 +41230,12 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "nan": { + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", + "optional": true + }, "nano-json-stream-parser": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz", diff --git a/src/app/dao-coins/transfer-lockup-dao-coin-modal/transfer-lockup-dao-coin-modal.component.ts b/src/app/dao-coins/transfer-lockup-dao-coin-modal/transfer-lockup-dao-coin-modal.component.ts index a3304233..e7dfd403 100644 --- a/src/app/dao-coins/transfer-lockup-dao-coin-modal/transfer-lockup-dao-coin-modal.component.ts +++ b/src/app/dao-coins/transfer-lockup-dao-coin-modal/transfer-lockup-dao-coin-modal.component.ts @@ -162,6 +162,7 @@ export class TransferLockupDaoCoinModalComponent { minute: '2-digit', hour12: false, }; + //@ts-ignore return new Intl.DateTimeFormat('default', options).format(date) } } diff --git a/src/app/dao-coins/unlock-dao-coin-modal/unlock-dao-coin-modal.component.ts b/src/app/dao-coins/unlock-dao-coin-modal/unlock-dao-coin-modal.component.ts index 53cf5706..36686b4a 100644 --- a/src/app/dao-coins/unlock-dao-coin-modal/unlock-dao-coin-modal.component.ts +++ b/src/app/dao-coins/unlock-dao-coin-modal/unlock-dao-coin-modal.component.ts @@ -81,6 +81,7 @@ export class UnlockDaoCoinModalComponent { minute: '2-digit', hour12: false, }; + // @ts-ignore return new Intl.DateTimeFormat('default', options).format(date) } } diff --git a/src/app/network-info/network-info.component.html b/src/app/network-info/network-info.component.html index 8f57b668..d94b7b9e 100644 --- a/src/app/network-info/network-info.component.html +++ b/src/app/network-info/network-info.component.html @@ -213,21 +213,38 @@
Remote Node Connections - +
- - - + + + - - - + + -
IPStatusValidator InfoIPStatusValidator Info
{{ connection.PeerResponse.IP + ':' + connection.PeerResponse.ProtocolPort }} +
+ {{ connection.PeerResponse ? connection.PeerResponse.IP + ':' + connection.PeerResponse.ProtocolPort : 'N/A' }} - {{ connection.RemoteNodeStatus }} + {{ connection.RemoteNodeStatus }} - {{ connection?.ValidatorResponse?.ValidatorPublicKeyBase58Check }} + + + + + {{ connection.ValidatorResponse.ValidatorPublicKeyBase58Check }} +
diff --git a/src/app/network-info/network-info.component.ts b/src/app/network-info/network-info.component.ts index cb17eb22..a47722a7 100644 --- a/src/app/network-info/network-info.component.ts +++ b/src/app/network-info/network-info.component.ts @@ -34,6 +34,7 @@ export class NetworkInfoComponent implements OnInit { updatingDeSoPeer = false; manualBitcoinPeer = ''; updatingBitcoinPeer = false; + pubKeyCopiedMap = {}; constructor( public globalVars: GlobalVarsService, @@ -324,4 +325,12 @@ export class NetworkInfoComponent implements OnInit { }, }); } + + _copyPublicKey(publicKey: string) { + this.globalVars._copyText(publicKey); + this.pubKeyCopiedMap[publicKey] = true; + setInterval(() => { + delete this.pubKeyCopiedMap[publicKey]; + }, 1000); + } }