Merge pull request #1567 from ergoplatform/v4.0.20.1

Candidate for 4.0.20.1 release
ergoplatform · Jan 10, 2022 · ae2d7ab · ae2d7ab
2 parents 0ea3fac + f30a1b0
commit ae2d7ab
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/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.20`.
+Available versions can be found on [Ergo Docker image page](https://hub.docker.com/r/ergoplatform/ergo/tags), for example, `v4.0.20.1`.
 
 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.
 

diff --git a/src/main/resources/api/openapi.yaml b/src/main/resources/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.2"
 
 info:
-  version: "4.0.20"
+  version: "4.0.20.1"
   title: Ergo Node API
   description: API docs for Ergo Node. Models are shared between all Ergo products
   contact:

diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -338,7 +338,7 @@ scorex {
     nodeName = "ergo-node"
 
     # Network protocol version to be sent in handshakes
-    appVersion = 4.0.20
+    appVersion = 4.0.20.1
 
     # Network agent name. May contain information about client code
     # stack, starting from core code-base up to the end graphical interface.

diff --git a/src/main/resources/mainnet.conf b/src/main/resources/mainnet.conf
@@ -41,7 +41,7 @@ scorex {
   network {
     magicBytes = [1, 0, 2, 4]
     bindAddress = "0.0.0.0:9030"
-    nodeName = "ergo-mainnet-4.0.20"
+    nodeName = "ergo-mainnet-4.0.20.1"
     nodeName = ${?NODENAME}
     knownPeers = [
       "213.239.193.208:9030",

diff --git a/src/main/resources/testnet.conf b/src/main/resources/testnet.conf
@@ -56,7 +56,7 @@ scorex {
   network {
     magicBytes = [2, 0, 0, 2]
     bindAddress = "0.0.0.0:9020"
-    nodeName = "ergo-testnet-4.0.20"
+    nodeName = "ergo-testnet-4.0.20.1"
     nodeName = ${?NODENAME}
     knownPeers = [
       "213.239.193.208:9020",

diff --git a/src/main/scala/org/ergoplatform/network/ErgoNodeViewSynchronizer.scala b/src/main/scala/org/ergoplatform/network/ErgoNodeViewSynchronizer.scala
@@ -471,7 +471,8 @@ class ErgoNodeViewSynchronizer(networkControllerRef: ActorRef,
 
     if (spam.nonEmpty) {
       if (typeId == Transaction.ModifierTypeId) {
-        val spammyTxs = modifiers.filterKeys(id => !blockAppliedTxsCache.mightContain(id))
+        // penalize a peer for sending TXs that have been already applied to a block
+        val spammyTxs = modifiers.filterKeys(blockAppliedTxsCache.mightContain)
         if (spammyTxs.nonEmpty) {
           log.info(s"Got spammy transactions: $spammyTxs")
           penalizeSpammingPeer(remote)