Merge pull request #1711 from ergoplatform/v4.0.30

Candidate for version 4.0.30

README.md

@@ -82,7 +82,7 @@ To run specific Ergo version `<VERSION>` as a service with custom config `/path/
         -e MAX_HEAP=3G \
         ergoplatform/ergo:<VERSION> --<networkId> -c /etc/myergo.conf
 
-Available versions can be found on [Ergo Docker image page](https://hub.docker.com/r/ergoplatform/ergo/tags), for example, `v4.0.29`.
+Available versions can be found on [Ergo Docker image page](https://hub.docker.com/r/ergoplatform/ergo/tags), for example, `v4.0.30`.
 
 This will connect to the Ergo mainnet or testnet following your configuration passed in `myergo.conf` and network flag `--<networkId>`. Every default config value would be overwritten with corresponding value in `myergo.conf`. `MAX_HEAP` variable can be used to control how much memory can the node consume.
 

benchmarks/src/test/scala/org/ergoplatform/bench/CrawlerRunner.scala

@@ -49,8 +49,11 @@ class CrawlerRunner(args: Array[String]) extends Application {
 
   val minerRef: ActorRef = ErgoMiner(ergoSettings, nodeViewHolderRef, readersHolderRef, timeProvider)
 
+  private val syncTracker = ErgoSyncTracker(actorSystem, settings.network, timeProvider)
+
   val statsCollectorRef: ActorRef =
-    ErgoStatsCollectorRef(nodeViewHolderRef, networkControllerRef, ergoSettings, timeProvider)
+    ErgoStatsCollectorRef(nodeViewHolderRef, networkControllerRef, syncTracker, ergoSettings, timeProvider)
+
 
   override val apiRoutes: Seq[ApiRoute] = Seq(
     ErgoUtilsApiRoute(ergoSettings),
@@ -60,8 +63,6 @@ class CrawlerRunner(args: Array[String]) extends Application {
 
   override val swaggerConfig: String = Source.fromResource("api/openapi.yaml").getLines.mkString("\n")
 
-  private val syncTracker = ErgoSyncTracker(actorSystem, settings.network, timeProvider)
-
   private val deliveryTracker: DeliveryTracker = DeliveryTracker.empty(ergoSettings)
 
   override val nodeViewSynchronizer: ActorRef =

src/main/resources/api/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: "3.0.2"
 
 info:
-  version: "4.0.29"
+  version: "4.0.30"
   title: Ergo Node API
   description: API docs for Ergo Node. Models are shared between all Ergo products
   contact:
@@ -1847,6 +1847,7 @@ components:
         - appVersion
         - fullHeight
         - headersHeight
+        - maxPeerHeight
         - bestFullHeaderId
         - previousFullHeaderId
         - bestHeaderId
@@ -1884,6 +1885,13 @@ components:
           minimum: 0
           example: 667
           nullable: true
+        maxPeerHeight:
+          type: integer
+          format: int32
+          description: Maximum block height of connected peers. Can be 'null' if state is empty (no peer connected since node launch)
+          minimum: 0
+          example: 706162
+          nullable: true
         bestFullHeaderId:
           type: string
           description: Can be 'null' if no full block is applied since node launch

src/main/resources/application.conf

@@ -381,7 +381,7 @@ scorex {
     nodeName = "ergo-node"
 
     # Network protocol version to be sent in handshakes
-    appVersion = 4.0.29
+    appVersion = 4.0.30
 
     # Network agent name. May contain information about client code
     # stack, starting from core code-base up to the end graphical interface.

src/main/resources/mainnet.conf

@@ -49,8 +49,8 @@ ergo {
     # The node still applying transactions to UTXO set and so checks UTXO set digests for each block.
     # Block at checkpoint height is to be checked against expected one.
     checkpoint = {
-      height = 752358
-      blockId = "199db2b0ab073be626c3056848362851685f3a77a0e16302e371770a507f53ec"
+      height = 755464
+      blockId = "48542c37b030e7d509754434aa97cf9691ad0ada30d60711cd345862a168e0fb"
     }
 
     # List with hex-encoded identifiers of transactions banned from getting into memory pool
@@ -65,7 +65,7 @@ scorex {
   network {
     magicBytes = [1, 0, 2, 4]
     bindAddress = "0.0.0.0:9030"
-    nodeName = "ergo-mainnet-4.0.29"
+    nodeName = "ergo-mainnet-4.0.30"
     nodeName = ${?NODENAME}
     knownPeers = [
       "213.239.193.208:9030",

src/main/resources/panel/asset-manifest.json

@@ -1,18 +1,18 @@
 {
   "files": {
-    "main.css": "/static/css/main.0e9161bb.chunk.css",
-    "main.js": "/static/js/main.2df85f5c.chunk.js",
-    "main.js.map": "/static/js/main.2df85f5c.chunk.js.map",
+    "main.css": "/static/css/main.82878fab.chunk.css",
+    "main.js": "/static/js/main.201e9ef5.chunk.js",
+    "main.js.map": "/static/js/main.201e9ef5.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.219240e0.js",
     "runtime-main.js.map": "/static/js/runtime-main.219240e0.js.map",
     "static/css/2.9338f6a1.chunk.css": "/static/css/2.9338f6a1.chunk.css",
     "static/js/2.6b84a7b0.chunk.js": "/static/js/2.6b84a7b0.chunk.js",
     "static/js/2.6b84a7b0.chunk.js.map": "/static/js/2.6b84a7b0.chunk.js.map",
     "index.html": "/index.html",
-    "precache-manifest.d5050dc805ea3d39fb8ff28d6cef00ed.js": "/precache-manifest.d5050dc805ea3d39fb8ff28d6cef00ed.js",
+    "precache-manifest.397e5fe57017f70409fd32796cb2de92.js": "/precache-manifest.397e5fe57017f70409fd32796cb2de92.js",
     "service-worker.js": "/service-worker.js",
     "static/css/2.9338f6a1.chunk.css.map": "/static/css/2.9338f6a1.chunk.css.map",
-    "static/css/main.0e9161bb.chunk.css.map": "/static/css/main.0e9161bb.chunk.css.map",
+    "static/css/main.82878fab.chunk.css.map": "/static/css/main.82878fab.chunk.css.map",
     "static/media/index.scss": "/static/media/Roboto-Thin.89e2666c.ttf",
     "static/media/close.feae5a5c.svg": "/static/media/close.feae5a5c.svg",
     "static/media/copy.icon.835ebda7.svg": "/static/media/copy.icon.835ebda7.svg",
@@ -24,7 +24,7 @@
     "static/js/runtime-main.219240e0.js",
     "static/css/2.9338f6a1.chunk.css",
     "static/js/2.6b84a7b0.chunk.js",
-    "static/css/main.0e9161bb.chunk.css",
-    "static/js/main.2df85f5c.chunk.js"
+    "static/css/main.82878fab.chunk.css",
+    "static/js/main.201e9ef5.chunk.js"
   ]
 }

src/main/resources/panel/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.svg"/><meta name="viewport" content="minimum-scale=1,initial-scale=1,width=device-width,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Ergo node interface</title><link href="/static/css/2.9338f6a1.chunk.css" rel="stylesheet"><link href="/static/css/main.0e9161bb.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><div id="modal-root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&i.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return p.push.apply(p,u||[]),a()}function a(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},c={1:0},p=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpergo-node-interface"]=this["webpackJsonpergo-node-interface"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.6b84a7b0.chunk.js"></script><script src="/static/js/main.2df85f5c.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.svg"/><meta name="viewport" content="minimum-scale=1,initial-scale=1,width=device-width,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Ergo node interface</title><link href="/static/css/2.9338f6a1.chunk.css" rel="stylesheet"><link href="/static/css/main.82878fab.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><div id="modal-root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&i.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return p.push.apply(p,u||[]),a()}function a(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},c={1:0},p=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpergo-node-interface"]=this["webpackJsonpergo-node-interface"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.6b84a7b0.chunk.js"></script><script src="/static/js/main.201e9ef5.chunk.js"></script></body></html>

src/main/resources/panel/precache-manifest.d5050dc805ea3d39fb8ff28d6cef00ed.js → src/main/resources/panel/precache-manifest.397e5fe57017f70409fd32796cb2de92.js

@@ -1,23 +1,23 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "07a803448c8cd5afd8c3d399f444b959",
+    "revision": "76524e09d4598498ae5818d0028dcfe0",
     "url": "/index.html"
   },
   {
     "revision": "958afc9417af1de07489",
     "url": "/static/css/2.9338f6a1.chunk.css"
   },
   {
-    "revision": "b6be50d400b93ddc0e13",
-    "url": "/static/css/main.0e9161bb.chunk.css"
+    "revision": "c4b42d9d7c3c59c5c3aa",
+    "url": "/static/css/main.82878fab.chunk.css"
   },
   {
     "revision": "958afc9417af1de07489",
     "url": "/static/js/2.6b84a7b0.chunk.js"
   },
   {
-    "revision": "b6be50d400b93ddc0e13",
-    "url": "/static/js/main.2df85f5c.chunk.js"
+    "revision": "c4b42d9d7c3c59c5c3aa",
+    "url": "/static/js/main.201e9ef5.chunk.js"
   },
   {
     "revision": "ce813ebd69754efed759",

src/main/resources/panel/service-worker.js

@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.d5050dc805ea3d39fb8ff28d6cef00ed.js"
+  "/precache-manifest.397e5fe57017f70409fd32796cb2de92.js"
 );
 
 self.addEventListener('message', (event) => {