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.

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

Sync develop with stable #576

Merged
merged 1 commit into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"schain": {
"name": "skalenetwork/schain",
"version": "3.17.0",
"version": "3.17.1",
"custom_args": {
"ulimits_list": [
{
Expand Down Expand Up @@ -33,8 +33,8 @@
},
"ima": {
"name": "skalenetwork/ima",
"version": "2.0.0",
"new_version": "2.0.0",
"version": "1.5.0-beta.1",
"new_version": "2.0.2",
"custom_args": {
"logs": {
"max-size": "250m",
Expand Down
8 changes: 5 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
skale-admin:
<<: *skale_base
container_name: skale_admin
image: skalenetwork/admin:2.5.1
image: skalenetwork/admin:2.5.4
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.1
image: skalenetwork/admin:2.5.4
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.1
image: skalenetwork/admin:2.5.4
network_mode: host
tty: true
environment:
Expand Down
44 changes: 41 additions & 3 deletions ima_migration_schedule.yaml
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
30 changes: 15 additions & 15 deletions static_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ envs:
revertableFSPatchTimestamp: 1681473600
contractStoragePatchTimestamp: 1681732800
verifyDaSigsPatchTimestamp: 1681300800
skipInvalidTransactionsPatchTimestamp: 1697457600
storageDestructionPatchTimestamp: 0
powCheckPatchTimestamp: 0
storageDestructionPatchTimestamp: 1703851200
powCheckPatchTimestamp: 1703592000
skipInvalidTransactionsPatchTimestamp: 1703764800
snapshotIntervalSec: 86400
emptyBlockIntervalMs: 10000
snapshotDownloadTimeout: 18000
Expand Down Expand Up @@ -130,9 +130,9 @@ envs:
revertableFSPatchTimestamp: 1678100400
contractStoragePatchTimestamp: 1678100400
verifyDaSigsPatchTimestamp: 1678100400
storageDestructionPatchTimestamp: 0
skipInvalidTransactionsPatchTimestamp: 1697457600
powCheckPatchTimestamp: 0
storageDestructionPatchTimestamp: 1702393200
powCheckPatchTimestamp: 1702296000
skipInvalidTransactionsPatchTimestamp: 1702382400
snapshotIntervalSec: 86400
emptyBlockIntervalMs: 10000
snapshotDownloadTimeout: 18000
Expand Down Expand Up @@ -215,20 +215,20 @@ envs:
docker-compose: 1.27.4

schain:
contractStorageZeroValuePatchTimestamp: 1000000
revertableFSPatchTimestamp: 1000000
contractStoragePatchTimestamp: 1000000
verifyDaSigsPatchTimestamp: 1000000
storageDestructionPatchTimestamp: 1000000
skipInvalidTransactionsPatchTimestamp: 1697457600
powCheckPatchTimestamp: 1000000
contractStorageZeroValuePatchTimestamp: 1691146800
revertableFSPatchTimestamp: 1691146800
contractStoragePatchTimestamp: 1691146800
verifyDaSigsPatchTimestamp: 1691146800
storageDestructionPatchTimestamp: 1699618500
powCheckPatchTimestamp: 1699625700
skipInvalidTransactionsPatchTimestamp: 1699632900
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 @@ -310,7 +310,7 @@ envs:
verifyDaSigsPatchTimestamp: 1000000
storageDestructionPatchTimestamp: 1000000
powCheckPatchTimestamp: 1000000
skipInvalidTransactionsPatchTimestamp: 1697457600
skipInvalidTransactionsPatchTimestamp: 1000000
snapshotIntervalSec: 3600
emptyBlockIntervalMs: 10000
snapshotDownloadTimeout: 18000
Expand Down
Loading