Merge branch 'beta' into merge-beta

containers.json

@@ -1,7 +1,7 @@
 {
   "schain": {
     "name": "skalenetwork/schain",
-    "version": "3.17.1",
+    "version": "3.18.0",
     "custom_args": {
       "ulimits_list": [
         {
@@ -33,8 +33,8 @@
   },
   "ima": {
     "name": "skalenetwork/ima",
-    "version": "1.5.0-beta.1",
-    "new_version": "2.0.2",
+    "version": "2.1.0",
+    "new_version": "2.1.0",
     "custom_args": {
       "logs": {
         "max-size": "250m",

docker-compose.yml

@@ -16,7 +16,7 @@ services:
   transaction-manager:
     <<: *skale_base
     container_name: skale_transaction-manager
-    image: skalenetwork/transaction-manager:2.1.5
+    image: skalenetwork/transaction-manager:2.2.0
     network_mode: host
     tty: true
     environment:
@@ -29,7 +29,7 @@ services:
   skale-admin:
     <<: *skale_base
     container_name: skale_admin
-    image: skalenetwork/admin:2.5.4
+    image: skalenetwork/admin:2.6.0
     cpu_shares: 192
     network_mode: host
     tty: true
@@ -70,7 +70,7 @@ services:
   skale-api:
     <<: *skale_base
     container_name: skale_api
-    image: skalenetwork/admin:2.5.4
+    image: skalenetwork/admin:2.6.0
     network_mode: host
     tty: true
     cap_add:
@@ -104,7 +104,7 @@ services:
   celery:
     <<: *skale_base
     container_name: celery
-    image: skalenetwork/admin:2.5.4
+    image: skalenetwork/admin:2.6.0
     network_mode: host
     tty: true
     environment:
@@ -132,7 +132,7 @@ services:
   bounty:
     <<: *skale_base
     container_name: skale_bounty
-    image: skalenetwork/bounty-agent:2.1.2-stable.0
+    image: skalenetwork/bounty-agent:2.2.0-stable.0
     network_mode: host
     environment:
       SGX_SERVER_URL: ${SGX_SERVER_URL}
@@ -149,7 +149,7 @@ services:
   watchdog:
     <<: *skale_base
     container_name: skale_watchdog
-    image: skalenetwork/watchdog:2.1.1-stable.1
+    image: skalenetwork/watchdog:2.2.0-stable.0
     network_mode: host
     environment:
       ALLOWED_TS_DIFF: 300

static_params.yaml

@@ -44,6 +44,9 @@ envs:
       storageDestructionPatchTimestamp: 1703851200
       powCheckPatchTimestamp: 1703592000
       skipInvalidTransactionsPatchTimestamp: 1703764800
+      pushZeroPatchTimestamp: 0
+      precompiledConfigPatchTimestamp: 0
+      correctForkInPowPatchTimestamp: 0
       snapshotIntervalSec: 86400
       emptyBlockIntervalMs: 10000
       snapshotDownloadTimeout: 18000
@@ -133,6 +136,9 @@ envs:
       storageDestructionPatchTimestamp: 1702393200
       powCheckPatchTimestamp: 1702296000
       skipInvalidTransactionsPatchTimestamp: 1702382400
+      pushZeroPatchTimestamp: 0
+      precompiledConfigPatchTimestamp: 0
+      correctForkInPowPatchTimestamp: 0
       snapshotIntervalSec: 86400
       emptyBlockIntervalMs: 10000
       snapshotDownloadTimeout: 18000
@@ -222,6 +228,9 @@ envs:
       storageDestructionPatchTimestamp: 1699618500
       powCheckPatchTimestamp: 1699625700
       skipInvalidTransactionsPatchTimestamp: 1699632900
+      pushZeroPatchTimestamp: 0
+      precompiledConfigPatchTimestamp: 0
+      correctForkInPowPatchTimestamp: 0
       snapshotIntervalSec: 3600
       emptyBlockIntervalMs: 10000
       snapshotDownloadTimeout: 18000
@@ -237,6 +246,8 @@ envs:
         logLevelConfig: "info"
         pg-threads: 10
         pg-threads-limit: 10
+      admin:
+        automatic_repair: false
       small:
         minCacheSize: 1000000
         maxCacheSize: 2000000
@@ -311,6 +322,9 @@ envs:
       storageDestructionPatchTimestamp: 1000000
       powCheckPatchTimestamp: 1000000
       skipInvalidTransactionsPatchTimestamp: 1000000
+      pushZeroPatchTimestamp: 0
+      precompiledConfigPatchTimestamp: 0
+      correctForkInPowPatchTimestamp: 0
       snapshotIntervalSec: 3600
       emptyBlockIntervalMs: 10000
       snapshotDownloadTimeout: 18000