chore: 1.6.0 runtime

.dockerignore

@@ -2,6 +2,8 @@
 .github
 .gitignore
 .gitlab-ci.yml
+.rustfmt.toml
+**/.maintain*
 **/target*
 **/*.rs.bk
 *.iml

.gitlab-ci.yml

@@ -34,7 +34,7 @@ test-features:
 
 build:
   image:
-    name: amazon/aws-cli:2.2.38
+    name: kiltprotocol/kilt-ci:2.2.38
     entrypoint: [""]
   stage: build
   only:
@@ -46,7 +46,6 @@ build:
     DOCKER_HUB_PARACHAIN: "kiltprotocol/kilt-node"
     DOCKER_HUB_STANDALONE: "kiltprotocol/mashnet-node"
   before_script:
-    - amazon-linux-extras install docker
     - aws --version
     - docker --version
   script:

.maintain/build-image.sh

@@ -2,6 +2,23 @@
 
 target_tag=$1
 
+docker build \
+    --target builder \
+    --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
+    -t $AWS_REGISTRY/kilt-parachain/collator:builder \
+    .
+docker push $AWS_REGISTRY/kilt-parachain/collator:builder
+
 # build parachain image and standalone image
-docker build --cache-from $AWS_REGISTRY/kilt-parachain/collator:$target_tag --build-arg NODE_TYPE=kilt-parachain -t local/kilt-node:$target_tag .
-docker build --cache-from $AWS_REGISTRY/kilt/prototype-chain:$target_tag --build-arg NODE_TYPE=mashnet-node -t local/mashnet-node:$target_tag .
+docker build \
+    --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
+    --cache-from $AWS_REGISTRY/kilt-parachain/collator:$target_tag \
+    --build-arg NODE_TYPE=kilt-parachain \
+    -t local/kilt-node:$target_tag \
+    .
+docker build \
+    --cache-from $AWS_REGISTRY/kilt-parachain/collator:builder \
+    --cache-from $AWS_REGISTRY/kilt/prototype-chain:$target_tag \
+    --build-arg NODE_TYPE=mashnet-node \
+    -t local/mashnet-node:$target_tag \
+    .

.maintain/ci.Dockerfile

@@ -0,0 +1,3 @@
+FROM amazon/aws-cli:2.2.38
+
+RUN amazon-linux-extras install docker

.maintain/reset-spec/app.py

@@ -9,6 +9,7 @@
 import typing
 import logging
 import tempfile
+import shutil
 
 logger = logging.getLogger(__name__)
 
@@ -45,6 +46,8 @@ def run_check_process(cmd: typing.List[str]):
 def make_custom_spec(tmp_dir, docker_img, plain_file, out_file, update_spec, spec, runtime=None):
     """Build a custom spec by exporting a chain spec and customize it using a python script.
     """
+    logger.debug("using directory '%s'", tmp_dir)
+
     cmd_plain_spec = base_docker_run_cmd() + [docker_img, "build-spec",
                                               "--chain", spec, "--disable-default-bootnode"]
 
@@ -55,6 +58,12 @@ def make_custom_spec(tmp_dir, docker_img, plain_file, out_file, update_spec, spe
 
     in_json = json.loads(process.stdout)
 
+    if args.debug:
+        with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", suffix=".json", delete=False) as tf:
+            json.dump(in_json, tf, indent="  ")
+            tf_name = tf.name
+        logger.debug("Writing unmodified spec to '%s'", tf_name)
+
     try:
         update_spec(in_json)
     except KeyError as e:
@@ -117,17 +126,17 @@ def make_native(docker_img, out_file, chain, runtime):
     import peregrine_stg_kilt
     import peregrine_stg_relay
 
-    logging.basicConfig(format='%(asctime)s:%(levelname)s: %(message)s',
-                        datefmt='%m-%d-%Y %H:%M:%S', level=logging.DEBUG)
+    logging.basicConfig(format="%(asctime)s:%(levelname)s: %(message)s",
+                        datefmt="%m-%d-%Y %H:%M:%S", level=logging.DEBUG)
 
     parser = argparse.ArgumentParser(
         description=("Reset the chainspec for our networks."
                      "VERIFY THAT THE SPEC IS CORRECT AFTER USE!!"
                      "Make sure that the current directory is the project root."),
         epilog="")
-    parser.add_argument('-v', '--verbose', action='count', default=0)
-    # parser.add_argument('-d', '--debug', action='store_true',
-    #                     default=False, help="enable debug mode, don't delete tmp files.")
+    parser.add_argument("-v", "--verbose", action="count", default=0)
+    parser.add_argument("-d", "--debug", action="store_true", dest="debug",
+                        default=False, help="enable debug mode, don't delete tmp files.")
 
     parser.add_argument("--image", "-i", dest="image", required=True,
                         help="docker image to use for building chain spec")
@@ -167,43 +176,46 @@ def make_native(docker_img, out_file, chain, runtime):
         make_native(args.image, SPIRITNET_KILT, "spiritnet-new", "spiritnet")
 
     if args.peregrine:
-        with tempfile.TemporaryDirectory() as tmpdirname:
-            make_custom_spec(
-                tmpdirname, args.image, "peregrine_kilt.plain.json",
-                PERE_KILT, peregrine_kilt.update_spec, "peregrine-new", "peregrine"
-            )
+        tmpdirname = tempfile.mkdtemp(suffix="peregrine")
+        make_custom_spec(
+            tmpdirname, args.image, "peregrine_kilt.plain.json",
+            PERE_KILT, peregrine_kilt.update_spec, "peregrine-new", "peregrine"
+        )
 
     if args.peregrine_relay:
-        with tempfile.TemporaryDirectory() as tmpdirname:
-            make_custom_spec(
-                tmpdirname, args.image, "peregrine_relay.plain.json",
-                PERE_RELAY, peregrine_relay.update_spec, "westend-local"
-            )
+        tmpdirname = tempfile.mkdtemp(suffix="peregrine_relay")
+        make_custom_spec(
+            tmpdirname, args.image, "peregrine_relay.plain.json",
+            PERE_RELAY, peregrine_relay.update_spec, "westend-local"
+        )
 
     if args.peregrine_dev:
-        with tempfile.TemporaryDirectory() as tmpdirname:
-            make_custom_spec(
-                tmpdirname, args.image, "peregrine_dev_kilt.plain.json",
-                PERE_DEV_KILT, peregrine_dev_kilt.update_spec, "peregrine-new", "peregrine"
-            )
+        tmpdirname = tempfile.mkdtemp(suffix="peregrine_dev")
+        make_custom_spec(
+            tmpdirname, args.image, "peregrine_dev_kilt.plain.json",
+            PERE_DEV_KILT, peregrine_dev_kilt.update_spec, "peregrine-new", "peregrine"
+        )
 
     if args.peregrine_relay_dev:
-        with tempfile.TemporaryDirectory() as tmpdirname:
-            make_custom_spec(
-                tmpdirname, args.image, "peregrine_dev_relay.plain.json",
-                PERE_DEV_RELAY, peregrine_dev_relay.update_spec, "westend-local"
-            )
+        tmpdirname = tempfile.mkdtemp(suffix="peregrine_relay_dev")
+        make_custom_spec(
+            tmpdirname, args.image, "peregrine_dev_relay.plain.json",
+            PERE_DEV_RELAY, peregrine_dev_relay.update_spec, "westend-local"
+        )
 
     if args.peregrine_stg:
-        with tempfile.TemporaryDirectory() as tmpdirname:
-            make_custom_spec(
-                tmpdirname, args.image, "peregrine_stg.plain.json",
-                PERE_STG_KILT, peregrine_stg_kilt.update_spec, "peregrine-new", "peregrine"
-            )
+        tmpdirname = tempfile.mkdtemp(suffix="peregrine_stg")
+        make_custom_spec(
+            tmpdirname, args.image, "peregrine_stg.plain.json",
+            PERE_STG_KILT, peregrine_stg_kilt.update_spec, "peregrine-new", "peregrine"
+        )
 
     if args.peregrine_relay_stg:
-        with tempfile.TemporaryDirectory() as tmpdirname:
-            make_custom_spec(
-                tmpdirname, args.image, "peregrine_stg_relay.plain.json",
-                PERE_STG_RELAY, peregrine_stg_relay.update_spec, "westend-local"
-            )
+        tmpdirname = tempfile.mkdtemp(suffix="peregrine_relay_stg")
+        make_custom_spec(
+            tmpdirname, args.image, "peregrine_stg_relay.plain.json",
+            PERE_STG_RELAY, peregrine_stg_relay.update_spec, "westend-local"
+        )
+
+    if tmpdirname is not None and not args.debug:
+        shutil.rmtree(tmpdirname)

.maintain/reset-spec/peregrine_dev_relay.py

@@ -88,7 +88,7 @@ def update_spec(input: typing.Dict):
             "max_upward_message_size": 51200,
             "max_upward_message_num_per_candidate": 10,
             "hrmp_max_message_num_per_candidate": 10,
-            "validation_upgrade_frequency": 240,
+            "validation_upgrade_cooldown": 240,
             "validation_upgrade_delay": 120,
             "max_pov_size": 5242880,
             "max_downward_message_size": 51200,

.maintain/reset-spec/peregrine_stg_kilt.py

@@ -6,18 +6,17 @@ def update_spec(input: typing.Dict):
     acc_col_2 = "5FxhtaNtvGWTUQzmqq8NbKVVvz8AiXvaXxnSs8WbfBXYs79M"
     # not an initial collator
     acc_col_3 = "5CvmyN8kLcPKNg98A6nMmrPDqoNN8hJrmFfoYyCesCmfd3se"
-    para_id = 2001
+    para_id = 2000
 
     input.update({
         "bootNodes": [
-            "/dns4/bootnodes.kilt.io/tcp/30370/p2p/12D3KooWCAK9CjW1abcSx1UwVRSoyAYTR3AzS6qHnG9pddeU2Sra",
-            "/dns4/bootnodes.kilt.io/tcp/30371/p2p/12D3KooWLSzt9LjJwvQrZmM3AW6cR5ypVFHpmYJCRKs4HWFmTj5a",
-            "/dns4/bootnodes.kilt.io/tcp/30372/p2p/12D3KooWPo4pdXrg6E5vWzjRD4dFAWHz3YEsJZj3CDPcMa2iCPkX",
+            "/dns4/eyrie-1.kilt.io/tcp/30340/p2p/12D3KooWDRzUz3SenRC737aFrY1aPAVbiioqVMUL7otbupWtuk3B",
+            "/dns4/eyrie-2.kilt.io/tcp/30341/p2p/12D3KooWLSzt9LjJwvQrZmM3AW6cR5ypVFHpmYJCRKs4HWFmTj5a",
         ],
         "chainType": "Live",
         "name": "KILT Peregrine Stagenet",
         "id": "peregrine_stg_kilt",
-        "protocolId": "pkilt2",
+        "protocolId": "pkilt4",
         "para_id": para_id,
         "telemetryEndpoints": [
             [