Merge remote-tracking branch 'upstream/master'

Groestlcoin · May 20, 2024 · 9bcca53 · 9bcca53
2 parents 6051a5e + adb8071
commit 9bcca53
Show file tree

Hide file tree

Showing 18 changed files with 437 additions and 266 deletions.
diff --git a/CHANGELOG-API.md b/CHANGELOG-API.md
@@ -1,5 +1,10 @@
 This changelog specifically tracks changes to the Public API available at `/api` and is maintained separately from the app CHANGELOG such that it can properly adhere to semantic versioning.
 
+##### v2.1.0
+###### Unreleased
+
+* Changed `/api/mempool/fees` to include more details pertaining to `nextBlock` (nextBlock.smart is where the previous "nextBlock" scalar value used to be)
+
 ##### v2.0.0
 ###### 2023-06-14
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 ###### Unreleased
 
 * Tweak display of miner "notes" (disclaimer for Patoshi)
+* Fix for display of JSON-data content
 * Updated miner IDs (including removal of 3 probably false positives from the "Patoshi" list)
 * Updated dependencies
 

diff --git a/app/api/coreApi.js b/app/api/coreApi.js
@@ -2029,7 +2029,7 @@ function buildPredictedBlocks(statusId, statusFunc) {
 							feeRateGroup = Math.floor(feeRateGroup / 5) * 5;
 
 						} else {
-							console.log(JSON.stringify(tx));
+							//console.log(JSON.stringify(tx));
 						}
 
 						feeRateGroup = Math.floor(feeRateGroup);

diff --git a/app/resourceIntegrityHashes.js b/app/resourceIntegrityHashes.js
@@ -5,18 +5,18 @@ module.exports =
     "chartjs-adapter-moment.min.js": "sha384-Z9r2EsEmivx0l8T8TvYoqqGcpO0cCjKbqVXB8tYUa0hIWKtGVl0TmaF263CjS6XR",
     "dataTables.bootstrap4.min.js": "sha384-uiSTMvD1kcI19sAHJDVf68medP9HA2E2PzGis9Efmfsdb8p9+mvbQNgFhzii1MEX",
     "decimal.js": "sha384-AZER8B64Ei3MdcUsKj9o83PHYCWb4dY9wJz58HzSDLat+G/QlGUdXhIlNOH56LUe",
-    "highlight.min.js": "sha384-rRRl92dHoFEuEUzbuZbirpL4mXU9lEC7sdPaMYmayIbFSr+1K2FNOGzSSnocSNq+",
+    "highlight.min.js": "sha384-WRBQ3Nk0J+xE63PvRMOqL5e7wVeo/08dicApRgIsnUQV1zXQTP+VxcsVV8AeatLp",
     "jquery.dataTables.min.js": "sha384-rgWRqC0OFPisxlUvl332tiM/qmaNxnlY46eksSZD84t+s2vZlqGeHrncwIRX7CGp",
     "jquery.min.js": "sha384-vtXRMe3mGCbOeY7l30aIg8H9p3GdeSe4IFlP6G8JMa7o7lXvnz3GFKzPxzJdPfGK",
     "moment.min.js": "sha384-CJyhAlbbRZX14Q8KxKBt0na1ad4KBs9PklAiNk2Efxs9sgimbIZm9kYLJQeNMUfM",
     "sentry.min.js": "sha384-da/Bo2Ah6Uw3mlhl6VINMblg2SyGbSnULKrukse3P5D9PTJi4np9HoKvR19D7zOL",
     "site.js": "sha384-G8o2io5zIdQiiVN+4CAGGXPO4UvV8jGkSMlfddSPbqIUd3x5Rv01pNH6ec8QOATu",
     "bootstrap-icons.css": "sha384-rJFhkIguED0Z4GX6r6ReHpTCkwWtiPHZnQtWVP0DQWcKHzeJAlYb1m/xdYkeEk+f",
-    "dark-v1.min.css": "sha384-YAnJ97Ktnj5VP4JJWI6ie2pIXTkTxArPAavrrJDC9Hp6JEBQVuCOq+S6ULhUJmdF",
-    "dark.min.css": "sha384-TDs2KDkDUgC3PKKRq0QJyPNcZ6659YWAgbGDGhusUnAmfWc/iGmQe4bY5BOcGP+b",
+    "dark-v1.min.css": "sha384-3ru8Vuc+jzkyRBZkRRdFb+O2gHR43bYmGOoqCL20MNGNTC2cZw6mD+L+mAW/bWvU",
+    "dark.min.css": "sha384-mOoFwflyWEIHcyYPxrf7P+JX+LM3XLjDp5nZRPExl67nMFb0zD9/dycqYRdSYj8G",
     "dataTables.bootstrap4.min.css": "sha384-EkHEUZ6lErauT712zSr0DZ2uuCmi3DoQj6ecNdHQXpMpFNGAQ48WjfXCE5n20W+R",
     "highlight.min.css": "sha384-s4RLYRjGGbVqKOyMGGwfxUTMOO6D7r2eom7hWZQ6BjK2Df4ZyfzLXEkonSm0KLIQ",
-    "light.min.css": "sha384-B8TFOLb3Jl/lhUDMEs3R3/VvWnX++Afva74ooEFJfCjewXxQ4Lz1K9H9yEW5TpWA",
+    "light.min.css": "sha384-v0ZyOfDZIvzUB1WV4KP6IcUjWcyv998Ghr1oFbdtwTD5jt72cgG4bNlRTLa1j3f8",
     "leaflet.css": "sha384-6wKUKNzA6h/S6gZ1lWQppeGaVXvK1AUAsEznGBghzlEu1fNcxJGYVRiroSHr+OwU",
     "leaflet.js": "sha384-RFZC58YeKApoNsIbBxf4z6JJXmh+geBSgkCQXFyh+4tiFSJmJBt+2FbjxW7Ar16M"
 };
diff --git a/app/utils.js b/app/utils.js
@@ -479,6 +479,7 @@ function summarizeDuration(duration, options={}) {
 	let stripZeroes = "stripZeroes" in options ? options.stripZeroes : true;
 	let shortenDurationNames = "shortenDurationNames" in options ? options.shortenDurationNames : true;
 	let outputCommas = "outputCommas" in options ? options.outputCommas : true;
+	let decimalPlaces = "decimalPlaces" in options ? options.decimalPlaces : 1;
 
 	//console.log(JSON.stringify(options) + " - " + oneElement + " - " + stripZeroes + " - " + shortenDurationNames + " - " + outputCommas);
 
@@ -491,7 +492,7 @@ function summarizeDuration(duration, options={}) {
 
 		for (let i = 0; i < parts.length; i++) {
 			if (parts[i] > 1) {
-				str = `${new Decimal(parts[i]).toDP(1)} ${partNames[i]}`;
+				str = `${new Decimal(parts[i]).toDP(decimalPlaces)} ${partNames[i]}`;
 
 				break;
 			}
@@ -1456,7 +1457,8 @@ function nextHalvingEstimates(eraStartBlockHeader, currentBlockHeader, difficult
 		difficultyAdjustmentData = difficultyAdjustmentEstimates(eraStartBlockHeader, currentBlockHeader);
 	}
 
-	let currDifficultyEraTimeDifferential = (coinConfig.targetBlockTimeSeconds - difficultyAdjustmentData.timePerBlock) * difficultyAdjustmentData.blocksLeft;
+	let blockCountAffectedByCurrentDifficultyDelta = Math.min(difficultyAdjustmentData.blocksLeft, blocksUntilNextHalving);
+	let currDifficultyEraTimeDifferential = (coinConfig.targetBlockTimeSeconds - difficultyAdjustmentData.timePerBlock) * blockCountAffectedByCurrentDifficultyDelta;
 
 
 	let secondsUntilNextHalving = blocksUntilNextHalving * targetBlockTimeSeconds - currDifficultyEraTimeDifferential;

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
 		"url": "git+https://github.com/groestlcoin/grs-rpc-explorer.git"
 	},
 	"dependencies": {
-		"@janoside/app-utils": "github:janoside/app-utils#0f52c7028951c1c2b67b06b2ce50fd74001bba93",
+		"@janoside/app-utils": "github:janoside/app-utils#ba4c23d3f",
 		"async": "^3.2.4",
 		"axios": "^1.4.0",
 		"basic-auth": "^2.0.1",
@@ -59,7 +59,7 @@
 		"express-session": "^1.17.3",
 		"jayson": "^4.1.0",
 		"lru-cache": "^10.0.0",
-		"markdown-it": "^13.0.1",
+		"markdown-it": "^14.0.0",
 		"md5": "^2.3.0",
 		"memorystore": "^1.6.7",
 		"meow": "^9.0.0",

diff --git a/public/audio/609335__kenneth_cooney__levelup.wav b/public/audio/609335__kenneth_cooney__levelup.wav