Merge pull request #580 from skalenetwork/merge-develop-2.3

2.3 release beta
skalenetwork · Jan 23, 2024 · 0ed7bec · 0ed7bec
2 parents 296b504 + 23c7c36
commit 0ed7bec
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 18 deletions.
diff --git a/containers.json b/containers.json
@@ -1,7 +1,7 @@
 {
   "schain": {
     "name": "skalenetwork/schain",
-    "version": "3.16.1",
+    "version": "3.18.0-beta.0",
     "custom_args": {
       "ulimits_list": [
         {
@@ -33,8 +33,8 @@
   },
   "ima": {
     "name": "skalenetwork/ima",
-    "version": "1.5.0-beta.1",
-    "new_version": "2.0.0-develop.11",
+    "version": "2.1.0-beta.2",
+    "new_version": "2.1.0-beta.2",
     "custom_args": {
       "logs": {
         "max-size": "250m",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
   transaction-manager:
     <<: *skale_base
     container_name: skale_transaction-manager
-    image: skalenetwork/transaction-manager:2.1.4
+    image: skalenetwork/transaction-manager:2.2.0-beta.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.0-beta.2
+    image: skalenetwork/admin:2.6.0-beta.0
     cpu_shares: 192
     network_mode: host
     tty: true
@@ -53,6 +53,8 @@ services:
       DISABLE_IMA: ${DISABLE_IMA}
       ENV_TYPE: ${ENV_TYPE}
       ALLOWED_TS_DIFF: 300
+      PULL_CONFIG_FOR_SCHAIN: ${PULL_CONFIG_FOR_SCHAIN}
+
     command: "python3 admin.py"
     volumes:
       - /var/run/skale:/var/run/skale
@@ -68,7 +70,7 @@ services:
   skale-api:
     <<: *skale_base
     container_name: skale_api
-    image: skalenetwork/admin:2.5.0-beta.2
+    image: skalenetwork/admin:2.6.0-beta.0
     network_mode: host
     tty: true
     cap_add:
@@ -102,7 +104,7 @@ services:
   celery:
     <<: *skale_base
     container_name: celery
-    image: skalenetwork/admin:2.5.0-beta.2
+    image: skalenetwork/admin:2.6.0-beta.0
     network_mode: host
     tty: true
     environment:
@@ -130,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-beta.1
     network_mode: host
     environment:
       SGX_SERVER_URL: ${SGX_SERVER_URL}
@@ -147,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-beta.0
     network_mode: host
     environment:
       ALLOWED_TS_DIFF: 300
@@ -198,7 +200,7 @@ services:
       - '--path.procfs=/host/proc'
       - '--path.rootfs=/rootfs'
       - '--path.sysfs=/host/sys'
-      - '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)'
+      - '--collector.filesystem.mount-points-exclude=^/(mnt|dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($$|/)'
     network_mode: host
 
   filebeat:

diff --git a/ima_migration_schedule.yaml b/ima_migration_schedule.yaml
@@ -1,8 +1,46 @@
 devnet:
   test-chain: 0
+
 testnet:
-  test-chain: 0
+  staging-legal-crazy-castor: 1701259200
+  staging-purple-arctic-talitha: 1701259200
+  staging-generous-flowery-elnath: 1701259200
+  staging-faint-slimy-achird: 1701259200
+  staging-perfect-parallel-gacrux: 1701259200
+  staging-severe-violet-wezen: 1701259200
+  staging-utter-unripe-menkar: 1701259200
+  staging-aware-chief-gianfar: 1701259200
+  staging-fast-active-bellatrix: 1701259200
+  staging-old-mushy-saiph: 1701259200
+
 qanet:
-  test-chain: 0
+  hungry-formal-ascella: 1697133600
+  big-majestic-oval-SKALE: 1697133600
+  international-villainous-zaurak: 1697133600
+  ill-informed-friendly-haedi: 1697133600
+  rural-colossal-cebalrai: 1697133600
+  worrisome-fortunate-talitha: 1697133600
+  breakable-anguished-tania-borealis: 1697133600
+  skale-innocent-nasty: 1697133600
+
 mainnet:
-  test-chain: 0
+  round-hasty-alsafi: 1702382400
+  affectionate-immediate-pollux: 1702382400
+  gargantuan-wealthy-zosma: 1702382400
+  portly-passionate-sirius: 1702382400
+  harsh-alsuhail: 1702382400
+  haunting-devoted-deneb: 1702382400
+  plain-rotanev: 1702382400
+  parallel-stormy-spica: 1702382400
+  fit-betelgeuse: 1702382400
+  wan-red-ain: 1702382400
+  turbulent-unique-scheat: 1702382400
+  adorable-quaint-bellatrix: 1702382400
+  wary-teeming-mizar: 1702382400
+  light-vast-diphda: 1702382400
+  green-giddy-denebola: 1702382400
+  elated-tan-skat: 1702382400
+  honorable-steel-rasalhague: 1702382400
+  frayed-decent-antares: 1702382400
+  curly-red-alterf: 1702382400
+  fussy-smoggy-megrez: 1702382400
diff --git a/static_params.yaml b/static_params.yaml
@@ -41,6 +41,12 @@ envs:
       revertableFSPatchTimestamp: 1681473600
       contractStoragePatchTimestamp: 1681732800
       verifyDaSigsPatchTimestamp: 1681300800
+      storageDestructionPatchTimestamp: 1703851200
+      powCheckPatchTimestamp: 1703592000
+      skipInvalidTransactionsPatchTimestamp: 1703764800
+      pushZeroPatchTimestamp: 0
+      precompiledPatchTimestamp: 0
+      correctForkInPowPatchTimestamp: 0
       snapshotIntervalSec: 86400
       emptyBlockIntervalMs: 10000
       snapshotDownloadTimeout: 18000
@@ -117,6 +123,12 @@ envs:
       revertableFSPatchTimestamp: 1678100400
       contractStoragePatchTimestamp: 1678100400
       verifyDaSigsPatchTimestamp: 1678100400
+      storageDestructionPatchTimestamp: 1702393200
+      powCheckPatchTimestamp: 1702296000
+      skipInvalidTransactionsPatchTimestamp: 1702382400
+      pushZeroPatchTimestamp: 0
+      precompiledPatchTimestamp: 0
+      correctForkInPowPatchTimestamp: 0
       snapshotIntervalSec: 86400
       emptyBlockIntervalMs: 10000
       snapshotDownloadTimeout: 18000
@@ -189,17 +201,23 @@ envs:
       docker-compose: 1.27.4
 
     schain:
-      contractStorageZeroValuePatchTimestamp: 1000000
-      revertableFSPatchTimestamp: 1000000
-      contractStoragePatchTimestamp: 1000000
-      verifyDaSigsPatchTimestamp: 1000000
+      contractStorageZeroValuePatchTimestamp: 1691146800
+      revertableFSPatchTimestamp: 1691146800
+      contractStoragePatchTimestamp: 1691146800
+      verifyDaSigsPatchTimestamp: 1691146800
+      storageDestructionPatchTimestamp: 1699618500
+      powCheckPatchTimestamp: 1699625700
+      skipInvalidTransactionsPatchTimestamp: 1699632900
+      pushZeroPatchTimestamp: 0
+      precompiledPatchTimestamp: 0
+      correctForkInPowPatchTimestamp: 0
       snapshotIntervalSec: 3600
       emptyBlockIntervalMs: 10000
       snapshotDownloadTimeout: 18000
       snapshotDownloadInactiveTimeout: 120
 
     schain_cmd:
-      ["-v 3", "--web3-trace", "--enable-debug-behavior-apis", "--aa no"]
+      ["-v 2", "--aa no"]
 
     node:
       common:
@@ -269,6 +287,12 @@ envs:
       revertableFSPatchTimestamp: 1000000
       contractStoragePatchTimestamp: 1000000
       verifyDaSigsPatchTimestamp: 1000000
+      storageDestructionPatchTimestamp: 1000000
+      powCheckPatchTimestamp: 1000000
+      skipInvalidTransactionsPatchTimestamp: 1000000
+      pushZeroPatchTimestamp: 0
+      precompiledPatchTimestamp: 0
+      correctForkInPowPatchTimestamp: 0
       snapshotIntervalSec: 3600
       emptyBlockIntervalMs: 10000
       snapshotDownloadTimeout: 18000