Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.3 release beta #580

Merged
merged 29 commits into from
Jan 23, 2024
Merged

2.3 release beta #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2af4473
Update to 2.2.1 release candidates
badrogger Jul 17, 2023
cc2a3e5
Merge pull request #541 from skalenetwork/2.2.1-versions
badrogger Jul 18, 2023
d7d2b16
Exclude /mnt from node exporter filesystem collector
badrogger Aug 3, 2023
42cf61a
Update static_params.yaml
DmytroNazarenko Aug 29, 2023
409a459
Merge pull request #545 from skalenetwork/enhancement/add-pow-timestamp
DmytroNazarenko Aug 29, 2023
4970992
Set storage destruction ts to 0
badrogger Sep 7, 2023
ea72b32
Merge pull request #546 from skalenetwork/destruction-at-zero
DmytroNazarenko Sep 7, 2023
0d15273
Revert "Set storage destruction ts to 0"
DmytroNazarenko Sep 11, 2023
62e6257
Merge pull request #547 from skalenetwork/revert-546-destruction-at-zero
DmytroNazarenko Sep 11, 2023
2b480d9
Merge pull request #544 from skalenetwork/exlude-mnt-from-node-export…
dmytrotkk Sep 11, 2023
c721c45
Bump skale-admin to 2.5.1-develop.5
badrogger Sep 20, 2023
7fdb7d9
Bump skaled to 3.17.0-beta.10
badrogger Sep 20, 2023
2b695f9
Merge pull request #553 from skalenetwork/bump-skale-admin
badrogger Sep 20, 2023
ea1e2ae
Bump admin to 2.5.1-develop.7
badrogger Sep 28, 2023
21c4363
Merge pull request #557 from skalenetwork/bump-admin
badrogger Sep 28, 2023
9de18ad
Update develop to 2.2.1 stable versions
badrogger Oct 23, 2023
2e5d947
Merge pull request #558 from skalenetwork/update-develop
DmytroNazarenko Oct 23, 2023
dd0b5ed
Sync develop with stable
badrogger Jan 12, 2024
35340b2
Merge pull request #576 from skalenetwork/sync-develop-with-stable
badrogger Jan 15, 2024
b6b318b
Update ima-agent to 2.1.0-beta.1
badrogger Jan 15, 2024
9458d79
Merge branch 'develop' into update-ima-to-2-1-0-beta-1
badrogger Jan 15, 2024
7b21d03
Merge pull request #577 from skalenetwork/update-ima-to-2-1-0-beta-1
dmytrotkk Jan 15, 2024
5467242
Add 2.3 release patch timestamps
badrogger Jan 16, 2024
c2f98fb
Update node components to 2.3 release versions.
badrogger Jan 22, 2024
ecca77c
Update skaled to 2.3 release
badrogger Jan 22, 2024
31aa93f
Set all 2.3 patch timestamp to 0
badrogger Jan 23, 2024
6e8045f
Merge pull request #579 from skalenetwork/update-to-2.3
DmytroNazarenko Jan 23, 2024
18bbaf4
Merge pull request #578 from skalenetwork/add-2-3-release-patch-ts
DmytroNazarenko Jan 23, 2024
23c7c36
Merge branch 'develop' into merge-develop-2.3
badrogger Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions containers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"schain": {
"name": "skalenetwork/schain",
"version": "3.16.1",
"version": "3.18.0-beta.0",
"custom_args": {
"ulimits_list": [
{
Expand Down Expand Up @@ -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",
Expand Down
16 changes: 9 additions & 7 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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}
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
44 changes: 41 additions & 3 deletions ima_migration_schedule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
34 changes: 29 additions & 5 deletions static_params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down