From 519be996de952d853f112a212e08fb0272ec51b3 Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 19 Aug 2021 15:03:00 +0300 Subject: [PATCH 01/29] Update compose components versions for hotfix --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8f4ab856..a193e0e1 100644 --- 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.0.1-beta.2 + image: skalenetwork/transaction-manager:2.0.1-beta.3 network_mode: host tty: true environment: @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.0.1-beta.0 + image: skalenetwork/admin:2.0.1-beta.4 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.0.1-beta.0 + image: skalenetwork/admin:2.0.1-beta.4 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.0.1-beta.0 + image: skalenetwork/admin:2.0.1-beta.4 network_mode: host tty: true environment: @@ -128,7 +128,7 @@ services: bounty: <<: *skale_base container_name: skale_bounty - image: skalenetwork/bounty-agent:2.0.1-beta.0 + image: skalenetwork/bounty-agent:2.0.1-beta.1 network_mode: host environment: SGX_SERVER_URL: ${SGX_SERVER_URL} @@ -144,7 +144,7 @@ services: watchdog: <<: *skale_base container_name: skale_watchdog - image: skalenetwork/watchdog:2.0.0-beta.1 + image: skalenetwork/watchdog:2.0.0-beta.2 network_mode: host environment: FLASK_APP_PORT: 3010 From b57d73e4e2b6226c61c0f8724b30574d71f0df8c Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 19 Aug 2021 15:21:27 +0300 Subject: [PATCH 02/29] Update skaled and ima hotfix versions --- containers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/containers.json b/containers.json index fa70e368..0ae68af2 100644 --- a/containers.json +++ b/containers.json @@ -1,7 +1,7 @@ { "schain": { "name": "skalenetwork/schain", - "version": "3.7.3-beta.0", + "version": "3.7.4-beta.3", "custom_args": { "ulimits_list": [ { @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.0.0-beta.4", + "version": "1.0.0-beta.10", "custom_args": { "logs": { "max-size": "250m", From ab52b6c10c21d13151ba5c77405bb8201bc803d9 Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 19 Aug 2021 15:56:47 +0300 Subject: [PATCH 03/29] Update transaction-manager version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a193e0e1..715f7577 100644 --- 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.0.1-beta.3 + image: skalenetwork/transaction-manager:2.0.1-beta.4 network_mode: host tty: true environment: From 904733704019c91759e036e313ea1ccbda78ea63 Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 19 Aug 2021 18:47:49 +0300 Subject: [PATCH 04/29] Update skale admin with filebeat fix --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 715f7577..54f6825d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.0.1-beta.4 + image: skalenetwork/admin:2.0.1-beta.5 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.0.1-beta.4 + image: skalenetwork/admin:2.0.1-beta.5 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.0.1-beta.4 + image: skalenetwork/admin:2.0.1-beta.5 network_mode: host tty: true environment: From 555edf0c55d0df282626f4a27de8f4c500c1c639 Mon Sep 17 00:00:00 2001 From: badrogger Date: Fri, 20 Aug 2021 12:12:08 +0300 Subject: [PATCH 05/29] Update skaled version --- containers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers.json b/containers.json index 0ae68af2..7a225187 100644 --- a/containers.json +++ b/containers.json @@ -1,7 +1,7 @@ { "schain": { "name": "skalenetwork/schain", - "version": "3.7.4-beta.3", + "version": "3.7.5-beta.0", "custom_args": { "ulimits_list": [ { From a31c45b025adc7723098048c4d02d2345236cf5a Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 2 Sep 2021 11:01:27 +0300 Subject: [PATCH 06/29] Turn off restart policy for skaled --- containers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/containers.json b/containers.json index 7a225187..f21e6ba5 100644 --- a/containers.json +++ b/containers.json @@ -20,8 +20,8 @@ "seccomp=unconfined" ], "restart_policy": { - "MaximumRetryCount": 3, - "Name": "on-failure" + "MaximumRetryCount": 0, + "Name": "no" }, "network": "host", "cap_add": [ From ba81eb68df5a808edfc4c89613416f8e665fa812 Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 2 Sep 2021 11:25:45 +0300 Subject: [PATCH 07/29] Update skale admin version --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 54f6825d..a4563586 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.0.1-beta.5 + image: skalenetwork/admin:2.0.1-beta.6 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.0.1-beta.5 + image: skalenetwork/admin:2.0.1-beta.6 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.0.1-beta.5 + image: skalenetwork/admin:2.0.1-beta.6 network_mode: host tty: true environment: From 19a6fcb40e534a36d411465f1f196a237bdd1779 Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 9 Sep 2021 17:17:48 +0300 Subject: [PATCH 08/29] Update to final ima hotfix release --- containers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/containers.json b/containers.json index f21e6ba5..275234be 100644 --- a/containers.json +++ b/containers.json @@ -1,7 +1,7 @@ { "schain": { "name": "skalenetwork/schain", - "version": "3.7.5-beta.0", + "version": "3.7.5-beta.4", "custom_args": { "ulimits_list": [ { @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.0.0-beta.10", + "version": "1.0.0-beta.11", "custom_args": { "logs": { "max-size": "250m", From 652b59b5ab17f05ccfca67701128c67b772d7810 Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 9 Sep 2021 17:36:22 +0300 Subject: [PATCH 09/29] Fix cadvisor mount option --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a4563586..8355224a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -177,7 +177,7 @@ services: network_mode: host volumes: - /:/rootfs:ro - - /var/run:/var/run + - /var/run:/var/run:ro - /sys:/sys:ro - /var/lib/docker/:/var/lib/docker:ro - /dev/disk/:/dev/disk:ro From d1f5c0198dc644ea492d63c2a235fe6883fbddab Mon Sep 17 00:00:00 2001 From: badrogger Date: Fri, 10 Sep 2021 13:13:57 +0300 Subject: [PATCH 10/29] Update admin to 2.0.1-beta.7 --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8355224a..6a5a40db 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.0.1-beta.6 + image: skalenetwork/admin:2.0.1-beta.7 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.0.1-beta.6 + image: skalenetwork/admin:2.0.1-beta.7 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.0.1-beta.6 + image: skalenetwork/admin:2.0.1-beta.7 network_mode: host tty: true environment: From 3d1dfb72c1c7aeb9db2f7712705cab1bb2551bc6 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Wed, 15 Sep 2021 00:11:06 +0300 Subject: [PATCH 11/29] Update admin and IMA containers --- containers.json | 2 +- docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/containers.json b/containers.json index 275234be..5952b82e 100644 --- a/containers.json +++ b/containers.json @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.0.0-beta.11", + "version": "1.0.0-beta.13", "custom_args": { "logs": { "max-size": "250m", diff --git a/docker-compose.yml b/docker-compose.yml index 6a5a40db..185db9b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.0.1-beta.7 + image: skalenetwork/admin:2.0.1-beta.8 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.0.1-beta.7 + image: skalenetwork/admin:2.0.1-beta.8 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.0.1-beta.7 + image: skalenetwork/admin:2.0.1-beta.8 network_mode: host tty: true environment: From 23ed294cb8ce8a5ece22cf347865242aa052cd87 Mon Sep 17 00:00:00 2001 From: badrogger Date: Tue, 25 Jan 2022 16:09:04 +0000 Subject: [PATCH 12/29] Update schain_precompiled_contracts --- schain_precompiled_contracts.json | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/schain_precompiled_contracts.json b/schain_precompiled_contracts.json index 58476c26..267e7dd1 100644 --- a/schain_precompiled_contracts.json +++ b/schain_precompiled_contracts.json @@ -81,7 +81,7 @@ "word": 0 }, "startingBlock": "0x0", - "restrictAccess": true + "restrictAccess": ["fs"] } }, "000000000000000000000000000000000000000C": { @@ -92,7 +92,7 @@ "word": 0 }, "startingBlock": "0x0", - "restrictAccess": true + "restrictAccess": ["fs"] } }, "000000000000000000000000000000000000000D": { @@ -113,7 +113,7 @@ "word": 0 }, "startingBlock": "0x0", - "restrictAccess": true + "restrictAccess": ["fs"] } }, "000000000000000000000000000000000000000F": { @@ -124,7 +124,7 @@ "word": 0 }, "startingBlock": "0x0", - "restrictAccess": true + "restrictAccess": ["fs"] } }, "0000000000000000000000000000000000000010": { @@ -135,7 +135,7 @@ "word": 0 }, "startingBlock": "0x0", - "restrictAccess": true + "restrictAccess": ["fs"] } }, "0000000000000000000000000000000000000011": { @@ -146,7 +146,7 @@ "word": 0 }, "startingBlock": "0x0", - "restrictAccess": true + "restrictAccess": ["fs"] } }, "0000000000000000000000000000000000000012": { @@ -208,5 +208,15 @@ }, "startingBlock": "0x0" } + }, + "0000000000000000000000000000000000000018": { + "precompiled": { + "name": "getBlockRandom", + "linear": { + "base": 15, + "word": 0 + }, + "startingBlock": "0x0" + } } } \ No newline at end of file From 30153e47956cffa184caeebee3ccb7f00288b6da Mon Sep 17 00:00:00 2001 From: badrogger Date: Tue, 25 Jan 2022 16:09:48 +0000 Subject: [PATCH 13/29] Upgrade nginx version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 185db9b4..87d719da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -153,7 +153,7 @@ services: nginx: <<: *skale_base - image: nginx:1.19.6 + image: nginx:1.20.2 container_name: skale_nginx network_mode: host depends_on: From 917fcc10a1ac48463a56fa5d10888f184265d6c8 Mon Sep 17 00:00:00 2001 From: badrogger Date: Tue, 25 Jan 2022 16:10:39 +0000 Subject: [PATCH 14/29] Update filestorage_info --- filestorage_info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filestorage_info.json b/filestorage_info.json index c5847017..40d86b05 100644 --- a/filestorage_info.json +++ b/filestorage_info.json @@ -1,4 +1,4 @@ { - "version": "1.0.0-develop.1", - "artifacts_url": "https://github.com/skalenetwork/filestorage/releases/download/1.0.0-develop.1/artifacts.json" + "version": "1.0.1-develop.1", + "artifacts_url": "https://github.com/skalenetwork/filestorage/releases/download/1.0.1-develop.1/artifacts.json" } \ No newline at end of file From 0da5db0399efa11a7c294d90cc00054484b8cc67 Mon Sep 17 00:00:00 2001 From: badrogger Date: Tue, 25 Jan 2022 16:45:32 +0000 Subject: [PATCH 15/29] Update CODEOWNERS --- CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/CODEOWNERS b/CODEOWNERS index 7933774a..d90e1e65 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,2 +1,3 @@ * @dmitry-tk @kladkogex *.md @skalenetwork/docowners +/docs/ @skalenetwork/docowners From e49480fc683ea8a4e568c3aba29421083cf27e2b Mon Sep 17 00:00:00 2001 From: badrogger Date: Thu, 27 Jan 2022 15:45:56 +0000 Subject: [PATCH 16/29] Update components to release 2 versions --- containers.json | 4 ++-- docker-compose.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/containers.json b/containers.json index 5952b82e..493c078e 100644 --- a/containers.json +++ b/containers.json @@ -1,7 +1,7 @@ { "schain": { "name": "skalenetwork/schain", - "version": "3.7.5-beta.4", + "version": "3.14.0-beta.0", "custom_args": { "ulimits_list": [ { @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.0.0-beta.13", + "version": "1.1.0-beta.0", "custom_args": { "logs": { "max-size": "250m", diff --git a/docker-compose.yml b/docker-compose.yml index 87d719da..49901f61 100644 --- 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.0.1-beta.4 + image: skalenetwork/transaction-manager:2.1.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.0.1-beta.8 + image: skalenetwork/admin:2.3.0-beta.0 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.0.1-beta.8 + image: skalenetwork/admin:2.3.0-beta.0 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.0.1-beta.8 + image: skalenetwork/admin:2.3.0-beta.0 network_mode: host tty: true environment: @@ -128,7 +128,7 @@ services: bounty: <<: *skale_base container_name: skale_bounty - image: skalenetwork/bounty-agent:2.0.1-beta.1 + image: skalenetwork/bounty-agent:2.1.1-beta.0 network_mode: host environment: SGX_SERVER_URL: ${SGX_SERVER_URL} @@ -144,7 +144,7 @@ services: watchdog: <<: *skale_base container_name: skale_watchdog - image: skalenetwork/watchdog:2.0.0-beta.2 + image: skalenetwork/watchdog:2.1.0-beta.0 network_mode: host environment: FLASK_APP_PORT: 3010 From e16632a1b957c25c299e0b2b760e98c303236999 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Thu, 27 Jan 2022 18:05:41 +0200 Subject: [PATCH 17/29] Update schain_precompiled_contracts.json --- schain_precompiled_contracts.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/schain_precompiled_contracts.json b/schain_precompiled_contracts.json index 267e7dd1..cf93c412 100644 --- a/schain_precompiled_contracts.json +++ b/schain_precompiled_contracts.json @@ -218,5 +218,14 @@ }, "startingBlock": "0x0" } + }, + "0000000000000000000000000000000000000019": { + "precompiled": { + "name": "getIMABLSPublicKey", + "linear": { + "base": 15, + "word": 0 + }, + "startingBlock": "0x0" } -} \ No newline at end of file +} From 2a35df9e3e8a4bb1d05dd9676528e6a33a5cf6e3 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Thu, 27 Jan 2022 18:46:20 +0200 Subject: [PATCH 18/29] Update schain_precompiled_contracts.json --- schain_precompiled_contracts.json | 1 + 1 file changed, 1 insertion(+) diff --git a/schain_precompiled_contracts.json b/schain_precompiled_contracts.json index cf93c412..5f50d467 100644 --- a/schain_precompiled_contracts.json +++ b/schain_precompiled_contracts.json @@ -227,5 +227,6 @@ "word": 0 }, "startingBlock": "0x0" + } } } From 7247c52deb75fe587d5f711aa5797bf523332c72 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Mon, 31 Jan 2022 16:06:00 +0200 Subject: [PATCH 19/29] Hotfix: update versions --- containers.json | 2 +- docker-compose.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/containers.json b/containers.json index 493c078e..a9676c12 100644 --- a/containers.json +++ b/containers.json @@ -1,7 +1,7 @@ { "schain": { "name": "skalenetwork/schain", - "version": "3.14.0-beta.0", + "version": "3.14.1-beta.0", "custom_args": { "ulimits_list": [ { diff --git a/docker-compose.yml b/docker-compose.yml index 49901f61..7cf6539d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.3.0-beta.0 + image: skalenetwork/admin:2.3.0-beta.2 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.3.0-beta.0 + image: skalenetwork/admin:2.3.0-beta.2 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.3.0-beta.0 + image: skalenetwork/admin:2.3.0-beta.2 network_mode: host tty: true environment: From 040718b536f611707213d88a3af28dd899e6f4ae Mon Sep 17 00:00:00 2001 From: badrogger Date: Wed, 9 Feb 2022 15:21:21 +0000 Subject: [PATCH 20/29] Update TM and skale-admin --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7cf6539d..065a4fd9 100644 --- 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.0-beta.0 + image: skalenetwork/transaction-manager:2.1.0-beta.1 network_mode: host tty: true environment: @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.3.0-beta.2 + image: skalenetwork/admin:2.3.0-beta.4 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.3.0-beta.2 + image: skalenetwork/admin:2.3.0-beta.4 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.3.0-beta.2 + image: skalenetwork/admin:2.3.0-beta.4 network_mode: host tty: true environment: From 7581d56d69cd5af9ca3b02e710362e9a2e760710 Mon Sep 17 00:00:00 2001 From: badrogger Date: Wed, 23 Mar 2022 15:42:01 +0000 Subject: [PATCH 21/29] Update beta to V2 versions --- containers.json | 4 ++-- docker-compose.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/containers.json b/containers.json index a9676c12..0db2078c 100644 --- a/containers.json +++ b/containers.json @@ -1,7 +1,7 @@ { "schain": { "name": "skalenetwork/schain", - "version": "3.14.1-beta.0", + "version": "3.14.9-stable.0", "custom_args": { "ulimits_list": [ { @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.1.0-beta.0", + "version": "1.1.2-beta.0", "custom_args": { "logs": { "max-size": "250m", diff --git a/docker-compose.yml b/docker-compose.yml index 065a4fd9..317a8bd0 100644 --- 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.0-beta.1 + image: skalenetwork/transaction-manager:2.1.0 network_mode: host tty: true environment: @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.3.0-beta.4 + image: skalenetwork/admin:2.3.0 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.3.0-beta.4 + image: skalenetwork/admin:2.3.0 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.3.0-beta.4 + image: skalenetwork/admin:2.3.0 network_mode: host tty: true environment: @@ -128,7 +128,7 @@ services: bounty: <<: *skale_base container_name: skale_bounty - image: skalenetwork/bounty-agent:2.1.1-beta.0 + image: skalenetwork/bounty-agent:2.1.1-stable.0 network_mode: host environment: SGX_SERVER_URL: ${SGX_SERVER_URL} @@ -144,7 +144,7 @@ services: watchdog: <<: *skale_base container_name: skale_watchdog - image: skalenetwork/watchdog:2.1.0-beta.0 + image: skalenetwork/watchdog:2.1.0-stable.0 network_mode: host environment: FLASK_APP_PORT: 3010 From c3f63c45ddb36fb9d53cfc248ee7cdead339404a Mon Sep 17 00:00:00 2001 From: badrogger Date: Wed, 30 Mar 2022 09:29:07 +0000 Subject: [PATCH 22/29] Upgrade to latest V2 release candidates --- containers.json | 4 ++-- docker-compose.yml | 6 +++--- static_schain_params.json | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/containers.json b/containers.json index 0db2078c..8282681a 100644 --- a/containers.json +++ b/containers.json @@ -1,7 +1,7 @@ { "schain": { "name": "skalenetwork/schain", - "version": "3.14.9-stable.0", + "version": "3.14.9-stable.1", "custom_args": { "ulimits_list": [ { @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.1.2-beta.0", + "version": "1.1.3-beta.1", "custom_args": { "logs": { "max-size": "250m", diff --git a/docker-compose.yml b/docker-compose.yml index 317a8bd0..c556c22f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.3.0 + image: skalenetwork/admin:2.3.1 cpu_shares: 192 network_mode: host tty: true @@ -67,7 +67,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.3.0 + image: skalenetwork/admin:2.3.1 network_mode: host tty: true cap_add: @@ -100,7 +100,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.3.0 + image: skalenetwork/admin:2.3.1 network_mode: host tty: true environment: diff --git a/static_schain_params.json b/static_schain_params.json index b09a9270..1a48958e 100644 --- a/static_schain_params.json +++ b/static_schain_params.json @@ -62,7 +62,6 @@ "schain_cmd": [ "-v 3", "--web3-trace", - "--enable-debug-behavior-apis", "--aa no" ] } From 3555e031ee0b0902665e75d6416401f426d0add8 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Wed, 6 Apr 2022 15:57:22 +0100 Subject: [PATCH 23/29] Update IMA version, update restart policy --- containers.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/containers.json b/containers.json index 8282681a..795ccae1 100644 --- a/containers.json +++ b/containers.json @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.1.3-beta.1", + "version": "1.1.4-beta.1", "custom_args": { "logs": { "max-size": "250m", @@ -42,7 +42,6 @@ }, "args": { "restart_policy": { - "MaximumRetryCount": 10, "Name": "on-failure" }, "network": "host" From 1414fdf9b6990cf907fb63c4857b982080961110 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Wed, 6 Apr 2022 16:05:51 +0100 Subject: [PATCH 24/29] Hotfix: change IMA restart policy --- containers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/containers.json b/containers.json index 795ccae1..2789e0b9 100644 --- a/containers.json +++ b/containers.json @@ -42,7 +42,7 @@ }, "args": { "restart_policy": { - "Name": "on-failure" + "Name": "unless-stopped" }, "network": "host" } From 261bb2617ff0266424ddb4c95a01697c879f1de6 Mon Sep 17 00:00:00 2001 From: badrogger Date: Wed, 13 Apr 2022 13:24:49 +0000 Subject: [PATCH 25/29] Update beta hotfix --- containers.json | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers.json b/containers.json index 2789e0b9..6c7ed51b 100644 --- a/containers.json +++ b/containers.json @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.1.4-beta.1", + "version": "1.3.0-beta.3", "custom_args": { "logs": { "max-size": "250m", diff --git a/docker-compose.yml b/docker-compose.yml index c556c22f..35cb803e 100644 --- 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.0 + image: skalenetwork/transaction-manager:2.1.0-beta.3 network_mode: host tty: true environment: From 87fa1dce880e05847fdce25470c81e72843b7e01 Mon Sep 17 00:00:00 2001 From: badrogger Date: Mon, 18 Apr 2022 16:06:10 +0000 Subject: [PATCH 26/29] Rename beta versions of TM and IMA --- containers.json | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers.json b/containers.json index 6c7ed51b..1600ebb1 100644 --- a/containers.json +++ b/containers.json @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.3.0-beta.3", + "version": "1.3.0-stable.0", "custom_args": { "logs": { "max-size": "250m", diff --git a/docker-compose.yml b/docker-compose.yml index 35cb803e..a7aa8d4f 100644 --- 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.0-beta.3 + image: skalenetwork/transaction-manager:2.1.1 network_mode: host tty: true environment: From 283d269b89c67cedf274be2578b8af00590799f2 Mon Sep 17 00:00:00 2001 From: badrogger Date: Tue, 20 Sep 2022 12:19:11 +0000 Subject: [PATCH 27/29] Sync beta with stable --- containers.json | 4 ++-- docker-compose.yml | 16 ++++++++++------ schain_base_config.json | 3 ++- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/containers.json b/containers.json index 1600ebb1..3ca53b13 100644 --- a/containers.json +++ b/containers.json @@ -1,7 +1,7 @@ { "schain": { "name": "skalenetwork/schain", - "version": "3.14.9-stable.1", + "version": "3.14.15-stable.1", "custom_args": { "ulimits_list": [ { @@ -33,7 +33,7 @@ }, "ima": { "name": "skalenetwork/ima", - "version": "1.3.0-stable.0", + "version": "1.3.3-stable.0", "custom_args": { "logs": { "max-size": "250m", diff --git a/docker-compose.yml b/docker-compose.yml index a7aa8d4f..00543b56 100644 --- 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.1 + image: skalenetwork/transaction-manager:2.1.3 network_mode: host tty: true environment: @@ -29,7 +29,7 @@ services: skale-admin: <<: *skale_base container_name: skale_admin - image: skalenetwork/admin:2.3.1 + image: skalenetwork/admin:2.3.10 cpu_shares: 192 network_mode: host tty: true @@ -52,6 +52,7 @@ services: MAX_ALLOWED_LOG_TIME_DIFF: 600 DISABLE_IMA: ${DISABLE_IMA} ENV_TYPE: ${ENV_TYPE} + ALLOWED_TS_DIFF: 300 command: "python3 admin.py" volumes: - /var/run/skale:/var/run/skale @@ -67,7 +68,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.3.1 + image: skalenetwork/admin:2.3.10 network_mode: host tty: true cap_add: @@ -91,6 +92,7 @@ services: DEFAULT_GAS_LIMIT: ${DEFAULT_GAS_LIMIT} DEFAULT_GAS_PRICE_WEI: ${DEFAULT_GAS_PRICE_WEI} ENV_TYPE: ${ENV_TYPE} + ALLOWED_TS_DIFF: 300 command: "gunicorn app:app -c gunicorn.conf.py" volumes: - /var/run/skale:/var/run/skale @@ -100,7 +102,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.3.1 + image: skalenetwork/admin:2.3.10 network_mode: host tty: true environment: @@ -128,7 +130,7 @@ services: bounty: <<: *skale_base container_name: skale_bounty - image: skalenetwork/bounty-agent:2.1.1-stable.0 + image: skalenetwork/bounty-agent:2.1.1-stable.1 network_mode: host environment: SGX_SERVER_URL: ${SGX_SERVER_URL} @@ -137,6 +139,7 @@ services: DISABLE_DRY_RUN: ${DISABLE_DRY_RUN} DEFAULT_GAS_LIMIT: ${DEFAULT_GAS_LIMIT} DEFAULT_GAS_PRICE_WEI: ${DEFAULT_GAS_PRICE_WEI} + ALLOWED_TS_DIFF: 300 volumes: - ${SKALE_DIR}:/skale_vol - ${SKALE_DIR}/node_data:/skale_node_data @@ -144,9 +147,10 @@ services: watchdog: <<: *skale_base container_name: skale_watchdog - image: skalenetwork/watchdog:2.1.0-stable.0 + image: skalenetwork/watchdog:2.1.1-stable.0 network_mode: host environment: + ALLOWED_TS_DIFF: 300 FLASK_APP_PORT: 3010 FLASK_APP_HOST: "127.0.0.1" FLASK_DEBUG_MODE: "False" diff --git a/schain_base_config.json b/schain_base_config.json index 03473809..6b290072 100644 --- a/schain_base_config.json +++ b/schain_base_config.json @@ -20,7 +20,8 @@ "difficultyBoundDivisor": "0x0800", "durationLimit": "0x0d", "blockReward": "0x4563918244F40000", - "externalGasDifficulty": "0x01" + "externalGasDifficulty": "0x01", + "skaleDisableChainIdCheck": true }, "unddos": { "origins": [ From 62ccb51362a9623991d43db7b29202598fbc4677 Mon Sep 17 00:00:00 2001 From: badrogger Date: Tue, 20 Sep 2022 14:16:59 +0000 Subject: [PATCH 28/29] Update beta to 2.1 intermediate versions --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 00543b56..36b0740e 100644 --- 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.3 + image: skalenetwork/transaction-manager:2.1.4-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.3.10 + image: skalenetwork/admin:2.3.11-beta.0 cpu_shares: 192 network_mode: host tty: true @@ -68,7 +68,7 @@ services: skale-api: <<: *skale_base container_name: skale_api - image: skalenetwork/admin:2.3.10 + image: skalenetwork/admin:2.3.11-beta.0 network_mode: host tty: true cap_add: @@ -102,7 +102,7 @@ services: celery: <<: *skale_base container_name: celery - image: skalenetwork/admin:2.3.10 + image: skalenetwork/admin:2.3.11-beta.0 network_mode: host tty: true environment: @@ -130,7 +130,7 @@ services: bounty: <<: *skale_base container_name: skale_bounty - image: skalenetwork/bounty-agent:2.1.1-stable.1 + image: skalenetwork/bounty-agent:2.1.2-beta.0 network_mode: host environment: SGX_SERVER_URL: ${SGX_SERVER_URL} @@ -147,7 +147,7 @@ services: watchdog: <<: *skale_base container_name: skale_watchdog - image: skalenetwork/watchdog:2.1.1-stable.0 + image: skalenetwork/watchdog:2.1.1-beta.1 network_mode: host environment: ALLOWED_TS_DIFF: 300 From 684ead1953ac1c15289458215ab3737853dbebc7 Mon Sep 17 00:00:00 2001 From: Dmytro Date: Wed, 14 Dec 2022 18:14:48 +0000 Subject: [PATCH 29/29] Fix CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index d90e1e65..bcb3263c 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,3 +1,3 @@ -* @dmitry-tk @kladkogex +* @dmytrotkk @kladkogex *.md @skalenetwork/docowners /docs/ @skalenetwork/docowners