Merge branch 'main' into al-88-add-remove-invulnerables

.github/workflows/gitspiegel-trigger.yml

@@ -0,0 +1,20 @@
+name: gitspiegel sync
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - unlocked
+      - ready_for_review
+      - reopened
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger sync via API
+        run: |
+          curl --fail-with-body -XPOST "https://gitspiegel.parity-prod.parity.io/api/v1/mirror/${{ github.repository }}/pull/${{ github.event.number }}" \
+           -H "Content-Type: application/json" \
+           -H "x-auth: ${{ secrets.GITSPIEGEL_TOKEN }}"

.gitlab-ci.yml

@@ -111,14 +111,6 @@ deploy-to-versi:
     DOMAIN: parity-versi
     APP: testnet-manager
 
-deploy-to-wococo:
-  <<:              *release-refs
-  extends: .deploy-with-argocd
-  environment: parity-testnet-wococo
-  variables:
-    DOMAIN: parity-testnet
-    APP: testnet-manager-wococo
-
 deploy-to-rococo:
   <<:              *release-refs
   extends: .deploy-with-argocd

app/lib/network_utils.py

@@ -454,7 +454,7 @@ def list_parachains():
     collator_pods = list_collator_pods()
     # If the paraId is not set on pod labels, we fall back to 0
     cluster_parachain_tuple_set = set(
-        map(lambda pod: (pod.metadata.labels.get('paraId', '0'), pod.metadata.labels.get('chain')), collator_pods))
+        map(lambda pod: (int(pod.metadata.labels.get('paraId', '0')), pod.metadata.labels.get('chain')), collator_pods))
 
     parachains = {}
     for cluster_parachain_tuple in cluster_parachain_tuple_set:
@@ -470,16 +470,20 @@ def list_parachains():
     parachain_leases_count = get_all_parachain_leases_count(substrate_client)
     parachain_current_code_hashes = get_all_parachain_current_code_hashes(substrate_client)
     parachain_heads = get_all_parachain_heads(substrate_client)
-
     for para_id in para_ids:
+        if para_id in parachains and 'name' in parachains[para_id]:
+            para_name = parachains[para_id]['name']
+            para_location = parachains[para_id]['location']
+        else:
+            para_name = relay_chain_network_name + '-para-' + para_id
+            para_location = 'external'
         parachains[para_id] = {
-            'name': relay_chain_network_name + '-para-' + str(para_id) if not parachains.get(para_id) else parachains[para_id][
-                'name'],
+            'name': para_name,
+            'location': para_location,
             'lifecycle': parachain_lifecycles.get(para_id),
             'leases_count': parachain_leases_count.get(para_id),
             'current_code_hash': parachain_current_code_hashes.get(para_id),
-            'head': parachain_heads.get(para_id),
-            'location': 'external ' if not parachains.get(para_id) else parachains[para_id]['location'],
+            'head': parachain_heads.get(para_id)
         }
     return parachains
 

app/templates/validators.html

@@ -43,7 +43,7 @@ <h3>{{ network_name.capitalize() }} Validators : {{ external_validator_count }}
             <td><a href="/nodes/{{ validator.name }}">{{ validator.name }}</a></td>
             <td><a target="_blank" href="{{ node_logs_link | replace('{node}',validator.name) }}">🔎</a></td>
             {% else %}
-            <td>{{ validator.name }}/td>
+            <td>{{ validator.name }}</td>
             <td></td>
             {% endif %}
             <td>{{ validator.address }}</td>

local-kubernetes/Makefile

@@ -1,14 +1,22 @@
 # ============================================================================================
-# Validator-manager Quick Deploy Makefile for Development and Testing
+# Testnet Manager Quick Deploy Makefile for Development and Testing
 # ============================================================================================
 
 KUBERNETES_CONTEXT = minikube #  minikube or rancher-desktop
 # rococo or wococo (don't put space at the end of the variable it will be used as is)
 CHAIN_NAMESPACE = rococo
+# docker or podman
+MINIKUBE_DRIVER = docker
 
 # ============================================================================================
 
-all: kube check build install
+ifeq ($(MINIKUBE_DRIVER),podman)
+	TARGETS := kube_minikube-podman check install
+else
+	TARGETS := kube check install
+endif
+
+all: $(TARGETS)
 
 # ============================================================================================
 
@@ -37,17 +45,21 @@ setup: setup_${KUBERNETES_CONTEXT}
 
 setup_minikube:
 	@kubectl --context ${KUBERNETES_CONTEXT} apply -f ./kube-setup
+	@echo "Waiting 20 seconds for chainspec pod readiness before continuing"
+	@sleep 20
 
 setup_rancher-desktop:
 	@kubectl --context ${KUBERNETES_CONTEXT} apply -f ./kube-setup -f ./rancher-desktop/kube-setup
+	@echo "Waiting 20 seconds for chainspec pod readiness before continuing"
+	@sleep 20
 
 build: check build_${KUBERNETES_CONTEXT}
 
 build_minikube:
-	cd ../. && minikube image build . -t local/testnet-manager
+	cd ../. && minikube image build . -t localhost/testnet-manager
 
 build_rancher-desktop:
-	cd ../. && docker image build -t local/testnet-manager:latest .
+	cd ../. && docker image build -t localhost/testnet-manager:latest .
 
 # ============================================================================================
 
@@ -108,4 +120,4 @@ uninstall: check
 	@kubectl --context ${KUBERNETES_CONTEXT} delete pvc -n ${CHAIN_NAMESPACE} --all
 
 cleanup: check
-	@kubectl --context ${KUBERNETES_CONTEXT} delete namespace ${CHAIN_NAMESPACE}
+	@kubectl --context ${KUBERNETES_CONTEXT} delete namespace rococo wococo

local-kubernetes/README.md

@@ -1,7 +1,7 @@
 ## Requirements
 
 1. Helm
-    a. Helmdiff
+    a. Helm diff plugin
     b. Helmfile
 2. Minikube or Rancher-desktop
 
@@ -46,7 +46,7 @@ make rpc
 This command will open browser and port-forward the 9944
 > Note: you should have port `9944` free in your host before running `make rpc`
 
-### Validator-manager web endpoint
+### Testnet Manager web endpoint
 Run:
 ```
 make web

local-kubernetes/charts/values-moonbase-collator.yml

@@ -30,9 +30,6 @@ node:
     chainKeystore: *chainKeystore
   persistGeneratedNodeKey: true
   allowUnsafeRpcMethods: true
-  # To be removed once https://github.com/moonbeam-foundation/moonbeam/pull/2359
-  # is included in release
-  legacyRpcFlags: true
   flags:
     - "--allow-private-ipv4"
 

local-kubernetes/charts/values-testnet-manager.yml

@@ -1,5 +1,5 @@
 image:
-  repository: "local/testnet-manager"
+  repository: "localhost/testnet-manager"
   tag: latest
   pullPolicy: IfNotPresent
 

skaffold.yaml

@@ -4,7 +4,7 @@ metadata:
   name: testnet-manager
 build:
   artifacts:
-    - image: local/testnet-manager
+    - image: localhost/testnet-manager
       docker: {}
   local:
     useBuildkit: true

tests/stash_account_test.py

@@ -26,7 +26,7 @@ def tearDown(self):
     def test_get_account_funds(self):
         alice_key = Keypair.create_from_uri("//Alice")
         alice_funds = get_account_funds(self.polkadot_rpc_ws_url, alice_key.ss58_address)
-        self.assertEqual(alice_funds, 10000000000000000, "Alice's funds successfully retrieved")
+        self.assertEqual(alice_funds, 1000000000000000000, "Alice's funds successfully retrieved")
 
 if __name__ == '__main__':
     unittest.main()