Update genesis, fix servs, fix CI (#4526)

massalabs · Nov 8, 2023 · dee3957 · dee3957
1 parent 6375704
commit dee3957
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main, staging, trying]
   pull_request:
-    branches: [main, 'testnet_*', 'securnet_wip']
+    branches: [main, 'testnet_*']
     types:
     - opened
     - reopened
@@ -37,7 +37,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "sanity"
-          save-if: ${{ github.ref_name == 'securnet_wip' }}
+          save-if: ${{ github.ref_name == 'main' }}
       - uses: actions-rs/cargo@v1
         with:
           command: fmt
@@ -59,7 +59,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "check"
-          save-if: ${{ github.ref_name == 'securnet_wip' }}
+          save-if: ${{ github.ref_name == 'main' }}
       - uses: arduino/setup-protoc@v1
         with:
           version: '3.x'
@@ -86,7 +86,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "clippy"
-          save-if: ${{ github.ref_name == 'securnet_wip' }}
+          save-if: ${{ github.ref_name == 'main' }}
       - uses: arduino/setup-protoc@v1
         with:
           version: '3.x'
@@ -194,7 +194,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "massa"
-          save-if: ${{ github.ref_name == 'securnet_wip' }}
+          save-if: ${{ github.ref_name == 'main' }}
       - uses: arduino/setup-protoc@v1
         with:
           version: '3.x'
@@ -273,7 +273,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           shared-key: "doc"
-          save-if: ${{ github.ref_name == 'securnet_wip' }}
+          save-if: ${{ github.ref_name == 'main' }}
       - uses: arduino/setup-protoc@v1
         with:
           version: '3.x'

diff --git a/massa-models/src/config/constants.rs b/massa-models/src/config/constants.rs
@@ -58,7 +58,7 @@ lazy_static::lazy_static! {
             )
         )
     } else {
-        MassaTime::from_millis(1699450200000) // Wednesday, November 8, 2023 13:30:00 AM UTC
+        MassaTime::from_millis(1699453800000) // Wednesday, November 8, 2023 14:30:00 AM UTC
     };
 
     /// TESTNET: time when the blockclique is ended.

diff --git a/massa-node/base_config/initial_ledger.json b/massa-node/base_config/initial_ledger.json
@@ -29,16 +29,6 @@
         "datastore": {},
         "bytecode": []
     },
-    "AU1EQeYwEWzixmLY2MLbSdp4QsWTzYTeN3XqH2t9yqrjBeXN3Mug": {
-        "balance": "1000000000",
-        "datastore": {},
-        "bytecode": []
-    },
-    "AU12r1iM79EcS3sa4dmtUp28TiaPxK1weQcLsATcFoynPdukjdMqM": {
-        "balance": "1000000000",
-        "datastore": {},
-        "bytecode": []
-    },
     "AU1LzG14pkp87tKDpbQPCjCnSEdww8KPeX1qaD4cxPzjJcd2fQWH": {
         "balance": "1000000000",
         "datastore": {},

diff --git a/massa-node/base_config/initial_peers.json b/massa-node/base_config/initial_peers.json
@@ -30,18 +30,6 @@
         },
         "category": "Bootstrap"
     },
-    "P1hdgsVsd4zkNp8cF1rdqqG6JPRQasAmx12QgJaJHBHFU1fRHEH": {
-        "listeners": {
-            "198.27.74.52:31244": "Tcp"
-        },
-        "category": "Bootstrap"
-    },
-    "P1gEdBVEbRFbBxBtrjcTDDK9JPbJFDay27uiJRE3vmbFAFDKNh7": {
-        "listeners": {
-            "54.36.174.177:31244": "Tcp"
-        },
-        "category": "Bootstrap"
-    },
     "P13Ykon8Zo73PTKMruLViMMtE2rEG646JQ4sCcee2DnopmVM3P5": {
         "listeners": {
             "51.75.60.228:31244": "Tcp"

diff --git a/massa-node/base_config/initial_rolls.json b/massa-node/base_config/initial_rolls.json
@@ -5,7 +5,5 @@
     "AU1jDpoDo1p4PU4KwFMWbP1xktueEEmkn9MVFbom5oxfXLCyT7BR": 1000,
     "AU12FHsSoETq67gF3eVAecRR8cmoLGhFErUm4Q524tEsuoaCg4tSH": 1000,
     "AU1r5GxEpBBGmtK7JY4LVHghjtr87jof5WkPh68oyddHRU32qct3": 1000,
-    "AU1EQeYwEWzixmLY2MLbSdp4QsWTzYTeN3XqH2t9yqrjBeXN3Mug": 1000,
-    "AU12r1iM79EcS3sa4dmtUp28TiaPxK1weQcLsATcFoynPdukjdMqM": 1000,
     "AU1LzG14pkp87tKDpbQPCjCnSEdww8KPeX1qaD4cxPzjJcd2fQWH": 1000
 }