Merge pull request #5426 from multiversx/minor-config-changes

Minor config changes

cmd/node/config/config.toml

@@ -490,8 +490,8 @@
     Type = "LRU"
 
 [PeersRatingConfig]
-    TopRatedCacheCapacity           = 5000
-    BadRatedCacheCapacity           = 5000
+    TopRatedCacheCapacity = 5000
+    BadRatedCacheCapacity = 5000
 
 [PoolsCleanersConfig]
     MaxRoundsToKeepUnprocessedMiniBlocks = 300   # max number of rounds unprocessed miniblocks are kept in pool
@@ -926,26 +926,26 @@
     NumFullHistoryPeers = 3
 
 [HeartbeatV2]
-    PeerAuthenticationTimeBetweenSendsInSec          = 600  # 10min TODO: change this for mainnet/devnet/testnet
-    PeerAuthenticationTimeBetweenSendsWhenErrorInSec = 60   # 1min
-    PeerAuthenticationTimeThresholdBetweenSends      = 0.1  # 10%   # max random threshold between messages, representing a percent of PeerAuthenticationTimeBetweenSendsInSec
-    HeartbeatTimeBetweenSendsInSec                   = 60   # 1min
-    HeartbeatTimeBetweenSendsDuringBootstrapInSec    = 60   # 1min
-    HeartbeatTimeBetweenSendsWhenErrorInSec          = 60   # 1min
-    HeartbeatTimeThresholdBetweenSends               = 0.1  # 10%        # max random threshold between messages, representing a percent of HeartbeatTimeBetweenSendsInSec
-    HeartbeatExpiryTimespanInSec                     = 3600 # 1h         # heartbeat message max age allowed
-    MinPeersThreshold                                = 0.8  # 80%        # min threshold of peers to consider enough peer auths received
-    DelayBetweenPeerAuthenticationRequestsInSec      = 5    # 5sec       # delay between requests
-    PeerAuthenticationMaxTimeoutForRequestsInSec     = 7200 # 2h         # max timeout allowed to receive peer auth messages from peers
-    PeerShardTimeBetweenSendsInSec                   = 7200 # 2h
-    PeerShardTimeThresholdBetweenSends               = 0.1  # 10%        # max random threshold between messages, representing a percent of PeerShardTimeBetweenSendsInSec
-    MaxMissingKeysInRequest                          = 500               # max number of missing keys allowed in a request
-    MaxDurationPeerUnresponsiveInSec                 = 900  # 15min      # max duration after which a peer is considered inactive
-    HideInactiveValidatorIntervalInSec               = 3600 # 1h         # time that an inactive validator is returned through api
-    HardforkTimeBetweenSendsInSec                    = 60   # 1min       # time between hardfork messages
-    TimeBetweenConnectionsMetricsUpdateInSec         = 30   # 30sec      # time between consecutive connections metrics updates
-    TimeToReadDirectConnectionsInSec                 = 15   # 15sec      # time between consecutive peer shard mapper updates with direct connections
-    PeerAuthenticationTimeBetweenChecksInSec         = 6    # 6sec
+    PeerAuthenticationTimeBetweenSendsInSec          = 600   # 10min TODO: change this for mainnet/devnet/testnet
+    PeerAuthenticationTimeBetweenSendsWhenErrorInSec = 60    # 1min
+    PeerAuthenticationTimeThresholdBetweenSends      = 0.1   # 10%   # max random threshold between messages, representing a percent of PeerAuthenticationTimeBetweenSendsInSec
+    HeartbeatTimeBetweenSendsInSec                   = 60    # 1min
+    HeartbeatTimeBetweenSendsDuringBootstrapInSec    = 60    # 1min
+    HeartbeatTimeBetweenSendsWhenErrorInSec          = 60    # 1min
+    HeartbeatTimeThresholdBetweenSends               = 0.1   # 10%        # max random threshold between messages, representing a percent of HeartbeatTimeBetweenSendsInSec
+    HeartbeatExpiryTimespanInSec                     = 3600  # 1h         # heartbeat message max age allowed
+    MinPeersThreshold                                = 0.8   # 80%        # min threshold of peers to consider enough peer auths received
+    DelayBetweenPeerAuthenticationRequestsInSec      = 5     # 5sec       # delay between requests
+    PeerAuthenticationMaxTimeoutForRequestsInSec     = 7200  # 2h         # max timeout allowed to receive peer auth messages from peers
+    PeerShardTimeBetweenSendsInSec                   = 7200  # 2h
+    PeerShardTimeThresholdBetweenSends               = 0.1   # 10%        # max random threshold between messages, representing a percent of PeerShardTimeBetweenSendsInSec
+    MaxMissingKeysInRequest                          = 500                # max number of missing keys allowed in a request
+    MaxDurationPeerUnresponsiveInSec                 = 900   # 15min      # max duration after which a peer is considered inactive
+    HideInactiveValidatorIntervalInSec               = 3600  # 1h         # time that an inactive validator is returned through api
+    HardforkTimeBetweenSendsInSec                    = 60    # 1min       # time between hardfork messages
+    TimeBetweenConnectionsMetricsUpdateInSec         = 30    # 30sec      # time between consecutive connections metrics updates
+    TimeToReadDirectConnectionsInSec                 = 15    # 15sec      # time between consecutive peer shard mapper updates with direct connections
+    PeerAuthenticationTimeBetweenChecksInSec         = 6     # 6sec
     [HeartbeatV2.HeartbeatPool]
         Name = "HeartbeatPool"
         Capacity = 50000

cmd/node/config/enableRounds.toml

@@ -4,8 +4,10 @@
 # Each activation round definition contains an optional slice of strings. These are useful, for example, when we have
 # some exceptions to process in a different manner at a special round (say a block, a transaction, a smart contract result and such)
 
+# The Options field for each activation round can have some custom array of strings (for using them in exceptions or other use cases)
+# Example: Options = ["test string1", "test string 2"]
+
 [RoundActivations]
     [RoundActivations.DisableAsyncCallV1]
-        # just an example, not used for this flag
-        Options = ["test string1", "test string 2"]
+        Options = []
         Round = "18446744073709551614"

cmd/node/config/gasSchedules/gasScheduleV2.toml

@@ -701,7 +701,7 @@
     LocalsUnmetered = 100
     MaxMemoryGrowDelta = 100
     MaxMemoryGrow = 100
-        Catch = 1
+    Catch = 1
     CatchAll = 1
     Delegate = 1
     F32x4Ceil = 1

docker/keygenerator/Dockerfile

@@ -3,7 +3,7 @@ FROM golang:1.17.6 as builder
 RUN apt-get update && apt-get install -y
 WORKDIR /go/mx-chain-go
 COPY . .
-RUN GO111MODULE=on go mod tidy
+RUN go mod tidy
 # Keygenerator node
 WORKDIR /go/mx-chain-go/cmd/keygenerator
 RUN go build

docker/multiversx/Dockerfile → docker/node/Dockerfile

@@ -3,17 +3,19 @@ FROM golang:1.17.6 as builder
 RUN apt-get update && apt-get install -y
 WORKDIR /go/mx-chain-go
 COPY . .
-RUN GO111MODULE=on go mod tidy
+RUN go mod tidy
 # Multiversx node
 WORKDIR /go/mx-chain-go/cmd/node
 RUN go build -i -v -ldflags="-X main.appVersion=$(git describe --tags --long --dirty)"
 RUN cp /go/pkg/mod/github.com/multiversx/$(cat /go/mx-chain-go/go.mod | grep mx-chain-vm-v | sort -n | tail -n -1| awk -F '/' '{print$3}'| sed 's/ /@/g')/wasmer/libwasmer_linux_amd64.so /lib/libwasmer_linux_amd64.so
+RUN cp /go/pkg/mod/github.com/multiversx/$(cat /go/mx-chain-go/go.mod | grep mx-chain-vm-go | sort -n | tail -n -1| awk -F '/' '{print$3}'| sed 's/ /@/g')/wasmer2/libvmexeccapi.so /lib/libvmexeccapi.so
 
 WORKDIR /go/mx-chain-go/cmd/node
 # ===== SECOND STAGE ======
 FROM ubuntu:22.04
 COPY --from=builder "/go/mx-chain-go/cmd/node" "/go/mx-chain-go/cmd/node/"
 COPY --from=builder "/lib/libwasmer_linux_amd64.so" "/lib/libwasmer_linux_amd64.so"
+COPY --from=builder "/lib/libvmexeccapi.so" "/lib/libvmexeccapi.so"
 WORKDIR /go/mx-chain-go/cmd/node/
 EXPOSE 8080
 ENTRYPOINT ["/go/mx-chain-go/cmd/node/node"]

docker/seednode/Dockerfile

@@ -3,7 +3,7 @@ FROM golang:1.17.6 as builder
 RUN apt-get update && apt-get install -y
 WORKDIR /go/mx-chain-go
 COPY . .
-RUN GO111MODULE=on go mod tidy
+RUN go mod tidy
 # Seed node
 WORKDIR /go/mx-chain-go/cmd/seednode
 RUN go build