From 34b0f290fa397887d57fe1b211e284e9cc386c92 Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Wed, 25 Oct 2023 12:18:23 +0300
Subject: [PATCH 01/54] add promise timeout when loading deployments

---
 .../playground/src/utils/load_deployment.ts   | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index afd184e2c3..e0d9c2a61f 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -21,14 +21,29 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
     machines.map(n => getGrid(grid.clientOptions, `${projectName}/${n}`)),
   )) as GridClient[];
 
-  const promises = machines.map((name, index) => {
-    return grids[index].machines.getObj(name).catch(e => {
+  const promises = machines.map(async (name, index) => {
+    const machinePromise = grids[index].machines.getObj(name);
+    const timeoutPromise = new Promise((resolve, reject) => {
+      setTimeout(() => {
+        reject(new Error("Timeout"));
+      }, 5000);
+    });
+
+    try {
+      const result = await Promise.race([machinePromise, timeoutPromise]);
+
+      if (result instanceof Error && result.message === "Timeout") {
+        console.log(`%c[Error] Timeout loading deployment with name ${name}`, "color: rgb(207, 102, 121)");
+        return null;
+      } else {
+        return result;
+      }
+    } catch (e) {
       console.log(
         `%c[Error] failed to load deployment with name ${name}:\n${normalizeError(e, "No errors were provided.")}`,
         "color: rgb(207, 102, 121)",
       );
-      return null;
-    });
+    }
   });
   const items = await Promise.all(promises);
   const vms = items
@@ -96,14 +111,28 @@ export async function loadK8s(grid: GridClient) {
     clusters.map(n => getGrid(grid.clientOptions, `${projectName}/${n}`)),
   )) as GridClient[];
 
-  const promises = clusters.map((name, index) => {
-    return grids[index].k8s.getObj(name).catch(e => {
+  const promises = clusters.map(async (name, index) => {
+    const clusterPromise = grids[index].k8s.getObj(name);
+    const timeoutPromise = new Promise((resolve, reject) => {
+      setTimeout(() => {
+        reject(new Error("Timeout"));
+      }, 5000);
+    });
+
+    try {
+      const result = await Promise.race([clusterPromise, timeoutPromise]);
+      if (result instanceof Error && result.message === "Timeout") {
+        console.log(`%c[Error] Timeout loading deployment with name ${name}`, "color: rgb(207, 102, 121)");
+        return null;
+      } else {
+        return result;
+      }
+    } catch (e) {
       console.log(
         `%c[Error] failed to load deployment with name ${name}:\n${normalizeError(e, "No errors were provided.")}`,
         "color: rgb(207, 102, 121)",
       );
-      return null;
-    });
+    }
   });
   const items = (await Promise.all(promises)) as any[];
   const k8s = items

From 6494387ea739b7530ae9bd5c53976eada5b25e8d Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Wed, 25 Oct 2023 17:36:41 +0300
Subject: [PATCH 02/54] add failed deployments with node id in vm, k8s

---
 .../src/components/k8s_deployment_table.vue   | 46 ++++++++++++++++
 .../src/components/vm_deployment_table.vue    | 55 +++++++++++++++++--
 .../playground/src/utils/load_deployment.ts   | 14 ++++-
 3 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/packages/playground/src/components/k8s_deployment_table.vue b/packages/playground/src/components/k8s_deployment_table.vue
index 4f848f3d77..9a3397b234 100644
--- a/packages/playground/src/components/k8s_deployment_table.vue
+++ b/packages/playground/src/components/k8s_deployment_table.vue
@@ -1,6 +1,27 @@
 <template>
   <v-alert v-if="!loading && count && items.length < count" type="warning" variant="tonal">
     Failed to load <strong>{{ count - items.length }}</strong> deployment{{ count - items.length > 1 ? "s" : "" }}.
+
+    <span>
+      This might happen because the node is down or it's not reachable
+      <span v-if="showEncryption"
+        >or the deployment{{ count - items.length > 1 ? "s are" : " is" }} encrypted by another key</span
+      >.
+    </span>
+    <v-icon class="custom-icon" @click="showDialog = true">mdi-file-document-outline </v-icon>
+
+    <v-dialog transition="dialog-bottom-transition" v-model="showDialog" persistent max-width="500px">
+      <v-card>
+        <v-card-title style="color: #ffcc00; font-weight: bold">Failed Deployments</v-card-title>
+        <v-divider color="#FFCC00" />
+        <v-card-text>
+          <div v-html="namesOfFailedDeployments"></div>
+        </v-card-text>
+        <v-card-actions class="justify-end">
+          <v-btn @click="showDialog = false" class="grey lighten-2 black--text" color="#FFCC00">Close</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
   </v-alert>
 
   <ListTable
@@ -65,6 +86,9 @@ import { getGrid, updateGrid } from "../utils/grid";
 import { loadK8s, mergeLoadedDeployments } from "../utils/load_deployment";
 
 const profileManager = useProfileManager();
+const namesOfFailedDeployments = ref("");
+const showDialog = ref(false);
+const showEncryption = ref(false);
 
 const props = defineProps<{
   projectName: string;
@@ -87,11 +111,33 @@ async function loadDeployments() {
   const chunk3 = await loadK8s(updateGrid(grid!, { projectName: "" }));
 
   const clusters = mergeLoadedDeployments(chunk1, chunk2, chunk3);
+  const failedDeployments = [
+    ...(Array.isArray((chunk1 as any).failedDeployments) ? (chunk1 as any).failedDeployments : []),
+    ...(Array.isArray((chunk2 as any).failedDeployments) ? (chunk2 as any).failedDeployments : []),
+    ...(Array.isArray((chunk3 as any).failedDeployments) ? (chunk3 as any).failedDeployments : []),
+  ];
+
+  namesOfFailedDeployments.value = formatFailedDeployments(failedDeployments as any);
   count.value = clusters.count;
   items.value = clusters.items;
   loading.value = false;
 }
 
+function formatFailedDeployments(failedDeployments: []) {
+  let formattedText = "";
+  for (const deployment of failedDeployments as { name: string; nodes: string[] }[]) {
+    if (deployment.nodes.length > 0) {
+      formattedText += `- ${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
+        ", ",
+      )}<br>`;
+    } else {
+      formattedText += `- <strong>${deployment.name}<br>`;
+      showEncryption.value = true;
+    }
+  }
+  return formattedText;
+}
+
 defineExpose({ loadDeployments });
 </script>
 
diff --git a/packages/playground/src/components/vm_deployment_table.vue b/packages/playground/src/components/vm_deployment_table.vue
index 07be97b507..d13938d8bc 100644
--- a/packages/playground/src/components/vm_deployment_table.vue
+++ b/packages/playground/src/components/vm_deployment_table.vue
@@ -1,13 +1,28 @@
 <template>
   <div>
     <v-alert v-if="!loading && count && items.length < count" type="warning" variant="tonal">
-      Failed to load <strong>{{ count - items.length }}</strong> deployment{{ count - items.length > 1 ? "s" : "" }};
+      Failed to load <strong>{{ count - items.length }}</strong> deployment{{ count - items.length > 1 ? "s" : "" }}.
+
       <span>
-        This might happen because the node is down or it's not reachable or the deployment{{
-          count - items.length > 1 ? "s are" : " is"
-        }}
-        encrypted by another key.
+        This might happen because the node is down or it's not reachable
+        <span v-if="showEncryption"
+          >or the deployment{{ count - items.length > 1 ? "s are" : " is" }} encrypted by another key</span
+        >.
       </span>
+      <v-icon class="custom-icon" @click="showDialog = true">mdi-file-document-outline </v-icon>
+
+      <v-dialog transition="dialog-bottom-transition" v-model="showDialog" persistent max-width="500px">
+        <v-card>
+          <v-card-title style="color: #ffcc00; font-weight: bold">Failed Deployments</v-card-title>
+          <v-divider color="#FFCC00" />
+          <v-card-text>
+            <div v-html="namesOfFailedDeployments"></div>
+          </v-card-text>
+          <v-card-actions class="justify-end">
+            <v-btn @click="showDialog = false" class="grey lighten-2 black--text" color="#FFCC00">Close</v-btn>
+          </v-card-actions>
+        </v-card>
+      </v-dialog>
     </v-alert>
 
     <ListTable
@@ -84,6 +99,9 @@ defineEmits<{ (event: "update:model-value", value: any[]): void }>();
 const loading = ref(false);
 const count = ref<number>();
 const items = ref<any[]>([]);
+const namesOfFailedDeployments = ref("");
+const showDialog = ref(false);
+const showEncryption = ref(false);
 
 onMounted(loadDeployments);
 async function loadDeployments() {
@@ -108,6 +126,12 @@ async function loadDeployments() {
   if (chunk3.count > 0) await grid!.gateway.list();
 
   const vms = mergeLoadedDeployments(chunk1, chunk2, chunk3 as any);
+  const failedDeployments = [
+    ...(Array.isArray((chunk1 as any).failedDeployments) ? (chunk1 as any).failedDeployments : []),
+    ...(Array.isArray((chunk2 as any).failedDeployments) ? (chunk2 as any).failedDeployments : []),
+    ...(Array.isArray((chunk3 as any).failedDeployments) ? (chunk3 as any).failedDeployments : []),
+  ];
+  namesOfFailedDeployments.value = formatFailedDeployments(failedDeployments as any);
 
   count.value = vms.count;
   items.value = vms.items;
@@ -115,6 +139,21 @@ async function loadDeployments() {
   loading.value = false;
 }
 
+function formatFailedDeployments(failedDeployments: []) {
+  let formattedText = "";
+  for (const deployment of failedDeployments as { name: string; nodes: string[] }[]) {
+    if (deployment.nodes.length > 0) {
+      formattedText += `- ${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
+        ", ",
+      )}<br>`;
+    } else {
+      formattedText += `- <strong>${deployment.name}<br>`;
+      showEncryption.value = true;
+    }
+  }
+  return formattedText;
+}
+
 const filteredHeaders = computed(() => {
   let headers = [
     { title: "PLACEHOLDER", key: "data-table-select" },
@@ -177,3 +216,9 @@ export default {
   },
 };
 </script>
+
+<style>
+.custom-icon {
+  float: right;
+}
+</style>
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index e0d9c2a61f..ef4f86aa48 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -9,12 +9,18 @@ export interface LoadedDeployments<T> {
   items: T[];
 }
 
+interface FailedDeployment {
+  name: string;
+  nodes: number[];
+}
+
 export interface LoadVMsOptions {
   filter?(vm: any): boolean;
 }
 export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
   const machines = await grid.machines.list();
   let count = machines.length;
+  const failedDeployments: FailedDeployment[] = [];
 
   const projectName = grid.clientOptions.projectName;
   const grids = (await Promise.all(
@@ -22,11 +28,12 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
   )) as GridClient[];
 
   const promises = machines.map(async (name, index) => {
+    const nodeIds = await grids[index].machines._getDeploymentNodeIds(name);
     const machinePromise = grids[index].machines.getObj(name);
     const timeoutPromise = new Promise((resolve, reject) => {
       setTimeout(() => {
         reject(new Error("Timeout"));
-      }, 5000);
+      }, 10000);
     });
 
     try {
@@ -43,6 +50,7 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
         `%c[Error] failed to load deployment with name ${name}:\n${normalizeError(e, "No errors were provided.")}`,
         "color: rgb(207, 102, 121)",
       );
+      failedDeployments.push({ name, nodes: nodeIds });
     }
   });
   const items = await Promise.all(promises);
@@ -93,6 +101,7 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
   return <LoadedDeployments<any[]>>{
     count,
     items: data,
+    failedDeployments,
   };
 }
 export function getWireguardConfig(grid: GridClient, name: string) {
@@ -110,8 +119,10 @@ export async function loadK8s(grid: GridClient) {
   const grids = (await Promise.all(
     clusters.map(n => getGrid(grid.clientOptions, `${projectName}/${n}`)),
   )) as GridClient[];
+  const failedDeployments: FailedDeployment[] = [];
 
   const promises = clusters.map(async (name, index) => {
+    const nodeIds = await grids[index].k8s._getDeploymentNodeIds(name);
     const clusterPromise = grids[index].k8s.getObj(name);
     const timeoutPromise = new Promise((resolve, reject) => {
       setTimeout(() => {
@@ -132,6 +143,7 @@ export async function loadK8s(grid: GridClient) {
         `%c[Error] failed to load deployment with name ${name}:\n${normalizeError(e, "No errors were provided.")}`,
         "color: rgb(207, 102, 121)",
       );
+      failedDeployments.push({ name, nodes: nodeIds });
     }
   });
   const items = (await Promise.all(promises)) as any[];

From 8dc856a4952fa37bc4b64b4fde7e878f25025e46 Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Wed, 25 Oct 2023 17:38:50 +0300
Subject: [PATCH 03/54] update time to 10 seconds

---
 packages/playground/src/utils/load_deployment.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index ef4f86aa48..5ee302eebf 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -127,7 +127,7 @@ export async function loadK8s(grid: GridClient) {
     const timeoutPromise = new Promise((resolve, reject) => {
       setTimeout(() => {
         reject(new Error("Timeout"));
-      }, 5000);
+      }, 10000);
     });
 
     try {

From 78d878ee58b1212759f973c704218985132fb0a4 Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Thu, 26 Oct 2023 12:18:11 +0300
Subject: [PATCH 04/54] fix deposit dialog && ad <br< instead of -

---
 packages/playground/public/config.js          | 20 +++++++++----------
 .../src/components/k8s_deployment_table.vue   | 12 ++++++-----
 .../src/components/vm_deployment_table.vue    | 12 ++++++-----
 .../playground/src/utils/load_deployment.ts   |  6 ++++++
 4 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/packages/playground/public/config.js b/packages/playground/public/config.js
index 536931a52c..119b223488 100644
--- a/packages/playground/public/config.js
+++ b/packages/playground/public/config.js
@@ -1,12 +1,12 @@
 window.env = {
-  NETWORK: "dev",
-  GRAPHQL_URL: "https://graphql.dev.grid.tf/graphql",
-  GRIDPROXY_URL: "https://gridproxy.dev.grid.tf",
-  SUBSTRATE_URL: "wss://tfchain.dev.grid.tf/ws",
-  ACTIVATION_SERVICE_URL: "https://activation.dev.grid.tf",
-  RELAY_DOMAIN: "relay.dev.grid.tf",
-  BRIDGE_TFT_ADDRESS: "GDHJP6TF3UXYXTNEZ2P36J5FH7W4BJJQ4AYYAXC66I2Q2AH5B6O6BCFG",
-  STELLAR_NETWORK: "test",
-  STELLAR_HORIZON_URL: "https://horizon-testnet.stellar.org",
-  TFT_ASSET_ISSUER: "GA47YZA3PKFUZMPLQ3B5F2E3CJIB57TGGU7SPCQT2WAEYKN766PWIMB3",
+  NETWORK: "main",
+  GRAPHQL_URL: "https://graphql.grid.tf/graphql",
+  GRIDPROXY_URL: "https://gridproxy.grid.tf",
+  SUBSTRATE_URL: "wss://tfchain.grid.tf/ws",
+  ACTIVATION_SERVICE_URL: "https://activation.grid.tf",
+  RELAY_DOMAIN: "relay.grid.tf",
+  BRIDGE_TFT_ADDRESS: "GBNOTAYUMXVO5QDYWYO2SOCOYIJ3XFIP65GKOQN7H65ZZSO6BK4SLWSC",
+  STELLAR_NETWORK: "main",
+  STELLAR_HORIZON_URL: "https://horizon.stellar.org",
+  TFT_ASSET_ISSUER: "GBOVQKJYHXRR3DX6NOX2RRYFRCUMSADGDESTDNBDS6CDVLGVESRTAC47",
 };
diff --git a/packages/playground/src/components/k8s_deployment_table.vue b/packages/playground/src/components/k8s_deployment_table.vue
index 9a3397b234..b4dd970054 100644
--- a/packages/playground/src/components/k8s_deployment_table.vue
+++ b/packages/playground/src/components/k8s_deployment_table.vue
@@ -124,17 +124,19 @@ async function loadDeployments() {
 }
 
 function formatFailedDeployments(failedDeployments: []) {
-  let formattedText = "";
+  let formattedText = "<ul>";
   for (const deployment of failedDeployments as { name: string; nodes: string[] }[]) {
     if (deployment.nodes.length > 0) {
-      formattedText += `- ${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
-        ", ",
-      )}<br>`;
+      formattedText += ` <li>${deployment.name} on node${
+        deployment.nodes.length > 1 ? "s" : ""
+      }: ${deployment.nodes.join(", ")}</li>`;
     } else {
-      formattedText += `- <strong>${deployment.name}<br>`;
+      formattedText += ` <li>${deployment.name}</li>`;
       showEncryption.value = true;
     }
   }
+  formattedText += "</ul>";
+
   return formattedText;
 }
 
diff --git a/packages/playground/src/components/vm_deployment_table.vue b/packages/playground/src/components/vm_deployment_table.vue
index d13938d8bc..132d2fe8dc 100644
--- a/packages/playground/src/components/vm_deployment_table.vue
+++ b/packages/playground/src/components/vm_deployment_table.vue
@@ -140,17 +140,19 @@ async function loadDeployments() {
 }
 
 function formatFailedDeployments(failedDeployments: []) {
-  let formattedText = "";
+  let formattedText = "<ul>";
   for (const deployment of failedDeployments as { name: string; nodes: string[] }[]) {
     if (deployment.nodes.length > 0) {
-      formattedText += `- ${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
-        ", ",
-      )}<br>`;
+      formattedText += ` <li>${deployment.name} on node${
+        deployment.nodes.length > 1 ? "s" : ""
+      }: ${deployment.nodes.join(", ")}</li>`;
     } else {
-      formattedText += `- <strong>${deployment.name}<br>`;
+      formattedText += ` <li>${deployment.name}</li>`;
       showEncryption.value = true;
     }
   }
+  formattedText += "</ul>";
+
   return formattedText;
 }
 
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index 5ee302eebf..e46bb79199 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -42,6 +42,9 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
       if (result instanceof Error && result.message === "Timeout") {
         console.log(`%c[Error] Timeout loading deployment with name ${name}`, "color: rgb(207, 102, 121)");
         return null;
+      } else if ((result as any).length === 0) {
+        console.log(`%c[Error] failed to load deployment with name ${name}}`, "color: rgb(207, 102, 121)");
+        failedDeployments.push({ name, nodes: nodeIds });
       } else {
         return result;
       }
@@ -135,6 +138,9 @@ export async function loadK8s(grid: GridClient) {
       if (result instanceof Error && result.message === "Timeout") {
         console.log(`%c[Error] Timeout loading deployment with name ${name}`, "color: rgb(207, 102, 121)");
         return null;
+      } else if ((result as any).masters.length === 0 && (result as any).workers.length === 0) {
+        console.log(`%c[Error] failed to load deployment with name ${name}}`, "color: rgb(207, 102, 121)");
+        failedDeployments.push({ name, nodes: nodeIds });
       } else {
         return result;
       }

From 9c6d4714dd27fe7e313c4f53462677c81f4d7ac5 Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Thu, 26 Oct 2023 12:20:39 +0300
Subject: [PATCH 05/54] undo config to div

---
 packages/playground/public/config.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/playground/public/config.js b/packages/playground/public/config.js
index 119b223488..536931a52c 100644
--- a/packages/playground/public/config.js
+++ b/packages/playground/public/config.js
@@ -1,12 +1,12 @@
 window.env = {
-  NETWORK: "main",
-  GRAPHQL_URL: "https://graphql.grid.tf/graphql",
-  GRIDPROXY_URL: "https://gridproxy.grid.tf",
-  SUBSTRATE_URL: "wss://tfchain.grid.tf/ws",
-  ACTIVATION_SERVICE_URL: "https://activation.grid.tf",
-  RELAY_DOMAIN: "relay.grid.tf",
-  BRIDGE_TFT_ADDRESS: "GBNOTAYUMXVO5QDYWYO2SOCOYIJ3XFIP65GKOQN7H65ZZSO6BK4SLWSC",
-  STELLAR_NETWORK: "main",
-  STELLAR_HORIZON_URL: "https://horizon.stellar.org",
-  TFT_ASSET_ISSUER: "GBOVQKJYHXRR3DX6NOX2RRYFRCUMSADGDESTDNBDS6CDVLGVESRTAC47",
+  NETWORK: "dev",
+  GRAPHQL_URL: "https://graphql.dev.grid.tf/graphql",
+  GRIDPROXY_URL: "https://gridproxy.dev.grid.tf",
+  SUBSTRATE_URL: "wss://tfchain.dev.grid.tf/ws",
+  ACTIVATION_SERVICE_URL: "https://activation.dev.grid.tf",
+  RELAY_DOMAIN: "relay.dev.grid.tf",
+  BRIDGE_TFT_ADDRESS: "GDHJP6TF3UXYXTNEZ2P36J5FH7W4BJJQ4AYYAXC66I2Q2AH5B6O6BCFG",
+  STELLAR_NETWORK: "test",
+  STELLAR_HORIZON_URL: "https://horizon-testnet.stellar.org",
+  TFT_ASSET_ISSUER: "GA47YZA3PKFUZMPLQ3B5F2E3CJIB57TGGU7SPCQT2WAEYKN766PWIMB3",
 };

From 4c8871dd98ccfd9a26003887613380e78dd8bc2e Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Thu, 26 Oct 2023 16:04:41 +0300
Subject: [PATCH 06/54] remove function of format

---
 .../src/components/k8s_deployment_table.vue   | 34 +++++++------------
 .../src/components/vm_deployment_table.vue    | 34 +++++++------------
 .../playground/src/utils/load_deployment.ts   |  2 +-
 3 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/packages/playground/src/components/k8s_deployment_table.vue b/packages/playground/src/components/k8s_deployment_table.vue
index b4dd970054..10b8e9c1cd 100644
--- a/packages/playground/src/components/k8s_deployment_table.vue
+++ b/packages/playground/src/components/k8s_deployment_table.vue
@@ -15,7 +15,17 @@
         <v-card-title style="color: #ffcc00; font-weight: bold">Failed Deployments</v-card-title>
         <v-divider color="#FFCC00" />
         <v-card-text>
-          <div v-html="namesOfFailedDeployments"></div>
+          <ul>
+            <li v-for="deployment in failedDeployments" :key="deployment.name">
+              {{
+                deployment.nodes.length > 0
+                  ? `${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
+                      ", ",
+                    )}`
+                  : deployment.name
+              }}
+            </li>
+          </ul>
         </v-card-text>
         <v-card-actions class="justify-end">
           <v-btn @click="showDialog = false" class="grey lighten-2 black--text" color="#FFCC00">Close</v-btn>
@@ -86,9 +96,9 @@ import { getGrid, updateGrid } from "../utils/grid";
 import { loadK8s, mergeLoadedDeployments } from "../utils/load_deployment";
 
 const profileManager = useProfileManager();
-const namesOfFailedDeployments = ref("");
 const showDialog = ref(false);
 const showEncryption = ref(false);
+const failedDeployments = ref<any[]>([]);
 
 const props = defineProps<{
   projectName: string;
@@ -111,35 +121,17 @@ async function loadDeployments() {
   const chunk3 = await loadK8s(updateGrid(grid!, { projectName: "" }));
 
   const clusters = mergeLoadedDeployments(chunk1, chunk2, chunk3);
-  const failedDeployments = [
+  failedDeployments.value = [
     ...(Array.isArray((chunk1 as any).failedDeployments) ? (chunk1 as any).failedDeployments : []),
     ...(Array.isArray((chunk2 as any).failedDeployments) ? (chunk2 as any).failedDeployments : []),
     ...(Array.isArray((chunk3 as any).failedDeployments) ? (chunk3 as any).failedDeployments : []),
   ];
 
-  namesOfFailedDeployments.value = formatFailedDeployments(failedDeployments as any);
   count.value = clusters.count;
   items.value = clusters.items;
   loading.value = false;
 }
 
-function formatFailedDeployments(failedDeployments: []) {
-  let formattedText = "<ul>";
-  for (const deployment of failedDeployments as { name: string; nodes: string[] }[]) {
-    if (deployment.nodes.length > 0) {
-      formattedText += ` <li>${deployment.name} on node${
-        deployment.nodes.length > 1 ? "s" : ""
-      }: ${deployment.nodes.join(", ")}</li>`;
-    } else {
-      formattedText += ` <li>${deployment.name}</li>`;
-      showEncryption.value = true;
-    }
-  }
-  formattedText += "</ul>";
-
-  return formattedText;
-}
-
 defineExpose({ loadDeployments });
 </script>
 
diff --git a/packages/playground/src/components/vm_deployment_table.vue b/packages/playground/src/components/vm_deployment_table.vue
index 132d2fe8dc..a069ce4c8b 100644
--- a/packages/playground/src/components/vm_deployment_table.vue
+++ b/packages/playground/src/components/vm_deployment_table.vue
@@ -16,7 +16,17 @@
           <v-card-title style="color: #ffcc00; font-weight: bold">Failed Deployments</v-card-title>
           <v-divider color="#FFCC00" />
           <v-card-text>
-            <div v-html="namesOfFailedDeployments"></div>
+            <ul>
+              <li v-for="deployment in failedDeployments" :key="deployment.name">
+                {{
+                  deployment.nodes.length > 0
+                    ? `${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
+                        ", ",
+                      )}`
+                    : deployment.name
+                }}
+              </li>
+            </ul>
           </v-card-text>
           <v-card-actions class="justify-end">
             <v-btn @click="showDialog = false" class="grey lighten-2 black--text" color="#FFCC00">Close</v-btn>
@@ -99,9 +109,9 @@ defineEmits<{ (event: "update:model-value", value: any[]): void }>();
 const loading = ref(false);
 const count = ref<number>();
 const items = ref<any[]>([]);
-const namesOfFailedDeployments = ref("");
 const showDialog = ref(false);
 const showEncryption = ref(false);
+const failedDeployments = ref<any[]>([]);
 
 onMounted(loadDeployments);
 async function loadDeployments() {
@@ -126,12 +136,11 @@ async function loadDeployments() {
   if (chunk3.count > 0) await grid!.gateway.list();
 
   const vms = mergeLoadedDeployments(chunk1, chunk2, chunk3 as any);
-  const failedDeployments = [
+  failedDeployments.value = [
     ...(Array.isArray((chunk1 as any).failedDeployments) ? (chunk1 as any).failedDeployments : []),
     ...(Array.isArray((chunk2 as any).failedDeployments) ? (chunk2 as any).failedDeployments : []),
     ...(Array.isArray((chunk3 as any).failedDeployments) ? (chunk3 as any).failedDeployments : []),
   ];
-  namesOfFailedDeployments.value = formatFailedDeployments(failedDeployments as any);
 
   count.value = vms.count;
   items.value = vms.items;
@@ -139,23 +148,6 @@ async function loadDeployments() {
   loading.value = false;
 }
 
-function formatFailedDeployments(failedDeployments: []) {
-  let formattedText = "<ul>";
-  for (const deployment of failedDeployments as { name: string; nodes: string[] }[]) {
-    if (deployment.nodes.length > 0) {
-      formattedText += ` <li>${deployment.name} on node${
-        deployment.nodes.length > 1 ? "s" : ""
-      }: ${deployment.nodes.join(", ")}</li>`;
-    } else {
-      formattedText += ` <li>${deployment.name}</li>`;
-      showEncryption.value = true;
-    }
-  }
-  formattedText += "</ul>";
-
-  return formattedText;
-}
-
 const filteredHeaders = computed(() => {
   let headers = [
     { title: "PLACEHOLDER", key: "data-table-select" },
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index e46bb79199..96fcfb790e 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -43,7 +43,7 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
         console.log(`%c[Error] Timeout loading deployment with name ${name}`, "color: rgb(207, 102, 121)");
         return null;
       } else if ((result as any).length === 0) {
-        console.log(`%c[Error] failed to load deployment with name ${name}}`, "color: rgb(207, 102, 121)");
+        console.log(`%c[Error] failed to load deployment with name ${name}`, "color: rgb(207, 102, 121)");
         failedDeployments.push({ name, nodes: nodeIds });
       } else {
         return result;

From 881667d20ef5bf82ff7d628e0516f4d109a2b351 Mon Sep 17 00:00:00 2001
From: Omar Kassem <omarksm09@gmail.com>
Date: Mon, 30 Oct 2023 12:00:24 +0200
Subject: [PATCH 07/54] Contract view: add node details (#1288)

* init get node status logic

* change gridproxy client version

* add node status chips

* make node id column sortable
---
 packages/playground/package.json              |  2 +-
 packages/playground/src/clients/index.ts      |  2 +-
 .../src/components/select_country.vue         |  2 +-
 .../src/weblets/tf_contracts_list.vue         | 49 +++++++++++++++++--
 yarn.lock                                     | 10 ++--
 5 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/packages/playground/package.json b/packages/playground/package.json
index 98647628ec..29c0ac8c43 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -24,7 +24,7 @@
     "mosha-vue-toastify": "^1.0.23",
     "pinia": "^2.0.32",
     "qrcode": "^1.5.1",
-    "tf_gridproxy_client": "^1.0.2",
+    "@threefold/gridproxy_client": "^2.1.1-rc1",
     "tfgrid-gql": "^1.0.1",
     "validator": "^13.9.0",
     "vue": "^3.2.47",
diff --git a/packages/playground/src/clients/index.ts b/packages/playground/src/clients/index.ts
index cd8190074a..271ccb3d7d 100644
--- a/packages/playground/src/clients/index.ts
+++ b/packages/playground/src/clients/index.ts
@@ -1,4 +1,4 @@
-import GridProxyClient, { Network } from "tf_gridproxy_client";
+import GridProxyClient, { Network } from "@threefold/gridproxy_client";
 import TFGridGqlClient, { Networks } from "tfgrid-gql";
 
 const network = process.env.NETWORK || window.env.NETWORK;
diff --git a/packages/playground/src/components/select_country.vue b/packages/playground/src/components/select_country.vue
index 20facd66d8..21023f3a15 100644
--- a/packages/playground/src/components/select_country.vue
+++ b/packages/playground/src/components/select_country.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="ts" setup>
-import { NodeStatus } from "tf_gridproxy_client";
+import { NodeStatus } from "@threefold/gridproxy_client";
 import { onMounted, ref, watch } from "vue";
 
 import { gridProxyClient } from "../clients";
diff --git a/packages/playground/src/weblets/tf_contracts_list.vue b/packages/playground/src/weblets/tf_contracts_list.vue
index f6ea7499d3..6ab3fbd7c6 100644
--- a/packages/playground/src/weblets/tf_contracts_list.vue
+++ b/packages/playground/src/weblets/tf_contracts_list.vue
@@ -49,6 +49,16 @@
       <template #[`item.solutionType`]="{ item }">
         {{ solutionType[item.value.solutionType] ?? item.value.solutionType }}
       </template>
+      <template #[`item.nodeStatus`]="{ item }">
+        <v-chip
+          v-if="item.value.nodeId !== '-' && !loading"
+          :color="getNodeStateColor(nodeStatus[item.value.nodeId])"
+          class="text-capitalize"
+        >
+          {{ nodeStatus[item.value.nodeId] }}
+        </v-chip>
+        <p v-else>-</p>
+      </template>
       <template #[`item.actions`]="{ item }">
         <v-tooltip text="Show Details">
           <template #activator="{ props }">
@@ -91,8 +101,8 @@
     <v-card>
       <v-card-title class="text-h5 mt-2"> Are you sure you want to delete the following contracts? </v-card-title>
       <v-alert class="ma-4" type="warning" variant="tonal"
-        >It is advisable to remove the contract from its solution page, especially
-        when multiple contracts may be linked to the same instance.</v-alert
+        >It is advisable to remove the contract from its solution page, especially when multiple contracts may be linked
+        to the same instance.</v-alert
       >
       <v-alert class="mx-4" type="warning" variant="tonal">Deleting contracts may take a while to complete.</v-alert>
       <v-card-text>
@@ -138,7 +148,7 @@
 
 <script lang="ts" setup>
 import { ContractStates, type GridClient } from "@threefold/grid_client";
-import { ref } from "vue";
+import { computed, type Ref, ref } from "vue";
 
 import { useProfileManager } from "../stores";
 import type { VDataTableHeader } from "../types";
@@ -152,6 +162,7 @@ const loading = ref(false);
 const isExporting = ref(false);
 const grid = ref<GridClient | null>();
 const selectedContracts = ref<NormalizedContract[]>([]);
+const nodeStatus = ref() as Ref<{ [x: number]: NodeStatus }>;
 const headers: VDataTableHeader = [
   { title: "PLACEHOLDER", key: "data-table-select" },
   { title: "ID", key: "contractId" },
@@ -162,6 +173,8 @@ const headers: VDataTableHeader = [
   { title: "Solution Name", key: "solutionName" },
   { title: "Created At", key: "createdAt" },
   { title: "Expiration", key: "expiration" },
+  { title: "Node ID", key: "nodeId" },
+  { title: "Node Status", key: "nodeStatus", sortable: false },
   { title: "Details", key: "actions", sortable: false },
 ];
 
@@ -170,9 +183,15 @@ async function onMount() {
   contracts.value = [];
   grid.value = await getGrid(profileManager.profile!);
   contracts.value = await getUserContracts(grid.value!);
+  nodeStatus.value = await getNodeStatus(nodeIDs.value);
   loading.value = false;
 }
 
+const nodeIDs = computed(() => {
+  const allNodes = contracts.value.map(contract => contract.nodeId);
+  return [...new Set(allNodes)];
+});
+
 const loadingContractId = ref<number>();
 const contractLocked = ref<ContractLock>();
 
@@ -260,11 +279,35 @@ async function onDelete() {
   }
   deleting.value = false;
 }
+
+async function getNodeStatus(nodeIDs: (number | undefined)[]) {
+  const resultPromises = nodeIDs.map(async nodeId => {
+    if (typeof nodeId !== "number") return {};
+    const status = (await gridProxyClient.nodes.byId(nodeId)).status;
+    return { [nodeId]: status };
+  });
+
+  const resultsArray = await Promise.all(resultPromises);
+
+  return resultsArray.reduce((acc, obj) => Object.assign(acc, obj), {});
+}
+function getNodeStateColor(state: NodeStatus): string {
+  switch (state) {
+    case NodeStatus.Up:
+      return "success";
+    case NodeStatus.Down:
+      return "error";
+    case NodeStatus.Standby:
+      return "warning";
+  }
+}
 </script>
 
 <script lang="ts">
+import { NodeStatus } from "@threefold/gridproxy_client";
 import type { ContractLock } from "@threefold/tfchain_client";
 
+import { gridProxyClient } from "../clients";
 import ListTable from "../components/list_table.vue";
 import { solutionType } from "../types/index";
 import { downloadAsJson, normalizeError } from "../utils/helpers";
diff --git a/yarn.lock b/yarn.lock
index eaccb75a8a..175b5310b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3912,6 +3912,11 @@
   resolved "https://registry.yarnpkg.com/@threefold/extension_api/-/extension_api-0.0.1-rc6.tgz#9271ac014f8cfc5b0351f75bc7bee6f9e5e744a2"
   integrity sha512-rICTgNT7NuAlJCi9PcQ4l5q4jh0aQ/9nilXu9SHHo4toSYd9NxeI4HxF+Vmk1vR8O7iA101SoRhJrJCAqjtROw==
 
+"@threefold/gridproxy_client@^2.1.1-rc1":
+  version "2.1.1-rc1"
+  resolved "https://registry.yarnpkg.com/@threefold/gridproxy_client/-/gridproxy_client-2.1.1-rc1.tgz#3e79b375d8bb5bcd598d2248308cce2841f78913"
+  integrity sha512-IPT3irRQ4MzBUK1BRBCMeagU8JO5RhpIjt+TzgrQJMYfgTzoo597uirfdsnzXoAiHK/oJhokQx9wr5mBOcFgRQ==
+
 "@tootallnate/once@2":
   version "2.0.0"
   resolved "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"
@@ -18319,11 +18324,6 @@ tf-svelte-rx-forms@^1.0.3:
     "@types/validator" "^13.7.7"
     validator "^13.7.0"
 
-tf_gridproxy_client@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/tf_gridproxy_client/-/tf_gridproxy_client-1.0.2.tgz#058f6020f68e9ace27406ae4a2af61efce3ad840"
-  integrity sha512-uV0Id9qJLAf4C/7gRdCa3x2bYKJAfWg/EhW6z3XFVXSaV+Mv8BjQKSeH18OBJXpvfdTeIkIhbR8I/WZbXFycrg==
-
 tfgrid-gql@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tfgrid-gql/-/tfgrid-gql-1.0.1.tgz#9c93c2d409badac2cec417e3719b78665617fea7"

From 178c0691e58f20130c69bd7967d9bcc13084a1a5 Mon Sep 17 00:00:00 2001
From: Mohamed Amer <101194226+mohamedamer453@users.noreply.github.com>
Date: Mon, 30 Oct 2023 16:16:01 +0200
Subject: [PATCH 08/54] add yggdrasil version (#1311)

* add yggdrasil version

* fix the version

* fix the version
---
 .github/workflows/grid_client_tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/grid_client_tests.yml b/.github/workflows/grid_client_tests.yml
index 0bac9608e7..b48f4caef0 100644
--- a/.github/workflows/grid_client_tests.yml
+++ b/.github/workflows/grid_client_tests.yml
@@ -28,7 +28,8 @@ jobs:
           gpg --export 569130E8CA20FBC4CB3FDE555898470A764B32C9 | sudo apt-key add -
           echo 'deb http://neilalexander.s3.dualstack.eu-west-2.amazonaws.com/deb/ debian yggdrasil' | sudo tee /etc/apt/sources.list.d/yggdrasil.list
           sudo apt-get update
-          sudo apt-get install yggdrasil
+          wget https://github.com/yggdrasil-network/yggdrasil-go/releases/download/v0.4.7/yggdrasil-0.4.7-amd64.deb
+          sudo dpkg -i yggdrasil-0.4.7-amd64.deb
           sudo systemctl enable yggdrasil
           PEERS=$(curl https://raw.githubusercontent.com/threefoldtech/zos-config/main/development.json | jq '.yggdrasil.peers[]' -r | sed 's/\//\\\//g' | sed -z 's/\n/\\n/g')
           sudo  sed -i -- 's/Peers\: \[\]/Peers: [\n'"$PEERS"']/g' /etc/yggdrasil.conf

From fab5cf748c77c39e360fbae186dfd699013268d2 Mon Sep 17 00:00:00 2001
From: Mohamed Amer <101194226+mohamedamer453@users.noreply.github.com>
Date: Mon, 30 Oct 2023 16:32:11 +0200
Subject: [PATCH 09/54] Mass deployments script/workflow (#1289)

* added batch_vms script

* added batch deployments

* Edit batch script

* added mass deployments workflow

* test workflow

* Revert "test workflow"

This reverts commit 7d95fa5fb66acf5f169cee8ceddf6f5427c26e6d.

* test workflow

* test workflow

* update workflow

* requested changes

---------

Co-authored-by: zaelgohary <zainabelgohary19@gmail.com>
Co-authored-by: kassem <omarksm09@gmail.com>
---
 .github/workflows/mass_deployments.yml        |  58 +++++++++
 .../grid_client/scripts/mass_deployments.ts   | 120 ++++++++++++++++++
 packages/grid_client/src/modules/models.ts    |   2 +
 packages/grid_client/src/primitives/nodes.ts  |   2 +
 4 files changed, 182 insertions(+)
 create mode 100644 .github/workflows/mass_deployments.yml
 create mode 100644 packages/grid_client/scripts/mass_deployments.ts

diff --git a/.github/workflows/mass_deployments.yml b/.github/workflows/mass_deployments.yml
new file mode 100644
index 0000000000..f3e09253c3
--- /dev/null
+++ b/.github/workflows/mass_deployments.yml
@@ -0,0 +1,58 @@
+name: Mass Deployments
+
+on:
+  schedule:
+    - cron: "0 1 * * *"
+  workflow_dispatch:
+
+jobs:
+  mass-deployments:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    env:
+      NETWORK: main
+      RMB_PROXY: true
+      STORE_SECRET: secret
+      MNEMONIC: ${{ secrets.MNEMONIC }}
+      SSH_KEY: ${{ secrets.SSH_KEY }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: refs/tags/v2.2.0
+      - name: Set up node 18
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "yarn"
+
+      - name: Install deps
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y git libtool tmux redis net-tools
+      - name: Install
+        run: |
+          yarn
+          lerna run build --no-private
+
+      - name: Run test mass deployments
+        id: massdeployments
+        continue-on-error: true
+        run: |
+          yarn run ts-node --project packages/grid_client/tsconfig-node.json packages/grid_client/scripts/mass_deployments.ts
+
+      - name: Cleanup - Delete all contracts
+        id: deleteall
+        run: |
+          yarn run ts-node --project packages/grid_client/tsconfig-node.json packages/grid_client/scripts/delete_all_contracts.ts
+
+      - name: Test Results
+        run: |
+          echo Batch Vms: ${{ steps.massdeployments.outcome }}
+          echo Delete all contracts: ${{ steps.deleteall.outcome }}
+
+      - name: Check test script status
+        if: |
+          steps.massdeployments.outcome != 'success'
+        run: exit 1
diff --git a/packages/grid_client/scripts/mass_deployments.ts b/packages/grid_client/scripts/mass_deployments.ts
new file mode 100644
index 0000000000..25b4c97e04
--- /dev/null
+++ b/packages/grid_client/scripts/mass_deployments.ts
@@ -0,0 +1,120 @@
+import {
+  DiskModel,
+  FarmFilterOptions,
+  FilterOptions,
+  generateString,
+  MachineModel,
+  MachinesModel,
+  NetworkModel,
+  randomChoice,
+} from "../src";
+import { config, getClient } from "./client_loader";
+import { log } from "./utils";
+
+async function main() {
+  const grid3 = await getClient();
+
+  const errors: any = [];
+  let failedCount = 0;
+  let successCount = 0;
+
+  for (let i = 0; i < 100; i++) {
+    //Generating the resources
+    const cru = 1;
+    const mru = 256;
+    const diskSize = 5;
+    const rootFs = 1;
+    const vmName = "vm" + generateString(8);
+    const deploymentName = "dep" + generateString(8);
+    const publicIp = false;
+
+    // create network Object
+    const n = new NetworkModel();
+    n.name = "nw" + generateString(5);
+    n.ip_range = "10.238.0.0/16";
+
+    // create disk Object
+    const disk1 = new DiskModel();
+    disk1.name = "d" + generateString(5);
+    disk1.size = diskSize;
+    disk1.mountpoint = "/newDisk1";
+
+    //Farm Selection
+    const farms = await grid3.capacity.filterFarms({
+      nodeMRU: mru / 1024,
+      nodeSRU: diskSize + rootFs,
+      publicIp: publicIp,
+      availableFor: await grid3.twins.get_my_twin_id(),
+      randomize: true,
+    } as FarmFilterOptions);
+
+    if (farms.length < 1) {
+      throw new Error("No farms found");
+    }
+
+    //Node Selection
+    const nodes = await grid3.capacity.filterNodes({
+      cru: cru,
+      mru: mru / 1024,
+      sru: rootFs + diskSize,
+      availableFor: await grid3.twins.get_my_twin_id(),
+      farmId: +randomChoice(farms).farmId,
+      randomize: true,
+    } as FilterOptions);
+
+    if (nodes.length < 1) {
+      errors.push("Node not found");
+      failedCount++;
+      continue;
+    }
+
+    // create vm node Object
+    const vm = new MachineModel();
+    vm.name = vmName;
+    vm.node_id = nodes[0].nodeId;
+    vm.disks = [disk1];
+    vm.public_ip = publicIp;
+    vm.planetary = true;
+    vm.cpu = cru;
+    vm.memory = mru;
+    vm.rootfs_size = rootFs;
+    vm.flist = "https://hub.grid.tf/tf-official-apps/base:latest.flist";
+    vm.entrypoint = "/sbin/zinit init";
+    vm.env = {
+      SSH_KEY: config.ssh_key,
+    };
+
+    // create VMs Object
+    const vms = new MachinesModel();
+    vms.name = deploymentName;
+    vms.network = n;
+    vms.machines = [vm];
+    vms.metadata = "";
+    vms.description = "test deploying VMs via ts grid3 client";
+
+    // deploy vm
+    try {
+      await grid3.machines.deploy(vms);
+      successCount++;
+    } catch (error) {
+      log(error);
+      errors.push(error);
+      failedCount++;
+      continue;
+    }
+  }
+
+  log("Successful Deployments: " + successCount);
+  log("Failed Deployments: " + failedCount);
+
+  // List of failed deployments errors
+  log("Failed deployments errors: ");
+  for (let i = 0; i < errors.length; i++) {
+    log(errors[i]);
+    log("---------------------------------------------");
+  }
+
+  await grid3.disconnect();
+}
+
+main();
diff --git a/packages/grid_client/src/modules/models.ts b/packages/grid_client/src/modules/models.ts
index ea8ed1e3b0..5ea21309a6 100644
--- a/packages/grid_client/src/modules/models.ts
+++ b/packages/grid_client/src/modules/models.ts
@@ -573,6 +573,7 @@ class FilterOptions {
   @Expose() @IsOptional() @IsBoolean() hasGPU?: boolean;
   @Expose() @IsOptional() @IsBoolean() rentable?: boolean;
   @Expose() @IsOptional() @IsInt() @Min(1) rentedBy?: number;
+  @Expose() @IsOptional() @IsBoolean() randomize?: boolean;
 }
 
 enum CertificationType {
@@ -597,6 +598,7 @@ class FarmFilterOptions {
   @Expose() @IsOptional() @IsInt() page?: number;
   @Expose() @IsOptional() @IsInt() size?: number;
   @Expose() @IsOptional() @IsInt() farmId?: number;
+  @Expose() @IsOptional() @IsBoolean() randomize?: boolean;
 }
 
 class CalculatorModel {
diff --git a/packages/grid_client/src/primitives/nodes.ts b/packages/grid_client/src/primitives/nodes.ts
index 51356034c0..f7ca667659 100644
--- a/packages/grid_client/src/primitives/nodes.ts
+++ b/packages/grid_client/src/primitives/nodes.ts
@@ -354,6 +354,7 @@ class Nodes {
       has_gpu: options.hasGPU,
       rented_by: options.rentedBy,
       rentable: options.rentable,
+      randomize: options.randomize,
     };
     if (options.gateway) {
       params["ipv4"] = true;
@@ -383,6 +384,7 @@ class Nodes {
       node_rented_by: options.nodeRentedBy,
       node_certified: options.nodeCertified,
       farm_id: options.farmId,
+      randomize: options.randomize,
     };
     return Object.entries(params)
       .map(param => param.join("="))

From e1c28216850996907ea275a801fee520d3834b82 Mon Sep 17 00:00:00 2001
From: Thunder <mahmmoud.hassanein@gmail.com>
Date: Tue, 31 Oct 2023 12:02:10 +0200
Subject: [PATCH 10/54] Support offline node contract notification on `mainnet`
 (#1297)

* Update the grid client qgl contracts type.

* Added the notifacation.

* Update the grid client qgl contracts type.

* Sync the 'Expose all and filter methods on the nodes module to list/filter all nodes' PR

* Added the style.

* Import mosha style.

* Apply comments.

* Support adding links in notification

* Update the shape of displaying the link of the contracts list page.

* Fix typo.

* Close the toast when navigating to the contract page.

* Fix conflict.
---
 .../src/clients/tf-grid/contracts.ts          | 98 +++++++++++++++----
 packages/grid_client/src/modules/contracts.ts |  5 +-
 packages/grid_client/src/modules/models.ts    |  7 ++
 packages/grid_client/src/modules/nodes.ts     | 21 +++-
 packages/grid_client/src/primitives/nodes.ts  |  4 +-
 packages/playground/src/App.vue               | 42 ++++++++
 .../mosha_toast/offline_nodes_toast.vue       | 63 ++++++++++++
 .../src/components/tf_notification.vue        | 55 ++++++++---
 packages/playground/src/main.ts               |  2 +
 packages/playground/src/utils/custom_toast.ts | 80 +++++++++++++++
 packages/playground/src/utils/get_nodes.ts    | 47 +++++++++
 11 files changed, 385 insertions(+), 39 deletions(-)
 create mode 100644 packages/playground/src/components/mosha_toast/offline_nodes_toast.vue
 create mode 100644 packages/playground/src/utils/custom_toast.ts
 create mode 100644 packages/playground/src/utils/get_nodes.ts

diff --git a/packages/grid_client/src/clients/tf-grid/contracts.ts b/packages/grid_client/src/clients/tf-grid/contracts.ts
index ac4dda2cb3..88ebdb1ba1 100644
--- a/packages/grid_client/src/clients/tf-grid/contracts.ts
+++ b/packages/grid_client/src/clients/tf-grid/contracts.ts
@@ -1,6 +1,7 @@
 import {
   ContractLockOptions,
   Contracts,
+  ExtrinsicResult,
   GetDedicatedNodePriceOptions,
   SetDedicatedNodeExtraFeesOptions,
 } from "@threefold/tfchain_client";
@@ -9,12 +10,67 @@ import { Decimal } from "decimal.js";
 import { ContractStates } from "../../modules";
 import { Graphql } from "../graphql/client";
 
+export type DiscountLevel = "None" | "Default" | "Bronze" | "Silver" | "Gold";
+
 export interface ListContractByTwinIdOptions {
   graphqlURL: string;
   twinId: number;
   stateList?: ContractStates[];
 }
 
+export interface ContractUsedResources {
+  contract: GqlNodeContract;
+  hru: number;
+  sru: number;
+  cru: number;
+  mru: number;
+}
+
+export interface GqlBaseContract {
+  id: string;
+  gridVersion: string;
+  contractID: string;
+  twinID: string;
+  state: string;
+  createdAt: string;
+  solutionProviderID: string;
+}
+
+export interface GqlNameContract extends GqlBaseContract {
+  name: string;
+}
+
+export interface GqlNodeContract extends GqlBaseContract {
+  nodeID: number;
+  deploymentData: string;
+  deploymentHash: string;
+  numberOfPublicIPs: number;
+  resourcesUsed: ContractUsedResources;
+}
+
+export interface GqlRentContract extends GqlBaseContract {
+  nodeID: number;
+}
+
+export interface GqlContracts {
+  nameContracts: GqlNameContract[];
+  nodeContracts: GqlNodeContract[];
+  rentContracts: GqlRentContract[];
+}
+
+export interface GqlConsumption {
+  contracts: GqlContracts;
+  contractBillReports: GqlContractBillReports[];
+}
+
+export interface GqlContractBillReports {
+  id: string;
+  contractID: number;
+  discountReceived: DiscountLevel;
+  amountBilled: number;
+  timestamp: number;
+}
+
 export interface ListContractByAddressOptions {
   graphqlURL: string;
   accountId: string;
@@ -36,7 +92,7 @@ export interface CancelMyContractOptions {
 }
 
 class TFContracts extends Contracts {
-  async listContractsByTwinId(options: ListContractByTwinIdOptions) {
+  async listContractsByTwinId(options: ListContractByTwinIdOptions): Promise<GqlContracts> {
     options.stateList = options.stateList || [ContractStates.Created, ContractStates.GracePeriod];
     const state = `[${options.stateList.join(", ")}]`;
     const gqlClient = new Graphql(options.graphqlURL);
@@ -60,6 +116,7 @@ class TFContracts extends Contracts {
                   state
                   createdAt
                   nodeID
+                  numberOfPublicIPs
                 }
                 rentContracts(where: {twinID_eq: ${options.twinId}, state_in: ${state}}, limit: $rentContractsCount) {
                   contractID
@@ -76,7 +133,7 @@ class TFContracts extends Contracts {
         rentContractsCount: rentContractsCount,
       });
 
-      return response["data"];
+      return response["data"] as GqlContracts;
     } catch (err) {
       throw Error(`Error listing contracts by twin id ${options.twinId}: ${err}`);
     }
@@ -107,23 +164,25 @@ class TFContracts extends Contracts {
           }`;
     try {
       const response = await gqlClient.query(body, { contractId: options.id });
-      const billReports = response["data"]["contractBillReports"];
+      const gqlConsumption: GqlConsumption = response["data"] as GqlConsumption;
+      const billReports = gqlConsumption.contractBillReports;
       if (billReports.length === 0) {
         return 0;
       } else {
         let duration: number;
-        const amountBilled = new Decimal(billReports[0]["amountBilled"]);
+        const amountBilled = new Decimal(billReports[0].amountBilled);
         if (billReports.length === 2) {
-          duration = (billReports[0]["timestamp"] - billReports[1]["timestamp"]) / 3600; // one hour
+          duration = (billReports[0].timestamp - billReports[1].timestamp) / 3600; // one hour
         } else {
-          const nodeContracts = response["data"]["nodeContracts"];
-          const nameContracts = response["data"]["nameContracts"];
-          const rentContracts = response["data"]["rentContracts"];
           let createdAt: number;
-          for (const contracts of [nodeContracts, nameContracts, rentContracts]) {
+          for (const contracts of [
+            gqlConsumption.contracts.nodeContracts,
+            gqlConsumption.contracts.nameContracts,
+            gqlConsumption.contracts.rentContracts,
+          ]) {
             if (contracts.length === 1) {
-              createdAt = contracts[0]["createdAt"];
-              duration = (billReports[0]["timestamp"] - createdAt) / 3600;
+              createdAt = +contracts[0].createdAt;
+              duration = (billReports[0].timestamp - createdAt) / 3600;
               break;
             }
           }
@@ -150,7 +209,7 @@ class TFContracts extends Contracts {
     });
   }
 
-  async listMyContracts(options: ListMyContractOptions) {
+  async listMyContracts(options: ListMyContractOptions): Promise<GqlContracts> {
     const twinId = await this.client.twins.getMyTwinId();
     return await this.listContractsByTwinId({
       graphqlURL: options.graphqlURL,
@@ -171,23 +230,22 @@ class TFContracts extends Contracts {
    * @param  {CancelMyContractOptions} options
    * @returns {Promise<Record<string, number>[]>}
    */
-  async cancelMyContracts(options: CancelMyContractOptions): Promise<Record<string, number>[]> {
+  async cancelMyContracts(
+    options: CancelMyContractOptions,
+  ): Promise<(GqlNameContract | GqlRentContract | GqlNodeContract)[]> {
     const allContracts = await this.listMyContracts(options);
-    const contracts = [
-      ...allContracts["nameContracts"],
-      ...allContracts["nodeContracts"],
-      ...allContracts["rentContracts"],
-    ];
+    const contracts = [...allContracts.nameContracts, ...allContracts.nodeContracts, ...allContracts.rentContracts];
+
     const ids: number[] = [];
     for (const contract of contracts) {
-      ids.push(contract["contractID"]);
+      ids.push(+contract.contractID);
     }
     await this.batchCancelContracts(ids);
     return contracts;
   }
 
   async batchCancelContracts(ids: number[]): Promise<number[]> {
-    const extrinsics = [];
+    const extrinsics: ExtrinsicResult<number>[] = [];
     for (const id of ids) {
       extrinsics.push(await this.cancel({ id }));
     }
diff --git a/packages/grid_client/src/modules/contracts.ts b/packages/grid_client/src/modules/contracts.ts
index 3d1118d68f..c3e88e6f4f 100644
--- a/packages/grid_client/src/modules/contracts.ts
+++ b/packages/grid_client/src/modules/contracts.ts
@@ -1,5 +1,6 @@
 import * as PATH from "path";
 
+import { GqlNameContract, GqlNodeContract, GqlRentContract } from "../clients/tf-grid";
 import { TFClient } from "../clients/tf-grid/client";
 import { GridClientConfig } from "../config";
 import { events } from "../helpers/events";
@@ -202,10 +203,10 @@ class Contracts {
   @expose
   @validateInput
   @checkBalance
-  async cancelMyContracts(): Promise<Record<string, number>[]> {
+  async cancelMyContracts(): Promise<(GqlNameContract | GqlRentContract | GqlNodeContract)[]> {
     const contracts = await this.client.contracts.cancelMyContracts({ graphqlURL: this.config.graphqlURL });
     for (const contract of contracts) {
-      await this.invalidateDeployment(contract.contractId);
+      await this.invalidateDeployment(+contract.contractID);
     }
     return contracts;
   }
diff --git a/packages/grid_client/src/modules/models.ts b/packages/grid_client/src/modules/models.ts
index 5ea21309a6..617c16e0c8 100644
--- a/packages/grid_client/src/modules/models.ts
+++ b/packages/grid_client/src/modules/models.ts
@@ -31,6 +31,12 @@ enum ContractStates {
   GracePeriod = "GracePeriod",
 }
 
+export enum NodeStatus {
+  up = "up",
+  down = "down",
+  standBy = "standby",
+}
+
 //TODO: find a way to validate all fields are passed while casting data to any of these classes.
 class AlgorandAccountCreateModel {
   @Expose() @IsString() @IsNotEmpty() @IsAlphanumeric() @MaxLength(NameLength) name: string;
@@ -574,6 +580,7 @@ class FilterOptions {
   @Expose() @IsOptional() @IsBoolean() rentable?: boolean;
   @Expose() @IsOptional() @IsInt() @Min(1) rentedBy?: number;
   @Expose() @IsOptional() @IsBoolean() randomize?: boolean;
+  @Expose() @IsOptional() @Transform(({ value }) => NodeStatus[value]) @IsEnum(NodeStatus) status?: NodeStatus;
 }
 
 enum CertificationType {
diff --git a/packages/grid_client/src/modules/nodes.ts b/packages/grid_client/src/modules/nodes.ts
index fd5a9a2887..a629daca65 100644
--- a/packages/grid_client/src/modules/nodes.ts
+++ b/packages/grid_client/src/modules/nodes.ts
@@ -1,10 +1,10 @@
-import urlJoin from "url-join";
-
 import { TFClient } from "../clients";
 import { GridClientConfig } from "../config";
-import { events, send, validateInput } from "../helpers";
+import { events, validateInput } from "../helpers";
 import { expose } from "../helpers/expose";
+import { capacity } from "./capacity";
 import {
+  FilterOptions,
   NodeGetModel,
   NodePowerModel,
   RentContractCreateModel,
@@ -15,8 +15,10 @@ import { checkBalance } from "./utils";
 
 class Nodes {
   client: TFClient;
+  capacity: capacity;
   constructor(public config: GridClientConfig) {
-    this.client = config.tfclient;
+    this.client = new TFClient(config.substrateURL, config.mnemonic, config.storeSecret, config.keypairType);
+    this.capacity = new capacity(config);
   }
 
   @expose
@@ -79,6 +81,17 @@ class Nodes {
   async setNodePower(options: NodePowerModel) {
     return (await this.client.nodes.setPower(options)).apply();
   }
+
+  @expose
+  async all() {
+    return await this.capacity.getAllNodes();
+  }
+
+  @expose
+  @validateInput
+  async filter(options?: FilterOptions) {
+    return await this.capacity.filterNodes(options);
+  }
 }
 
 export { Nodes as nodes };
diff --git a/packages/grid_client/src/primitives/nodes.ts b/packages/grid_client/src/primitives/nodes.ts
index f7ca667659..ac6f41db9c 100644
--- a/packages/grid_client/src/primitives/nodes.ts
+++ b/packages/grid_client/src/primitives/nodes.ts
@@ -8,7 +8,7 @@ import { RMB } from "../clients";
 import { Graphql } from "../clients/graphql/client";
 import { TFClient } from "../clients/tf-grid/client";
 import { send } from "../helpers/requests";
-import { FarmFilterOptions, FilterOptions } from "../modules/models";
+import { FarmFilterOptions, FilterOptions, NodeStatus } from "../modules/models";
 
 interface FarmInfo {
   name: string;
@@ -348,7 +348,7 @@ class Nodes {
       city: options.city,
       dedicated: options.dedicated,
       available_for: options.availableFor,
-      status: "up",
+      status: options.status ? options.status : NodeStatus.up,
       page: options.page,
       size: options.size,
       has_gpu: options.hasGPU,
diff --git a/packages/playground/src/App.vue b/packages/playground/src/App.vue
index c055bea2c6..f2a6b3cee3 100644
--- a/packages/playground/src/App.vue
+++ b/packages/playground/src/App.vue
@@ -291,4 +291,46 @@ export default {
 a {
   color: #5695ff !important;
 }
+
+.custom-toolbar-title {
+  max-width: 17rem !important;
+}
+.mosha__toast__content-wrapper {
+  margin-bottom: -2px;
+}
+.mosha__toast__slot-wrapper {
+  margin-bottom: -2px;
+}
+.mosha__icon {
+  margin-right: 6px !important;
+  margin-top: 2px;
+}
+
+.mosha__icon__dark__warning {
+  fill: #ffcc00 !important;
+}
+
+.mosha__icon__light__warning {
+  fill: #fb8c00 !important;
+}
+
+.mosha__toast__content.dark__warning {
+  color: #ffcc00;
+}
+
+.mosha__toast__content.light__warning {
+  color: #fb8c00;
+}
+
+.mosha__toast__close-icon.dark__warning::before {
+  color: #ffcc00 !important;
+}
+
+.mosha__toast__close-icon.light__warning::before {
+  color: #fb8c00 !important;
+}
+
+.mosha__toast__content__text {
+  font-size: 14px !important;
+}
 </style>
diff --git a/packages/playground/src/components/mosha_toast/offline_nodes_toast.vue b/packages/playground/src/components/mosha_toast/offline_nodes_toast.vue
new file mode 100644
index 0000000000..c20c41b130
--- /dev/null
+++ b/packages/playground/src/components/mosha_toast/offline_nodes_toast.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="mosha__toast__content d-block">
+    You have
+    <button class="link-color" :onclick="navigateToContractsList">
+      {{ deploymentLen }} {{ deploymentLen > 1 ? "contracts" : "contract" }}
+    </button>
+    on offline or standby {{ deploymentLen > 1 ? "nodes" : "node" }}
+    <v-spacer />
+    <span v-if="withPubIpLen >= 1">
+      {{ withPubIpLen }} {{ deploymentLen > 1 ? "of them" : "" }} with public {{ withPubIpLen > 1 ? "IPs" : "IP" }}
+    </span>
+  </div>
+</template>
+
+<script lang="ts">
+import type { PropType } from "vue";
+
+import router from "@/router";
+
+export default {
+  props: {
+    deploymentLen: {
+      type: Number,
+      required: true,
+    },
+    withPubIpLen: {
+      type: Number,
+      required: true,
+    },
+    toast: {
+      type: Object as PropType<{
+        close: () => void;
+      }>,
+      required: false,
+    },
+  },
+
+  setup(props) {
+    const navigateToContractsList = () => {
+      router.push("/contractslist");
+      if (props.toast) {
+        props.toast.close();
+      }
+    };
+    return {
+      router,
+      navigateToContractsList,
+    };
+  },
+};
+</script>
+
+<style>
+.link-color {
+  color: var(--link-color);
+}
+.mosha__toast__slot-wrapper {
+  line-height: 15px !important;
+  display: flex !important;
+  justify-content: center !important;
+  align-items: center !important;
+}
+</style>
diff --git a/packages/playground/src/components/tf_notification.vue b/packages/playground/src/components/tf_notification.vue
index 4f8ebd9a4c..426f780780 100644
--- a/packages/playground/src/components/tf_notification.vue
+++ b/packages/playground/src/components/tf_notification.vue
@@ -3,24 +3,62 @@
 </template>
 
 <script lang="ts" setup>
-import "mosha-vue-toastify/dist/style.css";
+import {
+  ContractStates,
+  type GqlContracts,
+  type GqlNodeContract,
+  type GqlRentContract,
+  GridClient,
+  NodeStatus,
+} from "@threefold/grid_client";
+import { onMounted, ref } from "vue";
 
-import { ContractStates } from "@threefold/grid_client";
-import { createToast } from "mosha-vue-toastify";
-import { onMounted } from "vue";
-import { ref } from "vue";
+import { getAllNodes } from "@/utils/get_nodes";
 
 import { useProfileManager } from "../stores";
+import { createCustomToast, ToastType } from "../utils/custom_toast";
 import { getGrid } from "../utils/grid";
+import OfflineNodesToast from "./mosha_toast/offline_nodes_toast.vue";
 
 const profileManager = useProfileManager();
 const contractsCount = ref(0);
 
+async function checkOfflineDeployments(grid: GridClient | null) {
+  const offlineNodesids = (await getAllNodes(grid, { flat: true, status: NodeStatus.down })) as number[];
+  const standByNodesids = (await getAllNodes(grid, { flat: true, status: NodeStatus.standBy })) as number[];
+  const offlineAndStandbyNodes = [...offlineNodesids, ...standByNodesids];
+
+  const myContracts: GqlContracts = await grid!.contracts.listMyContracts();
+  const contracts: (GqlNodeContract | GqlRentContract)[] = [...myContracts.nodeContracts, ...myContracts.rentContracts];
+
+  const userOfflineDeployments = [];
+  const withPubIp = [];
+
+  for (const contract of contracts) {
+    if (offlineAndStandbyNodes.includes(contract.nodeID)) {
+      userOfflineDeployments.push(contract.nodeID);
+      if ("numberOfPublicIPs" in contract && contract.numberOfPublicIPs > 0) {
+        withPubIp.push(contract.contractID);
+      }
+    }
+  }
+
+  // Get the deployments length.
+  const deploymentLen = userOfflineDeployments.length;
+
+  if (deploymentLen) {
+    const props = { deploymentLen, withPubIpLen: withPubIp.length };
+    createCustomToast(OfflineNodesToast, ToastType.warning, props);
+  }
+}
+
 onMounted(async () => {
   while (profileManager.profile) {
     const grid = await getGrid(profileManager.profile!);
     const contracts: any = await grid!.contracts.listMyContracts({ state: [ContractStates.GracePeriod] });
 
+    await checkOfflineDeployments(grid);
+
     if (
       contracts.nameContracts.length != 0 ||
       contracts.nodeContracts.length != 0 ||
@@ -28,12 +66,7 @@ onMounted(async () => {
     ) {
       contractsCount.value =
         contracts.nameContracts.length + contracts.nodeContracts.length + contracts.rentContracts.length;
-      createToast("You have " + contractsCount.value + " contracts in grace period", {
-        position: "top-right",
-        hideProgressBar: true,
-        toastBackgroundColor: "red",
-        timeout: 5000,
-      });
+      createCustomToast("You have " + contractsCount.value + " contracts in grace period", ToastType.warning);
     }
     await new Promise(resolve => setTimeout(resolve, 15 * 60 * 1000));
   }
diff --git a/packages/playground/src/main.ts b/packages/playground/src/main.ts
index 090498d9fe..92dcf40d9e 100644
--- a/packages/playground/src/main.ts
+++ b/packages/playground/src/main.ts
@@ -1,3 +1,5 @@
+import "mosha-vue-toastify/dist/style.css";
+
 import { createPinia } from "pinia";
 import { createApp } from "vue";
 
diff --git a/packages/playground/src/utils/custom_toast.ts b/packages/playground/src/utils/custom_toast.ts
new file mode 100644
index 0000000000..f8b002dd0c
--- /dev/null
+++ b/packages/playground/src/utils/custom_toast.ts
@@ -0,0 +1,80 @@
+import { createToast, type ToastContent, type ToastOptions, withProps } from "mosha-vue-toastify";
+import type { Component } from "vue";
+
+export enum ToastType {
+  danger = "danger",
+  default = "default",
+  info = "info",
+  success = "success",
+  warning = "warning",
+}
+
+const darkModeColors = {
+  danger: "#FF5252",
+  default: "#313131",
+  info: "#2196F3",
+  success: "#1AA18F",
+  warning: "#3C351D",
+};
+
+const lightModeColors = {
+  danger: "#FF5252",
+  default: "#313131",
+  info: "#2196F3",
+  success: "#1AA18F",
+  warning: "#FEF1E0",
+};
+
+/**
+ * Creates a custom toast notification.
+ * @param {Component | string} customComponent - The Vue component or a string message for the toast.
+ * @param {ToastType} type - The type of toast. (e.g. ToastType.warning).
+ * @param {Record<string, unknown>} [componentProps] - (optional): Additional props to pass to the component.
+ */
+export function createCustomToast(
+  customComponent: Component | string,
+  type: ToastType,
+  componentProps?: Record<string, unknown>,
+) {
+  const theme = localStorage.getItem("APP_CURRENT_THEME");
+  const colors = theme === "dark" ? darkModeColors : lightModeColors;
+
+  const toastOptions: ToastOptions = {
+    hideProgressBar: true,
+    position: "top-right",
+    timeout: 5000,
+    showIcon: true,
+    type,
+    toastBackgroundColor: colors[type],
+    onClose: () => {
+      console.log("Closed.....");
+    },
+  };
+
+  if (typeof customComponent === "string") {
+    createToast(customComponent, toastOptions);
+  } else {
+    const component = withProps(customComponent as any, componentProps || {});
+    const toast = createToast(component as ToastContent, toastOptions);
+    componentProps!.toast = toast;
+  }
+
+  setTimeout(() => {
+    // Change the colors of the icons/contents of all opened toast to be `tonal` as vuetify.
+    const leftIcons = document.getElementsByClassName("mosha__icon");
+    const closeIcons = document.getElementsByClassName("mosha__toast__close-icon");
+    const contents = document.getElementsByClassName("mosha__toast__content");
+
+    if (leftIcons && closeIcons && contents) {
+      for (let index = 0; index < leftIcons.length; index++) {
+        const svgIcon = leftIcons[index].children[0];
+        svgIcon.classList.add(`mosha__icon__${theme}__${type}`);
+        closeIcons[index].classList.add(`${theme}__${type}`);
+      }
+
+      for (let index = 0; index < contents.length; index++) {
+        contents[index].classList.add(`${theme}__${type}`);
+      }
+    }
+  }, 1);
+}
diff --git a/packages/playground/src/utils/get_nodes.ts b/packages/playground/src/utils/get_nodes.ts
new file mode 100644
index 0000000000..c2e54cabe8
--- /dev/null
+++ b/packages/playground/src/utils/get_nodes.ts
@@ -0,0 +1,47 @@
+import type { FilterOptions, GridClient, NodeInfo } from "@threefold/grid_client";
+import { ref } from "vue";
+
+const requestPageNumber = ref<number>(1);
+const offlineNodes = ref<NodeInfo[]>([]);
+type NodeFilters = FilterOptions & {
+  /**
+   * The flat option used to return a list of the ids of the nodes, it'll be like [1, 2, 3] where is the 1, 2 and 3 represent the ids of the nodes.
+   * @returns {Promise<number[]>} A Promise that resolves to an array of offline NodeInfo ids.
+   */
+  flat?: boolean;
+};
+
+/**
+ * Retrieves nodes from the grid proxy using the grid client with some of filters.
+ * If requestPageNumber is 0, returns the existing nodes data,
+ * otherwise fetches the next page of nodes and appends it to the result.
+ * @param {GridClient | null} grid - The GridClient instance to fetch nodes from.
+ * @returns {Promise<NodeInfo[]>} A Promise that resolves to an array of offline NodeInfo objects.
+ */
+export async function getAllNodes(grid: GridClient | null, options?: NodeFilters): Promise<NodeInfo[] | number[]> {
+  const isFlat = options?.flat || false;
+
+  const isLastPage = requestPageNumber.value === 0;
+
+  if (isLastPage) {
+    if (isFlat) {
+      return offlineNodes.value.map(node => node.nodeId);
+    }
+    return offlineNodes.value;
+  } else {
+    const offNodes: NodeInfo[] = await grid!.nodes.filter({
+      ...options,
+      // status: NodeStatus.down,
+      page: requestPageNumber.value,
+    });
+
+    if (offNodes.length) {
+      offlineNodes.value.push(...offNodes);
+      requestPageNumber.value += 1;
+    } else {
+      // needs to be last page.
+      requestPageNumber.value = 0;
+    }
+  }
+  return getAllNodes(grid, options);
+}

From 0b2ea407cddbefaadb84ab4330953434c0aa6b59 Mon Sep 17 00:00:00 2001
From: Mohamed Rabie <31689104+MohamedElmdary@users.noreply.github.com>
Date: Tue, 31 Oct 2023 13:52:08 +0200
Subject: [PATCH 11/54] Group deployment files (#1299)

* Update listing path and add migration

* Fix migrating

* Fix migrating path

* Check storageType before apply exts and rename deploymentPath method

* Add delete gateways from vm/fvm and fixed deleting gateways from previous solutions (#1279)

* Fix migrating (#1316)

* Add migration in grid_client part

* Moved migration in playground

* Remove migration from fvm/vm gateways

* Fix migrating solutions gateways

* Add avaliableFor option while filtering gateways in fvm/vm
---
 packages/grid_client/src/modules/base.ts      | 113 +++---------------
 .../playground/src/components/domain_name.vue |   9 +-
 .../src/components/manage_gateway_dialog.vue  |  10 +-
 .../src/components/select_gateway_node.vue    |   8 +-
 .../src/components/vm_deployment_table.vue    |  19 ++-
 .../playground/src/utils/delete_deployment.ts |  55 ++++++++-
 packages/playground/src/utils/gateway.ts      |   2 +
 .../playground/src/utils/load_deployment.ts   |   6 +
 packages/playground/src/utils/migration.ts    |  95 +++++++++++++++
 .../src/weblets/tf_deployment_list.vue        |   4 +-
 10 files changed, 207 insertions(+), 114 deletions(-)
 create mode 100644 packages/playground/src/utils/migration.ts

diff --git a/packages/grid_client/src/modules/base.ts b/packages/grid_client/src/modules/base.ts
index 1fbd0c1b2a..303a422e6a 100644
--- a/packages/grid_client/src/modules/base.ts
+++ b/packages/grid_client/src/modules/base.ts
@@ -106,110 +106,33 @@ class BaseModule {
 
   async _migrateListKeys(): Promise<void> {
     const oldPath = this.getDeploymentPath("");
+    const keys = await this.backendStorage.list(oldPath);
 
-    const oldKeys = await this.backendStorage.list(oldPath);
-    if (oldKeys.length === 0) {
-      return;
-    }
-
-    const values = await Promise.all(
-      oldKeys.map(k =>
-        this.backendStorage.load(PATH.join(oldPath, k, "contracts.json")).catch(error => {
-          console.log(`Error while fetching contarct data PATH[${PATH.join(oldPath, k, "contracts.json")}]`, error);
-          return null;
-        }),
-      ),
-    );
-
-    const contracts = await Promise.all(
-      values.flat(1).map(value => {
-        if (value) return this.tfClient.contracts.get({ id: value.contract_id });
-        return Promise.resolve(null);
-      }),
-    );
-
-    const updateContractsExts: Promise<any>[] = [];
-    for (const contract of contracts) {
-      if (!contract) {
-        continue;
-      }
-
-      const { nodeContract } = contract.contractType || {};
-      if (!nodeContract) {
-        continue;
-      }
-
-      const { deploymentData, deploymentHash: hash } = nodeContract;
-      const oldData = JSON.parse(deploymentData || "{}") as unknown as {
-        type: string;
-        name: string;
-        projectName: string;
-      };
-      const { name, projectName } = oldData;
-
-      let instanceName = name;
-
-      if (this.moduleName === "gateways") {
-        const [, instance] = name.split(this.config.twinId.toString());
-        if (instance) {
-          instanceName = instance;
-        }
-      }
-
-      if (projectName?.endsWith(`/${instanceName}`)) {
-        continue;
-      }
-
-      oldData.projectName = `${projectName}/${instanceName}`;
-
-      updateContractsExts.push(
-        this.tfClient.contracts.updateNode({
-          id: contract.contractId,
-          data: JSON.stringify(oldData),
-          hash,
-        }),
-      );
-    }
-
-    const _updateContractsExts = await Promise.all(updateContractsExts.flat(1));
-    const __updateContractsExts = _updateContractsExts.flat(1).filter(Boolean);
-    await this.tfClient.applyAllExtrinsics(__updateContractsExts);
+    const __getValue = (key: string) => {
+      const path = PATH.join(oldPath, key, "contracts.json");
+      return this.backendStorage.load(path).catch(error => {
+        console.log(`Error while fetching key('${key}'):`, error.message || error);
+      });
+    };
 
-    let ext1: any[] = [];
-    let ext2: any[] = [];
+    const values = await Promise.all(keys.map(__getValue));
 
-    for (let i = 0; i < oldKeys.length; i++) {
-      const oldKey = oldKeys[i];
+    const __updatePath = (key: string, index: number) => {
+      const value = values[index];
+      const from = PATH.join(oldPath, key, "contracts.json");
+      const to = this.getNewDeploymentPath(key, "contracts.json");
 
-      let newKey = oldKey;
-      if (this.moduleName === "gateways") {
-        const [, key] = oldKey.split(this.config.twinId.toString());
-        if (key) {
-          newKey = key;
-        }
+      if (!value || from === to) {
+        return Promise.resolve(null);
       }
 
-      const value = values[i];
-      const from = PATH.join(oldPath, oldKey, "contracts.json");
-      const to = this.getNewDeploymentPath(
-        ...(this.projectName.includes(newKey) ? [oldKey] : [newKey, oldKey]),
-        "contracts.json",
-      );
-
-      if (value) {
-        ext1.push(this.backendStorage.dump(to, value));
-        ext2.push(this.backendStorage.remove(from));
-      }
-    }
+      return [this.backendStorage.dump(to, value), this.backendStorage.remove(from)];
+    };
 
-    ext1 = await Promise.all(ext1.flat(1));
-    ext2 = await Promise.all(ext2.flat(1));
+    const exts = await Promise.all(keys.map(__updatePath).flat(1));
 
     if (this.backendStorage.type === BackendStorageType.tfkvstore) {
-      ext1 = ext1.flat(1).filter(x => !!x);
-      ext2 = ext2.flat(1).filter(x => !!x);
-
-      await this.tfClient.applyAllExtrinsics(ext1.concat(ext2));
+      await this.tfClient.applyAllExtrinsics(exts.flat(1).filter(Boolean));
     }
   }
 
diff --git a/packages/playground/src/components/domain_name.vue b/packages/playground/src/components/domain_name.vue
index 6c7a28b5c5..3f57522353 100644
--- a/packages/playground/src/components/domain_name.vue
+++ b/packages/playground/src/components/domain_name.vue
@@ -29,7 +29,13 @@
     </v-expand-transition>
     <div v-if="(!$props.hasIPv4 || !customDomain) && !loading">
       <v-expand-transition>
-        <SelectGatewayNode ref="selectGateway" v-model="gatewayNode" customDomain :farmData="farmData" />
+        <SelectGatewayNode
+          :available-for="$props.availableFor"
+          ref="selectGateway"
+          v-model="gatewayNode"
+          customDomain
+          :farmData="farmData"
+        />
       </v-expand-transition>
       <v-expand-transition>
         <v-alert
@@ -75,6 +81,7 @@ export default {
       type: Boolean,
       default: () => false,
     },
+    availableFor: Number,
   },
   emits: {
     "update:model-value": (value: DomainModel) => true || value,
diff --git a/packages/playground/src/components/manage_gateway_dialog.vue b/packages/playground/src/components/manage_gateway_dialog.vue
index 4c49dd5879..e8d31cb94e 100644
--- a/packages/playground/src/components/manage_gateway_dialog.vue
+++ b/packages/playground/src/components/manage_gateway_dialog.vue
@@ -16,11 +16,11 @@
           }
         "
       >
-        <template #title>Manage Gateways ({{ $props.vm?.[0]?.name }})</template>
+        <template #title>Manage Domains ({{ $props.vm?.[0]?.name }})</template>
 
         <v-tabs align-tabs="center" color="primary" class="mb-6" v-model="gatewayTab" :disabled="deleting">
-          <v-tab>Gateway List</v-tab>
-          <v-tab>Add new gateway</v-tab>
+          <v-tab>Domains List</v-tab>
+          <v-tab>Add new domain</v-tab>
         </v-tabs>
 
         <div v-show="gatewayTab === 0" :class="{ 'pb-2': !loadingGateways, 'pb-6': loadingGateways }">
@@ -88,7 +88,7 @@
             </input-tooltip>
 
             <div :style="{ marginTop: '-10px' }">
-              <domain-name hide-title v-model="domainName" />
+              <domain-name :available-for="profileManager.profile?.twinId" hide-title v-model="domainName" />
             </div>
 
             <input-validator
@@ -278,6 +278,8 @@ export default {
     }
 
     return {
+      profileManager,
+
       prefix,
       layout,
       gatewayTab,
diff --git a/packages/playground/src/components/select_gateway_node.vue b/packages/playground/src/components/select_gateway_node.vue
index f9cb805cef..4b7a6dd697 100644
--- a/packages/playground/src/components/select_gateway_node.vue
+++ b/packages/playground/src/components/select_gateway_node.vue
@@ -81,7 +81,12 @@ import type { Farm } from "../types";
 import { loadGatewayNodes } from "../utils/gateway";
 import { getGrid } from "../utils/grid";
 
-const props = defineProps<{ modelValue?: GatewayNode; farmData?: Farm; customDomain?: boolean }>();
+const props = defineProps<{
+  modelValue?: GatewayNode;
+  farmData?: Farm;
+  customDomain?: boolean;
+  availableFor?: number;
+}>();
 const emits = defineEmits<{ (event: "update:model-value", value: GatewayNode | undefined): void }>();
 
 const profileManager = useProfileManager();
@@ -115,6 +120,7 @@ async function loadNextPage() {
     page: page.value++,
     size,
     farmId: props.customDomain ? props.farmData?.farmID : undefined,
+    availableFor: props.availableFor,
   };
   nodes = await loadGatewayNodes(grid!, options);
 
diff --git a/packages/playground/src/components/vm_deployment_table.vue b/packages/playground/src/components/vm_deployment_table.vue
index a069ce4c8b..f78ed53414 100644
--- a/packages/playground/src/components/vm_deployment_table.vue
+++ b/packages/playground/src/components/vm_deployment_table.vue
@@ -115,25 +115,33 @@ const failedDeployments = ref<any[]>([]);
 
 onMounted(loadDeployments);
 async function loadDeployments() {
+  const migrateGateways = props.projectName.toLowerCase() !== "fullvm" && props.projectName.toLowerCase() !== "vm";
+
   items.value = [];
   loading.value = true;
   const grid = await getGrid(profileManager.profile!, props.projectName);
   const chunk1 = await loadVms(grid!);
-  if (chunk1.count > 0) await grid!.gateway.list();
+  if (chunk1.count > 0 && migrateGateways) {
+    await migrateModule(grid!.gateway);
+  }
 
   const chunk2 = await loadVms(updateGrid(grid!, { projectName: props.projectName.toLowerCase() }));
-  if (chunk2.count > 0) await grid!.gateway.list();
+  if (chunk2.count > 0 && migrateGateways) {
+    await migrateModule(grid!.gateway);
+  }
 
   const filter =
-    props.projectName === ProjectName.VM
+    props.projectName.toLowerCase() === ProjectName.VM.toLowerCase()
       ? undefined
       : ([vm]: [{ flist: string }]) => vm.flist.replace(/-/g, "").includes(props.projectName.toLowerCase());
 
   const chunk3 =
-    props.projectName === ProjectName.Fullvm
+    props.projectName.toLowerCase() === ProjectName.Fullvm.toLowerCase()
       ? { count: 0, items: [] }
       : await loadVms(updateGrid(grid!, { projectName: "" }), { filter });
-  if (chunk3.count > 0) await grid!.gateway.list();
+  if (chunk3.count > 0 && migrateGateways) {
+    await migrateModule(grid!.gateway);
+  }
 
   const vms = mergeLoadedDeployments(chunk1, chunk2, chunk3 as any);
   failedDeployments.value = [
@@ -201,6 +209,7 @@ defineExpose({ loadDeployments });
 
 <script lang="ts">
 import { ProjectName } from "../types";
+import { migrateModule } from "../utils/migration";
 import ListTable from "./list_table.vue";
 
 export default {
diff --git a/packages/playground/src/utils/delete_deployment.ts b/packages/playground/src/utils/delete_deployment.ts
index 843acb76b9..93847b5b45 100644
--- a/packages/playground/src/utils/delete_deployment.ts
+++ b/packages/playground/src/utils/delete_deployment.ts
@@ -3,7 +3,7 @@ import type { GridClient } from "@threefold/grid_client";
 import { ProjectName } from "@/types";
 
 import { loadVM } from "./deploy_vm";
-import { getSubdomain } from "./gateway";
+import { getSubdomain, loadDeploymentGateways } from "./gateway";
 import { updateGrid } from "./grid";
 
 export interface DeleteDeploymentOptions {
@@ -21,11 +21,20 @@ export async function deleteDeployment(grid: GridClient, options: DeleteDeployme
     }
   }
 
-  /* Delete gateway */
+  /* Start Delete gateway */
+
+  /* For fvm/vm */
+  if (isVm(options.projectName)) {
+    await deleteVmGateways(grid);
+  }
+
+  /* For solutions */
   if (solutionHasGateway(options.projectName)) {
     await deleteDeploymentGateway(grid, options);
   }
 
+  /* End Delete gateway */
+
   /* Delete deployment */
   return options.k8s ? grid.k8s.delete({ name: options.name }) : grid.machines.delete({ name: options.name });
 }
@@ -37,10 +46,12 @@ export async function deleteDeploymentGateway(grid: GridClient, options: DeleteD
     twinId: grid.twinId,
   });
   for (const projectName of [options.projectName, ProjectName.Gateway, ""]) {
-    await deleteGateway(updateGrid(grid, { projectName }), subdomain);
-    updateGrid(grid, { projectName: options.projectName });
-    return;
+    if (await deleteGateway(updateGrid(grid, { projectName }), subdomain)) {
+      break;
+    }
   }
+
+  updateGrid(grid, { projectName: options.projectName });
 }
 
 export async function deleteGateway(grid: GridClient, name: string) {
@@ -61,5 +72,37 @@ export function solutionHasGateway(projectName: ProjectName) {
     ProjectName.Wordpress,
     ProjectName.Nextcloud,
   ];
-  return solutions.includes(projectName) ? true : solutions.map(s => s.toLowerCase()).includes(projectName);
+
+  for (const solution of solutions) {
+    if (projectName.includes(solution) || projectName.includes(solution.toLowerCase())) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function isVm(projectName: string) {
+  for (const vm of [ProjectName.Fullvm, ProjectName.VM]) {
+    if (projectName.includes(vm) || projectName.includes(vm.toLowerCase())) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+async function deleteVmGateways(grid: GridClient) {
+  const gateways = await loadDeploymentGateways(grid);
+  for (const gateway of gateways) {
+    try {
+      if (gateway.type.includes("name")) {
+        await grid.gateway.delete_name(gateway);
+      } else {
+        await grid.gateway.delete_fqdn(gateway);
+      }
+    } catch (error) {
+      console.log("Error while deleting vm gateway", error);
+    }
+  }
 }
diff --git a/packages/playground/src/utils/gateway.ts b/packages/playground/src/utils/gateway.ts
index dff7393f96..f181bf8ad3 100644
--- a/packages/playground/src/utils/gateway.ts
+++ b/packages/playground/src/utils/gateway.ts
@@ -2,6 +2,8 @@ import { type FilterOptions, GatewayFQDNModel, GatewayNameModel, type GridClient
 
 import { SolutionCode } from "@/types";
 
+import { migrateModule } from "./migration";
+
 export function loadGatewayNodes(grid: GridClient, options: Omit<FilterOptions, "gateway"> = {}) {
   return grid.capacity
     .filterNodes({
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index 96fcfb790e..9b300e42f4 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -3,6 +3,7 @@ import type { GridClient } from "@threefold/grid_client";
 import { formatConsumption } from "./contracts";
 import { getGrid, updateGrid } from "./grid";
 import { normalizeError } from "./helpers";
+import { migrateModule } from "./migration";
 
 export interface LoadedDeployments<T> {
   count: number;
@@ -18,7 +19,10 @@ export interface LoadVMsOptions {
   filter?(vm: any): boolean;
 }
 export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
+  await migrateModule(grid.machines);
+
   const machines = await grid.machines.list();
+
   let count = machines.length;
   const failedDeployments: FailedDeployment[] = [];
 
@@ -116,6 +120,8 @@ export function getWireguardConfig(grid: GridClient, name: string) {
 
 export type K8S = { masters: any[]; workers: any[]; deploymentName: string; wireguard?: any };
 export async function loadK8s(grid: GridClient) {
+  await migrateModule(grid.k8s);
+
   const clusters = await grid.k8s.list();
 
   const projectName = grid.clientOptions.projectName;
diff --git a/packages/playground/src/utils/migration.ts b/packages/playground/src/utils/migration.ts
new file mode 100644
index 0000000000..965ebfa520
--- /dev/null
+++ b/packages/playground/src/utils/migration.ts
@@ -0,0 +1,95 @@
+import type { BaseModule } from "@threefold/grid_client/dist/es6/modules/base";
+import type { Contract } from "@threefold/tfchain_client";
+
+export async function migrateModule(module: BaseModule) {
+  await module._list(); // force grid_client migration
+
+  const path = module.getNewDeploymentPath();
+  const keys = await module.backendStorage.list(path);
+
+  function __loadValue(key: string) {
+    return module.backendStorage.load(module.getNewDeploymentPath(key, "contracts.json")).catch(error => {
+      console.log(`error while getting value of key(${key})`, error.message || error);
+      return null;
+    });
+  }
+
+  const values = await Promise.all(keys.map(__loadValue));
+
+  await _migrateContracts(module, values);
+  await _migrateKeys(module, keys, values);
+}
+
+async function _migrateContracts(module: BaseModule, values: any[]) {
+  function __loadContract(value: null | [{ contract_id: number }]) {
+    if (!value) {
+      return Promise.resolve(null);
+    }
+    return module.tfClient.contracts.get({ id: value[0].contract_id });
+  }
+
+  function __updateContract(contract: null | Contract) {
+    const nodeContract = contract?.contractType?.nodeContract;
+
+    if (!nodeContract) {
+      return [];
+    }
+
+    const { deploymentData, deploymentHash: hash } = nodeContract;
+    const oldData = JSON.parse(deploymentData || "{}") as unknown as {
+      type: string;
+      name: string;
+      projectName: string;
+    };
+    const { name, projectName } = oldData;
+    let instanceName = name;
+    if (module.moduleName === "gateways") {
+      const [, instance] = name.split(module.config.twinId.toString());
+      if (instance) {
+        instanceName = instance;
+      }
+    }
+    if (projectName?.endsWith(`/${instanceName}`)) {
+      return [];
+    }
+
+    oldData.projectName = `${projectName}/${instanceName}`;
+    return module.tfClient.contracts.updateNode({
+      id: contract.contractId,
+      data: JSON.stringify(oldData),
+      hash,
+    });
+  }
+
+  const contracts = await Promise.all(values.map(__loadContract));
+  const updateContractsExts = await Promise.all(contracts.map(__updateContract).flat(1));
+  await module.tfClient.applyAllExtrinsics(updateContractsExts.flat(1).filter(Boolean));
+}
+
+async function _migrateKeys(module: BaseModule, keys: string[], values: any[]) {
+  function __normalizeKey(key: string): string {
+    if (module.moduleName === "gateways") {
+      const [, newKey] = key.split(module.config.twinId.toString());
+      if (newKey) {
+        return newKey;
+      }
+    }
+    return key;
+  }
+
+  function __updateKey(key: string, index: number) {
+    const normalizedKey = __normalizeKey(key); // will be different in gateways moduleName
+    const value = values[index];
+    const from = module.getNewDeploymentPath(key, "contracts.json");
+    const to = module.getNewDeploymentPath(normalizedKey, key, "contracts.json");
+
+    if (!value || from === to) {
+      return [];
+    }
+
+    return [module.backendStorage.dump(to, value), module.backendStorage.remove(from)];
+  }
+
+  const exts = await Promise.all(keys.map(__updateKey).flat(1));
+  await module.tfClient.applyAllExtrinsics(exts.flat(1).filter(Boolean));
+}
diff --git a/packages/playground/src/weblets/tf_deployment_list.vue b/packages/playground/src/weblets/tf_deployment_list.vue
index 25e0e7d64d..a63846bc0b 100644
--- a/packages/playground/src/weblets/tf_deployment_list.vue
+++ b/packages/playground/src/weblets/tf_deployment_list.vue
@@ -26,7 +26,7 @@
             @click="openDialog(tabs[activeTab].value, item)"
           />
 
-          <IconActionBtn icon="mdi-cog" tooltip="Deploy FQDN Gateway" @click="dialog = item.value.deploymentName" />
+          <IconActionBtn icon="mdi-cog" tooltip="Manage Domains" @click="dialog = item.value.deploymentName" />
 
           <ManageGatewayDialog
             v-if="dialog === item.value.deploymentName"
@@ -42,7 +42,7 @@
             @click="openDialog(tabs[activeTab].value, item)"
           />
 
-          <IconActionBtn icon="mdi-cog" tooltip="Manage Gateways" @click="dialog = item.value.deploymentName" />
+          <IconActionBtn icon="mdi-cog" tooltip="Manage Domains" @click="dialog = item.value.deploymentName" />
 
           <ManageGatewayDialog
             v-if="dialog === item.value.deploymentName"

From 93da6e386adb3be6243472aad8790979f9611bca Mon Sep 17 00:00:00 2001
From: Alaa228 <alaamahmoud.1223@gmail.com>
Date: Tue, 31 Oct 2023 15:53:52 +0200
Subject: [PATCH 12/54] Fix bug of listing vms && add contract Id. (#1317)

* fix bug of listing vms

* add contract id of failed deployments

* remove debug logs

* remove debug logs

* remove v-else from contract template

* add with contract id on if condition

* fix appearance of project name

* add missing return

* return timeout

* fix failed workflow

* add log error

* add condition on contracts instead of nodeIds

* add contracts inside try block
---
 .../src/components/k8s_deployment_table.vue   | 24 +++++++-------
 .../src/components/vm_deployment_table.vue    | 32 ++++++++++++-------
 .../playground/src/utils/load_deployment.ts   | 28 ++++++++++++----
 3 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/packages/playground/src/components/k8s_deployment_table.vue b/packages/playground/src/components/k8s_deployment_table.vue
index 10b8e9c1cd..df2e225d4d 100644
--- a/packages/playground/src/components/k8s_deployment_table.vue
+++ b/packages/playground/src/components/k8s_deployment_table.vue
@@ -15,17 +15,19 @@
         <v-card-title style="color: #ffcc00; font-weight: bold">Failed Deployments</v-card-title>
         <v-divider color="#FFCC00" />
         <v-card-text>
-          <ul>
-            <li v-for="deployment in failedDeployments" :key="deployment.name">
-              {{
-                deployment.nodes.length > 0
-                  ? `${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
-                      ", ",
-                    )}`
-                  : deployment.name
-              }}
-            </li>
-          </ul>
+          <li v-for="deployment in failedDeployments" :key="deployment.name">
+            {{
+              deployment.nodes.length > 0
+                ? `${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(", ")}`
+                : deployment.name
+            }}
+            <template v-if="deployment.contracts && deployment.contracts.length > 0">
+              with contract id:
+              <span v-for="contract in deployment.contracts" :key="contract.contract_id">
+                {{ contract.contract_id }} .
+              </span>
+            </template>
+          </li>
         </v-card-text>
         <v-card-actions class="justify-end">
           <v-btn @click="showDialog = false" class="grey lighten-2 black--text" color="#FFCC00">Close</v-btn>
diff --git a/packages/playground/src/components/vm_deployment_table.vue b/packages/playground/src/components/vm_deployment_table.vue
index f78ed53414..3c7e6e3616 100644
--- a/packages/playground/src/components/vm_deployment_table.vue
+++ b/packages/playground/src/components/vm_deployment_table.vue
@@ -16,17 +16,26 @@
           <v-card-title style="color: #ffcc00; font-weight: bold">Failed Deployments</v-card-title>
           <v-divider color="#FFCC00" />
           <v-card-text>
-            <ul>
-              <li v-for="deployment in failedDeployments" :key="deployment.name">
-                {{
-                  deployment.nodes.length > 0
-                    ? `${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
-                        ", ",
-                      )}`
-                    : deployment.name
-                }}
-              </li>
-            </ul>
+            <v-list>
+              <v-list-item v-for="deployment in failedDeployments" :key="deployment.name">
+                <div>
+                  {{
+                    deployment.nodes.length > 0
+                      ? `- ${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
+                          ", ",
+                        )}`
+                      : deployment.name
+                  }}
+                  <template v-if="deployment.contracts && deployment.contracts.length > 0">
+                    with contract id:
+                    <span v-for="(contract, index) in deployment.contracts" :key="index">
+                      {{ contract.contract_id }}
+                      <template v-if="index < deployment.contracts.length - 1">, </template>
+                    </span>
+                  </template>
+                </div>
+              </v-list-item>
+            </v-list>
           </v-card-text>
           <v-card-actions class="justify-end">
             <v-btn @click="showDialog = false" class="grey lighten-2 black--text" color="#FFCC00">Close</v-btn>
@@ -34,6 +43,7 @@
         </v-card>
       </v-dialog>
     </v-alert>
+    <!-- v-list -->
 
     <ListTable
       :headers="filteredHeaders"
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index 9b300e42f4..0df65a3686 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -1,5 +1,7 @@
 import type { GridClient } from "@threefold/grid_client";
 
+import { ProjectName } from "@/types";
+
 import { formatConsumption } from "./contracts";
 import { getGrid, updateGrid } from "./grid";
 import { normalizeError } from "./helpers";
@@ -13,6 +15,7 @@ export interface LoadedDeployments<T> {
 interface FailedDeployment {
   name: string;
   nodes: number[];
+  contracts: any[];
 }
 
 export interface LoadVMsOptions {
@@ -32,6 +35,19 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
   )) as GridClient[];
 
   const promises = machines.map(async (name, index) => {
+    let contracts: any[] = [];
+    try {
+      contracts = await grids[index].machines.getDeploymentContracts(name);
+      if (contracts.length === 0) {
+        count--;
+        return;
+      }
+    } catch (e) {
+      console.log(e);
+      failedDeployments.push({ name, nodes: [], contracts: contracts });
+      return;
+    }
+
     const nodeIds = await grids[index].machines._getDeploymentNodeIds(name);
     const machinePromise = grids[index].machines.getObj(name);
     const timeoutPromise = new Promise((resolve, reject) => {
@@ -42,13 +58,9 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
 
     try {
       const result = await Promise.race([machinePromise, timeoutPromise]);
-
       if (result instanceof Error && result.message === "Timeout") {
         console.log(`%c[Error] Timeout loading deployment with name ${name}`, "color: rgb(207, 102, 121)");
         return null;
-      } else if ((result as any).length === 0) {
-        console.log(`%c[Error] failed to load deployment with name ${name}`, "color: rgb(207, 102, 121)");
-        failedDeployments.push({ name, nodes: nodeIds });
       } else {
         return result;
       }
@@ -57,7 +69,7 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
         `%c[Error] failed to load deployment with name ${name}:\n${normalizeError(e, "No errors were provided.")}`,
         "color: rgb(207, 102, 121)",
       );
-      failedDeployments.push({ name, nodes: nodeIds });
+      failedDeployments.push({ name, nodes: nodeIds, contracts: contracts });
     }
   });
   const items = await Promise.all(promises);
@@ -131,6 +143,7 @@ export async function loadK8s(grid: GridClient) {
   const failedDeployments: FailedDeployment[] = [];
 
   const promises = clusters.map(async (name, index) => {
+    const contracts = await grids[index].k8s.getDeploymentContracts(name);
     const nodeIds = await grids[index].k8s._getDeploymentNodeIds(name);
     const clusterPromise = grids[index].k8s.getObj(name);
     const timeoutPromise = new Promise((resolve, reject) => {
@@ -146,7 +159,7 @@ export async function loadK8s(grid: GridClient) {
         return null;
       } else if ((result as any).masters.length === 0 && (result as any).workers.length === 0) {
         console.log(`%c[Error] failed to load deployment with name ${name}}`, "color: rgb(207, 102, 121)");
-        failedDeployments.push({ name, nodes: nodeIds });
+        failedDeployments.push({ name, nodes: nodeIds, contracts: contracts });
       } else {
         return result;
       }
@@ -155,7 +168,7 @@ export async function loadK8s(grid: GridClient) {
         `%c[Error] failed to load deployment with name ${name}:\n${normalizeError(e, "No errors were provided.")}`,
         "color: rgb(207, 102, 121)",
       );
-      failedDeployments.push({ name, nodes: nodeIds });
+      failedDeployments.push({ name, nodes: nodeIds, contracts: contracts });
     }
   });
   const items = (await Promise.all(promises)) as any[];
@@ -191,6 +204,7 @@ export async function loadK8s(grid: GridClient) {
   return <LoadedDeployments<K8S>>{
     count: clusters.length,
     items: data,
+    failedDeployments,
   };
 }
 

From 78a512e4c8c041af1f5e22b26d37152efe3b9838 Mon Sep 17 00:00:00 2001
From: mohamedamer453 <amerm@incubaid.com>
Date: Wed, 1 Nov 2023 10:54:05 +0200
Subject: [PATCH 13/54] change remove to delete

---
 packages/playground/src/weblets/tf_contracts_list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/weblets/tf_contracts_list.vue b/packages/playground/src/weblets/tf_contracts_list.vue
index 6ab3fbd7c6..0f36c2c62e 100644
--- a/packages/playground/src/weblets/tf_contracts_list.vue
+++ b/packages/playground/src/weblets/tf_contracts_list.vue
@@ -112,7 +112,7 @@
       </v-card-text>
       <v-card-actions>
         <v-spacer></v-spacer>
-        <v-btn color="error" variant="text" @click="onDelete"> Remove </v-btn>
+        <v-btn color="error" variant="text" @click="onDelete"> Delete </v-btn>
         <v-btn color="error" variant="tonal" @click="deletingDialog = false"> Cancel </v-btn>
       </v-card-actions>
     </v-card>

From 04756e24386a70db67d0279e3bbbd8d51f794f84 Mon Sep 17 00:00:00 2001
From: mayar osama <mayarosama18@gmail.com>
Date: Wed, 1 Nov 2023 11:05:39 +0200
Subject: [PATCH 14/54] Adding validation for v2

---
 .../src/components/select_vm_image.vue        | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/playground/src/components/select_vm_image.vue b/packages/playground/src/components/select_vm_image.vue
index 26f318148f..3f543407fb 100644
--- a/packages/playground/src/components/select_vm_image.vue
+++ b/packages/playground/src/components/select_vm_image.vue
@@ -84,14 +84,20 @@ watch(
 );
 
 function isFlistExist(flist: string) {
-  return fetch(flist + ".md5")
-    .then(res => res.status !== 200)
-    .then(invalid => {
-      if (invalid) throw new Error();
-    })
-    .catch(() => {
-      return { message: `Couldn't find flist with the provided url.`, isExist: false };
-    });
+  if (flist.includes(".flist")) {
+    return fetch(flist + ".md5")
+      .then(res => res.status !== 200)
+      .then(invalid => {
+        if (invalid) throw new Error();
+      })
+      .catch(() => {
+        return { message: `Couldn't find flist with the provided url.`, isExist: false };
+      });
+  } else {
+    if (!flist.endsWith(".fl")) {
+      return { message: `Not supported flist url` };
+    }
+  }
 }
 </script>
 

From cd0b70561d54f46b1dcb4991474864c1d7a929da Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Wed, 1 Nov 2023 11:54:25 +0200
Subject: [PATCH 15/54] change loading contract details error ux

---
 .../playground/src/weblets/tf_contracts_list.vue    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/playground/src/weblets/tf_contracts_list.vue b/packages/playground/src/weblets/tf_contracts_list.vue
index 6ab3fbd7c6..6ff7180d8f 100644
--- a/packages/playground/src/weblets/tf_contracts_list.vue
+++ b/packages/playground/src/weblets/tf_contracts_list.vue
@@ -13,7 +13,6 @@
         refresh
       </v-btn>
     </template>
-
     <ListTable
       :headers="headers"
       :items="contracts"
@@ -60,16 +59,18 @@
         <p v-else>-</p>
       </template>
       <template #[`item.actions`]="{ item }">
-        <v-tooltip text="Show Details">
+        <v-tooltip :text="failedContractId == item.value.contractId ? 'Retry' : 'Show Details'">
           <template #activator="{ props }">
             <v-btn
+              :color="failedContractId == item.value.contractId ? 'error' : ''"
               variant="tonal"
               @click="showDetails(item.value)"
               :disabled="(loading && loadingContractId !== item.value.contractId) || deleting"
               :loading="loadingContractId == item.value.contractId"
               v-bind="props"
             >
-              <v-icon>mdi-eye-outline</v-icon>
+              <v-icon class="pt-1" v-if="failedContractId == item.value.contractId">mdi-refresh</v-icon>
+              <v-icon v-else>mdi-eye-outline</v-icon>
             </v-btn>
           </template>
         </v-tooltip>
@@ -193,9 +194,11 @@ const nodeIDs = computed(() => {
 });
 
 const loadingContractId = ref<number>();
+const failedContractId = ref<number>();
 const contractLocked = ref<ContractLock>();
 
 async function showDetails(value: any) {
+  failedContractId.value = undefined;
   if (value.type === "name" || value.type === "rent") {
     return layout.value.openDialog(value, false, true);
   }
@@ -206,7 +209,8 @@ async function showDetails(value: any) {
     const deployment = await grid.value?.zos.getDeployment({ contractId });
     return layout.value.openDialog(deployment, false, true);
   } catch (e) {
-    layout.value.setStatus("failed", normalizeError(e, `Failed to load details of contract(${contractId})`));
+    failedContractId.value = contractId;
+    createCustomToast(`Failed to load details of contract ID: ${contractId}`, ToastType.danger);
   } finally {
     loadingContractId.value = undefined;
     loading.value = false;
@@ -310,6 +314,7 @@ import type { ContractLock } from "@threefold/tfchain_client";
 import { gridProxyClient } from "../clients";
 import ListTable from "../components/list_table.vue";
 import { solutionType } from "../types/index";
+import { createCustomToast, ToastType } from "../utils/custom_toast";
 import { downloadAsJson, normalizeError } from "../utils/helpers";
 
 export default {

From 774fb7fbeaf006a1534ee6ac5255a2b19daa47db Mon Sep 17 00:00:00 2001
From: mohamedamer453 <amerm@incubaid.com>
Date: Wed, 1 Nov 2023 12:02:31 +0200
Subject: [PATCH 16/54] improve formatting

---
 packages/playground/src/utils/helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/utils/helpers.ts b/packages/playground/src/utils/helpers.ts
index 067182dda3..be8d9454f6 100644
--- a/packages/playground/src/utils/helpers.ts
+++ b/packages/playground/src/utils/helpers.ts
@@ -40,7 +40,7 @@ export function normalizeBalance(num: number | string | undefined, floor = false
     else return "~ <0.001";
   }
 
-  return (+num).toFixed(3).replace(/0+$/g, "");
+  return (+num).toFixed(3).replace(/\.0+$/g, "");
 }
 
 export function isEnoughBalance(balance: any, min = 0.001): boolean {

From 15ca6842d3081258f875d9961da6efebda7115e4 Mon Sep 17 00:00:00 2001
From: Mohamed Rabie <31689104+MohamedElmdary@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:05:17 +0200
Subject: [PATCH 17/54] Handle gracePeriod state (#1330)

---
 packages/playground/src/utils/migration.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/playground/src/utils/migration.ts b/packages/playground/src/utils/migration.ts
index 965ebfa520..63081f74de 100644
--- a/packages/playground/src/utils/migration.ts
+++ b/packages/playground/src/utils/migration.ts
@@ -28,9 +28,14 @@ async function _migrateContracts(module: BaseModule, values: any[]) {
     return module.tfClient.contracts.get({ id: value[0].contract_id });
   }
 
-  function __updateContract(contract: null | Contract) {
-    const nodeContract = contract?.contractType?.nodeContract;
+  function __updateContract(contract: null | Contract, index: number) {
+    const gracePeriod = contract?.state?.gracePeriod || 0;
+    if (!contract || gracePeriod > 0) {
+      values[index] = null;
+      return [];
+    }
 
+    const nodeContract = contract?.contractType?.nodeContract;
     if (!nodeContract) {
       return [];
     }

From 6eb04cbfc37cf32e63b5bd06ba0adf3c47d8678c Mon Sep 17 00:00:00 2001
From: kassem <omarksm09@gmail.com>
Date: Wed, 1 Nov 2023 12:28:56 +0200
Subject: [PATCH 18/54] reset error value on refresh

---
 packages/playground/src/weblets/tf_contracts_list.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/playground/src/weblets/tf_contracts_list.vue b/packages/playground/src/weblets/tf_contracts_list.vue
index 6ff7180d8f..63e0e49012 100644
--- a/packages/playground/src/weblets/tf_contracts_list.vue
+++ b/packages/playground/src/weblets/tf_contracts_list.vue
@@ -181,6 +181,7 @@ const headers: VDataTableHeader = [
 
 async function onMount() {
   loading.value = true;
+  failedContractId.value = undefined;
   contracts.value = [];
   grid.value = await getGrid(profileManager.profile!);
   contracts.value = await getUserContracts(grid.value!);

From 966184e730644809c5ccdf7a5884b26c4ce43c9a Mon Sep 17 00:00:00 2001
From: mayar osama <mayarosama18@gmail.com>
Date: Wed, 1 Nov 2023 13:31:23 +0200
Subject: [PATCH 19/54] fixing type error

---
 .../src/components/select_vm_image.vue         | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/packages/playground/src/components/select_vm_image.vue b/packages/playground/src/components/select_vm_image.vue
index 3f543407fb..1bfaa5a8a1 100644
--- a/packages/playground/src/components/select_vm_image.vue
+++ b/packages/playground/src/components/select_vm_image.vue
@@ -83,19 +83,17 @@ watch(
   { immediate: true, deep: true },
 );
 
-function isFlistExist(flist: string) {
+async function isFlistExist(flist: string) {
   if (flist.includes(".flist")) {
-    return fetch(flist + ".md5")
-      .then(res => res.status !== 200)
-      .then(invalid => {
-        if (invalid) throw new Error();
-      })
-      .catch(() => {
-        return { message: `Couldn't find flist with the provided url.`, isExist: false };
-      });
+    try {
+      const res = await fetch(flist + ".md5");
+      if (res.status !== 200) throw new Error();
+    } catch (error) {
+      return { message: `Couldn't find flist with the provided url.`, isExist: false };
+    }
   } else {
     if (!flist.endsWith(".fl")) {
-      return { message: `Not supported flist url` };
+      return { message: `Not a supported flist url` };
     }
   }
 }

From f908abd04a9485b366b910c3e9c1c6e99269b294 Mon Sep 17 00:00:00 2001
From: Mohamed Amer <101194226+mohamedamer453@users.noreply.github.com>
Date: Wed, 1 Nov 2023 14:16:59 +0200
Subject: [PATCH 20/54] update workflow tag (#1334)

---
 .github/workflows/mass_deployments.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/mass_deployments.yml b/.github/workflows/mass_deployments.yml
index f3e09253c3..d19c691c0a 100644
--- a/.github/workflows/mass_deployments.yml
+++ b/.github/workflows/mass_deployments.yml
@@ -19,8 +19,6 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: refs/tags/v2.2.0
       - name: Set up node 18
         uses: actions/setup-node@v3
         with:

From 0b4c9cfc165852fce94f9dc8166ff10a0235a567 Mon Sep 17 00:00:00 2001
From: Mohamed Rabie <31689104+MohamedElmdary@users.noreply.github.com>
Date: Wed, 1 Nov 2023 14:48:49 +0200
Subject: [PATCH 21/54] Fix migrating on kvstore in non decrypted keys (#1335)

* Update tfkvstore to migrate using new value 'moveValue(fromKey, toKey)'

* Fix playground listing error
---
 .../src/clients/tf-grid/kvstore.ts            | 12 +++-
 packages/grid_client/src/modules/base.ts      | 19 ++++--
 packages/grid_client/src/modules/models.ts    |  2 +
 .../src/storage/BackendStorageInterface.ts    |  5 ++
 packages/grid_client/src/storage/tfkvstore.ts | 21 ++++++
 .../src/components/vm_deployment_table.vue    | 64 ++++++++++++-------
 packages/playground/src/utils/custom_toast.ts |  3 -
 .../playground/src/utils/load_deployment.ts   | 19 +++++-
 8 files changed, 110 insertions(+), 35 deletions(-)

diff --git a/packages/grid_client/src/clients/tf-grid/kvstore.ts b/packages/grid_client/src/clients/tf-grid/kvstore.ts
index 53f94a7eac..d1c23a08fe 100644
--- a/packages/grid_client/src/clients/tf-grid/kvstore.ts
+++ b/packages/grid_client/src/clients/tf-grid/kvstore.ts
@@ -14,13 +14,21 @@ class TFKVStore extends KVStore {
     super(client);
   }
 
-  async set(options: KVStoreSetOptions) {
+  async set(options: KVStoreSetOptions & { encrypt?: boolean }) {
+    if (options.encrypt === false) {
+      return super.set({ key: options.key, value: options.value });
+    }
+
     const encryptedValue = this.encrypt(options.value);
     return super.set({ key: options.key, value: encryptedValue });
   }
 
-  async get(options: KVStoreGetOptions) {
+  async get(options: KVStoreGetOptions & { decrypt?: boolean }) {
     const encryptedValue = await super.get(options);
+    if (options.decrypt === false) {
+      return encryptedValue;
+    }
+
     if (encryptedValue) {
       try {
         return this.decrypt(encryptedValue);
diff --git a/packages/grid_client/src/modules/base.ts b/packages/grid_client/src/modules/base.ts
index 303a422e6a..a5d9444bcc 100644
--- a/packages/grid_client/src/modules/base.ts
+++ b/packages/grid_client/src/modules/base.ts
@@ -108,6 +108,19 @@ class BaseModule {
     const oldPath = this.getDeploymentPath("");
     const keys = await this.backendStorage.list(oldPath);
 
+    if (this.backendStorage.type === BackendStorageType.tfkvstore) {
+      const exts = await Promise.all(
+        keys.map(key =>
+          this.backendStorage.storage.moveValue!(
+            PATH.join(oldPath, key, "contracts.json"),
+            this.getNewDeploymentPath(key, "contracts.json"),
+          ),
+        ),
+      );
+      await this.tfClient.applyAllExtrinsics(exts.flat(1).filter(Boolean));
+      return;
+    }
+
     const __getValue = (key: string) => {
       const path = PATH.join(oldPath, key, "contracts.json");
       return this.backendStorage.load(path).catch(error => {
@@ -129,11 +142,7 @@ class BaseModule {
       return [this.backendStorage.dump(to, value), this.backendStorage.remove(from)];
     };
 
-    const exts = await Promise.all(keys.map(__updatePath).flat(1));
-
-    if (this.backendStorage.type === BackendStorageType.tfkvstore) {
-      await this.tfClient.applyAllExtrinsics(exts.flat(1).filter(Boolean));
-    }
+    await Promise.all(keys.map(__updatePath).flat(1));
   }
 
   async _list(): Promise<string[]> {
diff --git a/packages/grid_client/src/modules/models.ts b/packages/grid_client/src/modules/models.ts
index 617c16e0c8..41a746b882 100644
--- a/packages/grid_client/src/modules/models.ts
+++ b/packages/grid_client/src/modules/models.ts
@@ -373,9 +373,11 @@ class TwinDeleteModel {
 class KVStoreSetModel {
   @Expose() @IsString() @IsNotEmpty() key: string;
   @Expose() @IsString() @IsNotEmpty() value: string;
+  @Expose() @IsBoolean() @IsOptional() encrypt?: boolean;
 }
 class KVStoreGetModel {
   @Expose() @IsString() @IsNotEmpty() key: string;
+  @Expose() @IsBoolean() @IsOptional() decrypt?: boolean;
 }
 class KVStoreRemoveModel {
   @Expose() @IsString() @IsNotEmpty() key: string;
diff --git a/packages/grid_client/src/storage/BackendStorageInterface.ts b/packages/grid_client/src/storage/BackendStorageInterface.ts
index 349ffb5d87..3e08b38e89 100644
--- a/packages/grid_client/src/storage/BackendStorageInterface.ts
+++ b/packages/grid_client/src/storage/BackendStorageInterface.ts
@@ -1,3 +1,5 @@
+import { ExtrinsicResult } from "@threefold/tfchain_client";
+
 interface BackendStorageInterface {
   // get a value from the storage
   get(key: string);
@@ -10,6 +12,9 @@ interface BackendStorageInterface {
 
   // list all keys in the storage
   list(key: string);
+
+  // This method currently only implemented in tfkvstore
+  moveValue?(fromKey: string, toKey: string): Promise<ExtrinsicResult<void>[]>;
 }
 
 export default BackendStorageInterface;
diff --git a/packages/grid_client/src/storage/tfkvstore.ts b/packages/grid_client/src/storage/tfkvstore.ts
index 06cc493cf0..b47bbb6ad4 100644
--- a/packages/grid_client/src/storage/tfkvstore.ts
+++ b/packages/grid_client/src/storage/tfkvstore.ts
@@ -1,5 +1,6 @@
 import { SubmittableExtrinsic } from "@polkadot/api-base/types";
 import { ISubmittableResult } from "@polkadot/types/types";
+import { ExtrinsicResult } from "@threefold/tfchain_client";
 
 import { TFClient } from "../clients/tf-grid/client";
 import { KeypairType } from "../zos/deployment";
@@ -92,6 +93,26 @@ class TFKVStoreBackend implements BackendStorageInterface {
     splits[k] = value;
     return splits;
   }
+
+  public async moveValue(fromKey: string, toKey: string): Promise<ExtrinsicResult<void>[]> {
+    const exts: ExtrinsicResult<void>[] = [];
+
+    for (let i = 0; ; i++) {
+      const key = i === 0 ? fromKey : fromKey + "." + i;
+      const value = await this.client.kvStore.get({ key, decrypt: false });
+      if (value) {
+        const e = await Promise.all([
+          this.client.kvStore.set({ key: toKey, value, encrypt: false }),
+          this.client.kvStore.delete({ key }),
+        ]);
+        exts.push(...e.flat(1));
+      } else {
+        break;
+      }
+    }
+
+    return exts;
+  }
 }
 
 export { TFKVStoreBackend };
diff --git a/packages/playground/src/components/vm_deployment_table.vue b/packages/playground/src/components/vm_deployment_table.vue
index 3c7e6e3616..0c3b7b089a 100644
--- a/packages/playground/src/components/vm_deployment_table.vue
+++ b/packages/playground/src/components/vm_deployment_table.vue
@@ -11,30 +11,15 @@
       </span>
       <v-icon class="custom-icon" @click="showDialog = true">mdi-file-document-outline </v-icon>
 
-      <v-dialog transition="dialog-bottom-transition" v-model="showDialog" persistent max-width="500px">
+      <v-dialog transition="dialog-bottom-transition" v-model="showDialog" max-width="500px" scrollable>
         <v-card>
           <v-card-title style="color: #ffcc00; font-weight: bold">Failed Deployments</v-card-title>
           <v-divider color="#FFCC00" />
           <v-card-text>
-            <v-list>
-              <v-list-item v-for="deployment in failedDeployments" :key="deployment.name">
-                <div>
-                  {{
-                    deployment.nodes.length > 0
-                      ? `- ${deployment.name} on node${deployment.nodes.length > 1 ? "s" : ""}: ${deployment.nodes.join(
-                          ", ",
-                        )}`
-                      : deployment.name
-                  }}
-                  <template v-if="deployment.contracts && deployment.contracts.length > 0">
-                    with contract id:
-                    <span v-for="(contract, index) in deployment.contracts" :key="index">
-                      {{ contract.contract_id }}
-                      <template v-if="index < deployment.contracts.length - 1">, </template>
-                    </span>
-                  </template>
-                </div>
-              </v-list-item>
+            <v-list :items="failedDeploymentList" item-props lines="three">
+              <template v-slot:subtitle="{ subtitle }">
+                <div v-html="subtitle"></div>
+              </template>
             </v-list>
           </v-card-text>
           <v-card-actions class="justify-end">
@@ -43,7 +28,6 @@
         </v-card>
       </v-dialog>
     </v-alert>
-    <!-- v-list -->
 
     <ListTable
       :headers="filteredHeaders"
@@ -121,7 +105,13 @@ const count = ref<number>();
 const items = ref<any[]>([]);
 const showDialog = ref(false);
 const showEncryption = ref(false);
-const failedDeployments = ref<any[]>([]);
+const failedDeployments = ref<
+  {
+    name: string;
+    nodes?: number[];
+    contracts?: { contract_id: number; node_id: number }[];
+  }[]
+>([]);
 
 onMounted(loadDeployments);
 async function loadDeployments() {
@@ -214,6 +204,36 @@ const filteredHeaders = computed(() => {
   return headers;
 });
 
+const failedDeploymentList = computed(() => {
+  return failedDeployments.value
+    .map(({ name, nodes = [], contracts = [] }, index) => {
+      const nodeMessage =
+        nodes.length > 0
+          ? `<span class="ml-4 text-primary font-weight-bold">On Node:</span> ${nodes.join(", ")}.<br/>`
+          : "";
+      const contractMessage =
+        contracts.length > 0
+          ? ` <span class="ml-4 text-primary font-weight-bold">With Contract ID:</span> ${contracts
+              .map(c => c.contract_id)
+              .join(", ")}.`
+          : "";
+
+      const subtitle =
+        nodeMessage + contractMessage === ""
+          ? `<span class="ml-4 text-error font-weight-bold">Error:</span> Failed to decrypt deployment data.`
+          : nodeMessage + contractMessage;
+
+      const item: any[] = [{ title: name, subtitle }];
+
+      if (index + 1 !== failedDeployments.value.length) {
+        item.push({ type: "divider", inset: false });
+      }
+
+      return item;
+    })
+    .flat(1);
+});
+
 defineExpose({ loadDeployments });
 </script>
 
diff --git a/packages/playground/src/utils/custom_toast.ts b/packages/playground/src/utils/custom_toast.ts
index f8b002dd0c..0bc35aa222 100644
--- a/packages/playground/src/utils/custom_toast.ts
+++ b/packages/playground/src/utils/custom_toast.ts
@@ -46,9 +46,6 @@ export function createCustomToast(
     showIcon: true,
     type,
     toastBackgroundColor: colors[type],
-    onClose: () => {
-      console.log("Closed.....");
-    },
   };
 
   if (typeof customComponent === "string") {
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index 0df65a3686..73651c72be 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -21,6 +21,18 @@ interface FailedDeployment {
 export interface LoadVMsOptions {
   filter?(vm: any): boolean;
 }
+
+async function getDeploymentContracts(grid: GridClient, name: string, projectName: string) {
+  const contracts1 = await grid.machines.getDeploymentContracts(name);
+  if (contracts1.length) {
+    return contracts1;
+  }
+
+  // will raise error if can't decrypt
+  const contracts2 = await updateGrid(grid, { projectName }).machines.getDeploymentContracts(name);
+  return contracts2;
+}
+
 export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
   await migrateModule(grid.machines);
 
@@ -29,15 +41,16 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
   let count = machines.length;
   const failedDeployments: FailedDeployment[] = [];
 
-  const projectName = grid.clientOptions.projectName;
+  const projectName = grid.clientOptions.projectName || "";
   const grids = (await Promise.all(
-    machines.map(n => getGrid(grid.clientOptions, `${projectName}/${n}`)),
+    machines.map(n => getGrid(grid.clientOptions, projectName ? `${projectName}/${n}` : n)),
   )) as GridClient[];
 
   const promises = machines.map(async (name, index) => {
     let contracts: any[] = [];
     try {
-      contracts = await grids[index].machines.getDeploymentContracts(name);
+      contracts = await getDeploymentContracts(grids[index], name, projectName);
+
       if (contracts.length === 0) {
         count--;
         return;

From e604bed4eb8c085cfd8128f1e4fb7710b59653eb Mon Sep 17 00:00:00 2001
From: ahmedhanafy725 <hanafya@incubaid.com>
Date: Wed, 1 Nov 2023 15:15:38 +0200
Subject: [PATCH 22/54] Get only the available access nodes for the user while
 randomly filter them

---
 packages/grid_client/src/high_level/machine.ts | 2 +-
 packages/grid_client/src/primitives/network.ts | 4 ++--
 packages/grid_client/src/primitives/nodes.ts   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/grid_client/src/high_level/machine.ts b/packages/grid_client/src/high_level/machine.ts
index 3e8f6ab222..3348e9b3e6 100644
--- a/packages/grid_client/src/high_level/machine.ts
+++ b/packages/grid_client/src/high_level/machine.ts
@@ -174,7 +174,7 @@ class VMHL extends HighLevelBase {
     let hasAccessNode = false;
     let accessNodes: Record<string, unknown> = {};
     if (addAccess) {
-      accessNodes = await this.nodes.getAccessNodes();
+      accessNodes = await this.nodes.getAccessNodes(this.config.twinId);
       for (const accessNode of Object.keys(accessNodes)) {
         if (network.nodeExists(Number(accessNode))) {
           hasAccessNode = true;
diff --git a/packages/grid_client/src/primitives/network.ts b/packages/grid_client/src/primitives/network.ts
index f30b61edbe..3805fd9953 100644
--- a/packages/grid_client/src/primitives/network.ts
+++ b/packages/grid_client/src/primitives/network.ts
@@ -83,7 +83,7 @@ class Network {
       throw Error(`Node ${node_id} does not exist in the network. Please add it first`);
     }
     events.emit("logs", `Adding access to node ${node_id}`);
-    const accessNodes = await this.capacity.getAccessNodes();
+    const accessNodes = await this.capacity.getAccessNodes(this.config.twinId);
     if (Object.keys(accessNodes).includes(node_id.toString())) {
       if (ipv4 && !accessNodes[node_id]["ipv4"]) {
         throw Error(`Node ${node_id} does not have ipv4 public config.`);
@@ -279,7 +279,7 @@ class Network {
       return this._accessNodes;
     }
     const accessNodes: number[] = [];
-    const allAccessNodes = await this.capacity.getAccessNodes();
+    const allAccessNodes = await this.capacity.getAccessNodes(this.config.twinId);
     for (const accessNode of Object.keys(allAccessNodes)) {
       if (this.nodeExists(+accessNode)) {
         accessNodes.push(+accessNode);
diff --git a/packages/grid_client/src/primitives/nodes.ts b/packages/grid_client/src/primitives/nodes.ts
index ac6f41db9c..819e9ea13f 100644
--- a/packages/grid_client/src/primitives/nodes.ts
+++ b/packages/grid_client/src/primitives/nodes.ts
@@ -112,9 +112,9 @@ class Nodes {
       });
   }
 
-  async getAccessNodes(): Promise<Record<string, unknown>> {
+  async getAccessNodes(availableFor?: number): Promise<Record<string, unknown>> {
     const accessNodes = {};
-    const nodes = await this.filterNodes({ accessNodeV4: true, accessNodeV6: true });
+    const nodes = await this.filterNodes({ accessNodeV4: true, accessNodeV6: true, availableFor });
     for (const node of nodes) {
       const ipv4 = node.publicConfig.ipv4;
       const ipv6 = node.publicConfig.ipv6;

From 5907eaecceb95cc67090420de6780448e8c6ef73 Mon Sep 17 00:00:00 2001
From: ahmedhanafy725 <hanafya@incubaid.com>
Date: Wed, 1 Nov 2023 15:30:13 +0200
Subject: [PATCH 23/54] Get all access nodes while fetching them for the
 network

---
 packages/grid_client/src/primitives/nodes.ts | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/grid_client/src/primitives/nodes.ts b/packages/grid_client/src/primitives/nodes.ts
index 819e9ea13f..67d7c27fc1 100644
--- a/packages/grid_client/src/primitives/nodes.ts
+++ b/packages/grid_client/src/primitives/nodes.ts
@@ -114,15 +114,20 @@ class Nodes {
 
   async getAccessNodes(availableFor?: number): Promise<Record<string, unknown>> {
     const accessNodes = {};
-    const nodes = await this.filterNodes({ accessNodeV4: true, accessNodeV6: true, availableFor });
-    for (const node of nodes) {
-      const ipv4 = node.publicConfig.ipv4;
-      const ipv6 = node.publicConfig.ipv6;
-      const domain = node.publicConfig.domain;
-      if (PrivateIp(ipv4.split("/")[0]) === false) {
-        accessNodes[+node.nodeId] = { ipv4: ipv4, ipv6: ipv6, domain: domain };
+    let nodes: NodeInfo[] = [];
+    let page = 1;
+    do {
+      nodes = await this.filterNodes({ accessNodeV4: true, accessNodeV6: true, availableFor, page });
+      for (const node of nodes) {
+        const ipv4 = node.publicConfig.ipv4;
+        const ipv6 = node.publicConfig.ipv6;
+        const domain = node.publicConfig.domain;
+        if (PrivateIp(ipv4.split("/")[0]) === false) {
+          accessNodes[+node.nodeId] = { ipv4: ipv4, ipv6: ipv6, domain: domain };
+        }
       }
-    }
+      page++;
+    } while (nodes.length);
     if (Object.keys(accessNodes).length === 0) {
       throw Error("Couldn't find any node with public config");
     }

From 65412a14827f4c5d62afbeaa5567a1c4cb8fb844 Mon Sep 17 00:00:00 2001
From: ahmedhanafy725 <hanafya@incubaid.com>
Date: Wed, 1 Nov 2023 16:04:03 +0200
Subject: [PATCH 24/54] Remove unnecessary access nodes log

---
 packages/grid_client/src/primitives/nodes.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/grid_client/src/primitives/nodes.ts b/packages/grid_client/src/primitives/nodes.ts
index 67d7c27fc1..d5d307bd6d 100644
--- a/packages/grid_client/src/primitives/nodes.ts
+++ b/packages/grid_client/src/primitives/nodes.ts
@@ -131,7 +131,6 @@ class Nodes {
     if (Object.keys(accessNodes).length === 0) {
       throw Error("Couldn't find any node with public config");
     }
-    console.log(accessNodes);
     return accessNodes;
   }
 

From ededbe574247b61400035a32db565b164f28d94d Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Wed, 1 Nov 2023 16:08:25 +0200
Subject: [PATCH 25/54] Set defaut theme if there is no theme selected by the
 user.

---
 packages/playground/src/App.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/playground/src/App.vue b/packages/playground/src/App.vue
index f2a6b3cee3..33bfda8714 100644
--- a/packages/playground/src/App.vue
+++ b/packages/playground/src/App.vue
@@ -207,6 +207,14 @@ import DisclaimerToolbar from "./components/disclaimer_toolbar.vue";
 import TFNotification from "./components/tf_notification.vue";
 import ProfileManager from "./weblets/profile_manager.vue";
 
+const THEME_KEY = "APP_CURRENT_THEME";
+
+const theme = localStorage.getItem(THEME_KEY);
+if (!theme) {
+  // Users visit the website for the first time or clear the cache.
+  localStorage.setItem(THEME_KEY, "dark");
+}
+
 interface AppRoute {
   title: string;
   items: AppRouteItem[];

From 7de3feaeaf7db538e30b0936415334d3ed776aac Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Wed, 1 Nov 2023 16:16:28 +0200
Subject: [PATCH 26/54] Organized the code by moving the lined code to an
 isolated function.

---
 packages/playground/src/App.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/playground/src/App.vue b/packages/playground/src/App.vue
index 33bfda8714..107629dcaa 100644
--- a/packages/playground/src/App.vue
+++ b/packages/playground/src/App.vue
@@ -130,6 +130,7 @@ const profileManager = useProfileManager();
 
 const openProfile = ref(true);
 const hasActiveProfile = computed(() => !!profileManager.profile);
+checkAppTheme();
 
 watch(
   () => $route.meta,
@@ -196,6 +197,15 @@ function clickHandler({ route, url }: AppRouteItem): void {
     window.open(url, "_blank");
   }
 }
+
+function checkAppTheme() {
+  const THEME_KEY = "APP_CURRENT_THEME";
+  const theme = localStorage.getItem(THEME_KEY);
+  if (!theme) {
+    // Users visit the website for the first time or clear the cache.
+    localStorage.setItem(THEME_KEY, "dark");
+  }
+}
 </script>
 
 <script lang="ts">
@@ -207,14 +217,6 @@ import DisclaimerToolbar from "./components/disclaimer_toolbar.vue";
 import TFNotification from "./components/tf_notification.vue";
 import ProfileManager from "./weblets/profile_manager.vue";
 
-const THEME_KEY = "APP_CURRENT_THEME";
-
-const theme = localStorage.getItem(THEME_KEY);
-if (!theme) {
-  // Users visit the website for the first time or clear the cache.
-  localStorage.setItem(THEME_KEY, "dark");
-}
-
 interface AppRoute {
   title: string;
   items: AppRouteItem[];

From 7a3aa150e79cc93f269470901c512eb89db460eb Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 2 Nov 2023 10:14:48 +0200
Subject: [PATCH 27/54] Set the  theme as a default theme if no theme selected.

---
 packages/playground/src/App.vue               | 10 ----------
 packages/playground/src/utils/custom_toast.ts |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/playground/src/App.vue b/packages/playground/src/App.vue
index 107629dcaa..f2a6b3cee3 100644
--- a/packages/playground/src/App.vue
+++ b/packages/playground/src/App.vue
@@ -130,7 +130,6 @@ const profileManager = useProfileManager();
 
 const openProfile = ref(true);
 const hasActiveProfile = computed(() => !!profileManager.profile);
-checkAppTheme();
 
 watch(
   () => $route.meta,
@@ -197,15 +196,6 @@ function clickHandler({ route, url }: AppRouteItem): void {
     window.open(url, "_blank");
   }
 }
-
-function checkAppTheme() {
-  const THEME_KEY = "APP_CURRENT_THEME";
-  const theme = localStorage.getItem(THEME_KEY);
-  if (!theme) {
-    // Users visit the website for the first time or clear the cache.
-    localStorage.setItem(THEME_KEY, "dark");
-  }
-}
 </script>
 
 <script lang="ts">
diff --git a/packages/playground/src/utils/custom_toast.ts b/packages/playground/src/utils/custom_toast.ts
index 0bc35aa222..bddb7a164d 100644
--- a/packages/playground/src/utils/custom_toast.ts
+++ b/packages/playground/src/utils/custom_toast.ts
@@ -36,7 +36,7 @@ export function createCustomToast(
   type: ToastType,
   componentProps?: Record<string, unknown>,
 ) {
-  const theme = localStorage.getItem("APP_CURRENT_THEME");
+  const theme = localStorage.getItem("APP_CURRENT_THEME") || "dark";
   const colors = theme === "dark" ? darkModeColors : lightModeColors;
 
   const toastOptions: ToastOptions = {

From 5ad52bf037bff8d386650668405b402516d206b3 Mon Sep 17 00:00:00 2001
From: Omar Kassem <omarksm09@gmail.com>
Date: Thu, 2 Nov 2023 10:59:46 +0200
Subject: [PATCH 28/54] fix deploy button enabled while node is node validated 
  (#1336)

* set rmb request default time out to be 10

* disable node field while checking storage pool

* disable deploy btn if selectedNode is falsy

* Revert "disable deploy btn if selectedNode is falsy"

This reverts commit b514166da069b0f2a8d9ee0593ae09cd4d8e339e.

* add async rule

* fix error msg

* apply comment
---
 .../grid_client/src/clients/rmb/client.ts     |  2 +-
 .../playground/src/components/select_node.vue | 46 ++++++++-----------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/packages/grid_client/src/clients/rmb/client.ts b/packages/grid_client/src/clients/rmb/client.ts
index 9d09752c74..b002b961ea 100644
--- a/packages/grid_client/src/clients/rmb/client.ts
+++ b/packages/grid_client/src/clients/rmb/client.ts
@@ -6,7 +6,7 @@ class RMB {
     this.client = rmbClient;
   }
 
-  async request(destTwinIds: number[], cmd: string, payload: string, expiration = 60, retires = 1) {
+  async request(destTwinIds: number[], cmd: string, payload: string, expiration = 10, retires = 1) {
     let result;
     try {
       const requestId = await this.client.send(cmd, payload, destTwinIds[0], expiration / 60);
diff --git a/packages/playground/src/components/select_node.vue b/packages/playground/src/components/select_node.vue
index 9dacfee496..ab3495a8a9 100644
--- a/packages/playground/src/components/select_node.vue
+++ b/packages/playground/src/components/select_node.vue
@@ -15,6 +15,7 @@
     <input-validator
       ref="validator"
       :rules="[validators.required('Node id is required.')]"
+      :async-rules="[() => validateNodeStoragePool(selectedNode)]"
       :value="selectedNode"
       #="{ props }"
     >
@@ -26,15 +27,13 @@
           item-title="nodeId"
           return-object
           v-model="selectedNode"
-          @update:model-value="selectedNode = $event"
-          :disabled="loadingNodes"
-          :loading="loadingNodes"
+          :disabled="loadingNodes || pingingNode"
           v-bind="{
             ...props,
-            loading: props.loading || loadingNodes,
+            loading: props.loading || loadingNodes || pingingNode,
             hint: pingingNode ? `Checking if the disks will fit in the node's storage pools... ` : props.hint,
-            error: !!errorMessage,
-            errorMessages: !!errorMessage ? errorMessage : undefined,
+            error: !!errorMessage || props.error,
+            errorMessages: errorMessage || props.errorMessages,
           }"
         >
           <template v-slot:item="{ item, props }">
@@ -80,8 +79,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { GridClient } from "@threefold/grid_client";
-import { onMounted, type PropType, type Ref, ref, watch } from "vue";
+import { type PropType, type Ref, ref, watch } from "vue";
 
 import { ValidatorStatus } from "@/hooks/form_validator";
 
@@ -161,17 +159,6 @@ watch(
   async node => {
     errorMessage.value = ``;
 
-    const grid = await getGrid(profileManager.profile!);
-
-    if (node && grid) {
-      await validateNodeStoragePool(
-        grid,
-        node.nodeId,
-        props.filters.diskSizes.map(disk => disk * 1024 ** 3),
-        props.rootFileSystemSize * 1024 ** 3,
-      );
-    }
-
     if (node && props.filters.hasGPU) {
       loadingCards.value = true;
       const grid = await getGrid(profileManager.profile!);
@@ -276,27 +263,32 @@ async function loadNodes(farmId: number) {
     }
   }
 }
-async function validateNodeStoragePool(grid: GridClient, nodeId: number, disks: number[], rootFileSystemSize: number) {
+async function validateNodeStoragePool(validatingNode: INode | undefined) {
+  if (!validatingNode) return { message: "Node id is required." };
   farmManager?.setLoading(true);
   validator.value?.setStatus(ValidatorStatus.Pending);
   pingingNode.value = true;
   try {
+    const grid = await getGrid(profileManager.profile!);
+    if (!grid) throw new Error("Connection issue please try again");
+
     await grid.capacity.checkNodeCapacityPool({
-      nodeId,
-      ssdDisks: disks,
-      rootfsDisks: [rootFileSystemSize],
+      nodeId: validatingNode.nodeId,
+      ssdDisks: props.filters.diskSizes.map(disk => disk * 1024 ** 3),
+      rootfsDisks: [props.rootFileSystemSize * 1024 ** 3],
       hddDisks: [],
     });
     emits("update:modelValue", {
-      nodeId: nodeId,
+      nodeId: validatingNode.nodeId,
       cards: cards,
     });
-    await validator.value?.validate();
   } catch (e) {
-    errorMessage.value = `Couldn't fit the required disks in Node ${nodeId} storage pools, please select another node`;
-    availableNodes.value = availableNodes.value.filter(node => node.nodeId !== nodeId);
+    availableNodes.value = availableNodes.value.filter(node => node.nodeId !== validatingNode.nodeId);
     validator.value?.setStatus(ValidatorStatus.Invalid);
     emptyResult.value = true;
+    return {
+      message: `Couldn't fit the required disks in Node ${validatingNode.nodeId} storage pools, please select another node`,
+    };
   } finally {
     pingingNode.value = false;
     farmManager?.setLoading(false);

From cbb5b7941376fa5c4e211d19b3cce30cc3cd40a7 Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 2 Nov 2023 11:12:13 +0200
Subject: [PATCH 29/54] Change the version to be v2.2.0-rc1 for release.

---
 packages/dashboard/charts/tfgrid-dashboard/Chart.yaml  | 2 +-
 packages/dashboard/charts/tfgrid-dashboard/values.yaml | 2 +-
 packages/playground/playground-charts/Chart.yaml       | 2 +-
 packages/playground/playground-charts/values.yaml      | 2 +-
 packages/stats/chart/Chart.yaml                        | 2 +-
 packages/stats/chart/values.yaml                       | 2 +-
 packages/weblets/weblets-chart/Chart.yaml              | 2 +-
 packages/weblets/weblets-chart/values.yaml             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
index 960309c2cd..07ada165bb 100644
--- a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
+++ b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.6
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.1.1"
+appVersion: "v2.2.0-rc1"
diff --git a/packages/dashboard/charts/tfgrid-dashboard/values.yaml b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
index 864909e4a2..e6237ca54a 100644
--- a/packages/dashboard/charts/tfgrid-dashboard/values.yaml
+++ b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/threefoldtech/dashboard
   pullPolicy: Always
-  tag: "2.1.1"
+  tag: "2.2.0-rc1"
 
   env:
     - name: "STELLAR_NETWORK"
diff --git a/packages/playground/playground-charts/Chart.yaml b/packages/playground/playground-charts/Chart.yaml
index 16823772c0..a71431f51c 100644
--- a/packages/playground/playground-charts/Chart.yaml
+++ b/packages/playground/playground-charts/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.1.1"
+appVersion: "v2.2.0-rc1"
diff --git a/packages/playground/playground-charts/values.yaml b/packages/playground/playground-charts/values.yaml
index ef3a7709d6..2906a8ee3e 100644
--- a/packages/playground/playground-charts/values.yaml
+++ b/packages/playground/playground-charts/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/playground
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.1.1"
+  tag: "2.2.0-rc1"
   
   env:
     - name: "MODE"
diff --git a/packages/stats/chart/Chart.yaml b/packages/stats/chart/Chart.yaml
index 7ccd3292cb..9490995767 100644
--- a/packages/stats/chart/Chart.yaml
+++ b/packages/stats/chart/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.1.1"
+appVersion: "v2.2.0-rc1"
diff --git a/packages/stats/chart/values.yaml b/packages/stats/chart/values.yaml
index 65386e307c..4f3cf81416 100644
--- a/packages/stats/chart/values.yaml
+++ b/packages/stats/chart/values.yaml
@@ -4,7 +4,7 @@ image:
   repository: ghcr.io/threefoldtech/stats
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.1.1"
+  tag: "2.2.0-rc1"
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/packages/weblets/weblets-chart/Chart.yaml b/packages/weblets/weblets-chart/Chart.yaml
index 44180bd67f..ab54b8ed20 100644
--- a/packages/weblets/weblets-chart/Chart.yaml
+++ b/packages/weblets/weblets-chart/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.1.1"
+appVersion: "v2.2.0-rc1"
diff --git a/packages/weblets/weblets-chart/values.yaml b/packages/weblets/weblets-chart/values.yaml
index 5fedcfa607..6e78454f03 100644
--- a/packages/weblets/weblets-chart/values.yaml
+++ b/packages/weblets/weblets-chart/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/weblets
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.1.1"
+  tag: "2.2.0-rc1"
   
   env:
     - name: "MODE"

From 3f878d59896d91a0d4bd6e667af0a3f3aaefdfa5 Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 2 Nov 2023 11:18:42 +0200
Subject: [PATCH 30/54] v2.2.0-rc1

---
 lerna.json                               | 2 +-
 packages/UI/package.json                 | 2 +-
 packages/dashboard/package.json          | 6 +++---
 packages/grid_client/package.json        | 6 +++---
 packages/grid_http_server/package.json   | 4 ++--
 packages/grid_rmb_server/package.json    | 8 ++++----
 packages/playground/package.json         | 6 +++---
 packages/rmb_direct_client/package.json  | 4 ++--
 packages/rmb_peer_client/package.json    | 2 +-
 packages/rmb_peer_server/package.json    | 2 +-
 packages/stats/package.json              | 2 +-
 packages/tfchain_client/package.json     | 2 +-
 packages/weblets/package.json            | 4 ++--
 packages/weblets/playground/package.json | 2 +-
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/lerna.json b/lerna.json
index 12189d018b..bd1e69381e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "npmClient": "yarn"
 }
diff --git a/packages/UI/package.json b/packages/UI/package.json
index 17ea740a81..ecc322524c 100644
--- a/packages/UI/package.json
+++ b/packages/UI/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/ui",
-  "version": "0.0.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 36dd93ebbf..b2dbcc84df 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/dashboard",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,8 +19,8 @@
     "@polkadot/extension-dapp": "0.45.1",
     "@polkadot/ui-keyring": "^2.2.1",
     "@popperjs/core": "^2.11.5",
-    "@threefold/grid_client": "^2.1.1",
-    "@threefold/tfchain_client": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/tfchain_client": "^2.2.0-rc1",
     "@types/ip": "^1.1.0",
     "@types/md5": "^2.3.2",
     "apollo-cache-inmemory": "^1.6.6",
diff --git a/packages/grid_client/package.json b/packages/grid_client/package.json
index 239a6921d4..1eb27ceb2a 100644
--- a/packages/grid_client/package.json
+++ b/packages/grid_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_client",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md",
   "repository": {
@@ -14,8 +14,8 @@
   "dependencies": {
     "@jimber/pkid": "1.0.4",
     "@noble/secp256k1": "^1.7.1",
-    "@threefold/rmb_direct_client": "^2.1.1",
-    "@threefold/tfchain_client": "^2.1.1",
+    "@threefold/rmb_direct_client": "^2.2.0-rc1",
+    "@threefold/tfchain_client": "^2.2.0-rc1",
     "algosdk": "^1.19.0",
     "appdata-path": "^1.0.0",
     "axios": "^0.27.2",
diff --git a/packages/grid_http_server/package.json b/packages/grid_http_server/package.json
index ad2cd490e2..d197254dad 100644
--- a/packages/grid_http_server/package.json
+++ b/packages/grid_http_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_http_server",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_http_server/README.md",
   "repository": {
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
     "express": "^4.18.1",
     "http-server": "^14.1.1",
     "typescript": "^4.7.4"
diff --git a/packages/grid_rmb_server/package.json b/packages/grid_rmb_server/package.json
index a97c12ae68..4b9d65dfd4 100644
--- a/packages/grid_rmb_server/package.json
+++ b/packages/grid_rmb_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_rmb_server",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_rmb_server/README.md",
   "repository": {
@@ -12,12 +12,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.1.1",
-    "@threefold/rmb_peer_server": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/rmb_peer_server": "^2.2.0-rc1",
     "typescript": "^4.7.4"
   },
   "devDependencies": {
-    "@threefold/rmb_peer_client": "^2.1.1",
+    "@threefold/rmb_peer_client": "^2.2.0-rc1",
     "ts-node": "^10.9.1"
   },
   "main": "./dist/index.js",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index 29c0ac8c43..67ac067104 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/playground",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -12,7 +12,8 @@
   },
   "dependencies": {
     "@mdi/font": "^7.2.96",
-    "@threefold/grid_client": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/gridproxy_client": "^2.1.1-rc1",
     "bip39": "^3.1.0",
     "cryptr": "^6.2.0",
     "decimal.js": "^10.4.3",
@@ -24,7 +25,6 @@
     "mosha-vue-toastify": "^1.0.23",
     "pinia": "^2.0.32",
     "qrcode": "^1.5.1",
-    "@threefold/gridproxy_client": "^2.1.1-rc1",
     "tfgrid-gql": "^1.0.1",
     "validator": "^13.9.0",
     "vue": "^3.2.47",
diff --git a/packages/rmb_direct_client/package.json b/packages/rmb_direct_client/package.json
index a327b61058..7f7229fe7b 100644
--- a/packages/rmb_direct_client/package.json
+++ b/packages/rmb_direct_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/rmb_direct_client",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "repository": {
     "type": "git",
     "url": "https://github.com/threefoldtech/tfgrid-sdk-ts.git"
@@ -23,7 +23,7 @@
   "dependencies": {
     "@noble/secp256k1": "^1.7.1",
     "@polkadot/api": "^8.9.1",
-    "@threefold/tfchain_client": "^2.1.1",
+    "@threefold/tfchain_client": "^2.2.0-rc1",
     "base64url": "^3.0.1",
     "bip39": "^3.1.0",
     "buffer": "^6.0.3",
diff --git a/packages/rmb_peer_client/package.json b/packages/rmb_peer_client/package.json
index e72479667e..bddab0bf2a 100644
--- a/packages/rmb_peer_client/package.json
+++ b/packages/rmb_peer_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_client",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_client/README.md",
   "repository": {
diff --git a/packages/rmb_peer_server/package.json b/packages/rmb_peer_server/package.json
index b4853c338e..8595ce2a36 100644
--- a/packages/rmb_peer_server/package.json
+++ b/packages/rmb_peer_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_server",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_server/README.md",
   "repository": {
diff --git a/packages/stats/package.json b/packages/stats/package.json
index 57c3661b6c..a682f1d944 100644
--- a/packages/stats/package.json
+++ b/packages/stats/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/stats",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "build": "rollup -c",
diff --git a/packages/tfchain_client/package.json b/packages/tfchain_client/package.json
index 6dd2bb1167..9311f9aa89 100644
--- a/packages/tfchain_client/package.json
+++ b/packages/tfchain_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/tfchain_client",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "description": "A client for TF chain",
   "private": false,
   "publishConfig": {
diff --git a/packages/weblets/package.json b/packages/weblets/package.json
index 22bd597ffb..70e421ce3d 100644
--- a/packages/weblets/package.json
+++ b/packages/weblets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/weblets",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "rollup-build": "rollup -c",
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@threefold/grid_client": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
     "add": "^2.0.6",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",
diff --git a/packages/weblets/playground/package.json b/packages/weblets/playground/package.json
index 802d4c714f..1ff3215a51 100644
--- a/packages/weblets/playground/package.json
+++ b/packages/weblets/playground/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@open-wc/webpack-import-meta-loader": "^0.4.7",
-    "@threefold/grid_client": "2.1.1",
+    "@threefold/grid_client": "2.2.0-rc1",
     "axios": "^0.24.0",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",

From 2c8ac762acd917d32a58f506947ce9d89fb79a76 Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 2 Nov 2023 11:18:42 +0200
Subject: [PATCH 31/54] v2.2.0-rc1

---
 lerna.json                               |  2 +-
 packages/UI/package.json                 |  2 +-
 packages/dashboard/package.json          |  6 ++---
 packages/grid_client/package.json        |  6 ++---
 packages/grid_http_server/package.json   |  4 ++--
 packages/grid_rmb_server/package.json    |  8 +++----
 packages/playground/package.json         |  6 ++---
 packages/rmb_direct_client/package.json  |  4 ++--
 packages/rmb_peer_client/package.json    |  2 +-
 packages/rmb_peer_server/package.json    |  2 +-
 packages/stats/package.json              |  2 +-
 packages/tfchain_client/package.json     |  2 +-
 packages/weblets/package.json            |  4 ++--
 packages/weblets/playground/package.json |  2 +-
 packages/weblets/playground/yarn.lock    | 30 ++++++++++++------------
 15 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/lerna.json b/lerna.json
index 12189d018b..bd1e69381e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "npmClient": "yarn"
 }
diff --git a/packages/UI/package.json b/packages/UI/package.json
index 17ea740a81..ecc322524c 100644
--- a/packages/UI/package.json
+++ b/packages/UI/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/ui",
-  "version": "0.0.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 36dd93ebbf..b2dbcc84df 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/dashboard",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,8 +19,8 @@
     "@polkadot/extension-dapp": "0.45.1",
     "@polkadot/ui-keyring": "^2.2.1",
     "@popperjs/core": "^2.11.5",
-    "@threefold/grid_client": "^2.1.1",
-    "@threefold/tfchain_client": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/tfchain_client": "^2.2.0-rc1",
     "@types/ip": "^1.1.0",
     "@types/md5": "^2.3.2",
     "apollo-cache-inmemory": "^1.6.6",
diff --git a/packages/grid_client/package.json b/packages/grid_client/package.json
index 239a6921d4..1eb27ceb2a 100644
--- a/packages/grid_client/package.json
+++ b/packages/grid_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_client",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md",
   "repository": {
@@ -14,8 +14,8 @@
   "dependencies": {
     "@jimber/pkid": "1.0.4",
     "@noble/secp256k1": "^1.7.1",
-    "@threefold/rmb_direct_client": "^2.1.1",
-    "@threefold/tfchain_client": "^2.1.1",
+    "@threefold/rmb_direct_client": "^2.2.0-rc1",
+    "@threefold/tfchain_client": "^2.2.0-rc1",
     "algosdk": "^1.19.0",
     "appdata-path": "^1.0.0",
     "axios": "^0.27.2",
diff --git a/packages/grid_http_server/package.json b/packages/grid_http_server/package.json
index ad2cd490e2..d197254dad 100644
--- a/packages/grid_http_server/package.json
+++ b/packages/grid_http_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_http_server",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_http_server/README.md",
   "repository": {
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
     "express": "^4.18.1",
     "http-server": "^14.1.1",
     "typescript": "^4.7.4"
diff --git a/packages/grid_rmb_server/package.json b/packages/grid_rmb_server/package.json
index a97c12ae68..4b9d65dfd4 100644
--- a/packages/grid_rmb_server/package.json
+++ b/packages/grid_rmb_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_rmb_server",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_rmb_server/README.md",
   "repository": {
@@ -12,12 +12,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.1.1",
-    "@threefold/rmb_peer_server": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/rmb_peer_server": "^2.2.0-rc1",
     "typescript": "^4.7.4"
   },
   "devDependencies": {
-    "@threefold/rmb_peer_client": "^2.1.1",
+    "@threefold/rmb_peer_client": "^2.2.0-rc1",
     "ts-node": "^10.9.1"
   },
   "main": "./dist/index.js",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index 29c0ac8c43..67ac067104 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/playground",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -12,7 +12,8 @@
   },
   "dependencies": {
     "@mdi/font": "^7.2.96",
-    "@threefold/grid_client": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/gridproxy_client": "^2.1.1-rc1",
     "bip39": "^3.1.0",
     "cryptr": "^6.2.0",
     "decimal.js": "^10.4.3",
@@ -24,7 +25,6 @@
     "mosha-vue-toastify": "^1.0.23",
     "pinia": "^2.0.32",
     "qrcode": "^1.5.1",
-    "@threefold/gridproxy_client": "^2.1.1-rc1",
     "tfgrid-gql": "^1.0.1",
     "validator": "^13.9.0",
     "vue": "^3.2.47",
diff --git a/packages/rmb_direct_client/package.json b/packages/rmb_direct_client/package.json
index a327b61058..7f7229fe7b 100644
--- a/packages/rmb_direct_client/package.json
+++ b/packages/rmb_direct_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/rmb_direct_client",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "repository": {
     "type": "git",
     "url": "https://github.com/threefoldtech/tfgrid-sdk-ts.git"
@@ -23,7 +23,7 @@
   "dependencies": {
     "@noble/secp256k1": "^1.7.1",
     "@polkadot/api": "^8.9.1",
-    "@threefold/tfchain_client": "^2.1.1",
+    "@threefold/tfchain_client": "^2.2.0-rc1",
     "base64url": "^3.0.1",
     "bip39": "^3.1.0",
     "buffer": "^6.0.3",
diff --git a/packages/rmb_peer_client/package.json b/packages/rmb_peer_client/package.json
index e72479667e..bddab0bf2a 100644
--- a/packages/rmb_peer_client/package.json
+++ b/packages/rmb_peer_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_client",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_client/README.md",
   "repository": {
diff --git a/packages/rmb_peer_server/package.json b/packages/rmb_peer_server/package.json
index b4853c338e..8595ce2a36 100644
--- a/packages/rmb_peer_server/package.json
+++ b/packages/rmb_peer_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_server",
   "author": "Ahmed Hanafy",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_server/README.md",
   "repository": {
diff --git a/packages/stats/package.json b/packages/stats/package.json
index 57c3661b6c..a682f1d944 100644
--- a/packages/stats/package.json
+++ b/packages/stats/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/stats",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "build": "rollup -c",
diff --git a/packages/tfchain_client/package.json b/packages/tfchain_client/package.json
index 6dd2bb1167..9311f9aa89 100644
--- a/packages/tfchain_client/package.json
+++ b/packages/tfchain_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/tfchain_client",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "description": "A client for TF chain",
   "private": false,
   "publishConfig": {
diff --git a/packages/weblets/package.json b/packages/weblets/package.json
index 22bd597ffb..70e421ce3d 100644
--- a/packages/weblets/package.json
+++ b/packages/weblets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/weblets",
-  "version": "2.1.1",
+  "version": "2.2.0-rc1",
   "private": true,
   "scripts": {
     "rollup-build": "rollup -c",
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@threefold/grid_client": "^2.1.1",
+    "@threefold/grid_client": "^2.2.0-rc1",
     "add": "^2.0.6",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",
diff --git a/packages/weblets/playground/package.json b/packages/weblets/playground/package.json
index 802d4c714f..1ff3215a51 100644
--- a/packages/weblets/playground/package.json
+++ b/packages/weblets/playground/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@open-wc/webpack-import-meta-loader": "^0.4.7",
-    "@threefold/grid_client": "2.1.1",
+    "@threefold/grid_client": "2.2.0-rc1",
     "axios": "^0.24.0",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",
diff --git a/packages/weblets/playground/yarn.lock b/packages/weblets/playground/yarn.lock
index 0d8775e607..cc9c05ec2a 100644
--- a/packages/weblets/playground/yarn.lock
+++ b/packages/weblets/playground/yarn.lock
@@ -1529,15 +1529,15 @@
   resolved "https://registry.yarnpkg.com/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz#93108e45cb7ef6d82560c153e3692c2aa1c711b3"
   integrity sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==
 
-"@threefold/grid_client@2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@threefold/grid_client/-/grid_client-2.1.1.tgz#32a6135634d23ff66ab3a86aacd16e76eff75c1b"
-  integrity sha512-czcACdSfNgCHmL4xymIhDhqjIFOapdq4WIZTcZXrdqRozxe1ezW/afDSOf3z0uIAtC9k9dYj3Rt3pwv9xjw7ZA==
+"@threefold/grid_client@2.2.0-rc1":
+  version "2.2.0-rc1"
+  resolved "https://registry.yarnpkg.com/@threefold/grid_client/-/grid_client-2.2.0-rc1.tgz#6153393e35febcfffaced57e2f0acf8f1795d14c"
+  integrity sha512-qtFo0MQOBJsZuGpiiP9QcN9JZXKXa2mBtByowVbxi2f319hBF8QXANzmb9tj75GrVVDDy+UXdwyebAubwlX5Vw==
   dependencies:
     "@jimber/pkid" "1.0.4"
     "@noble/secp256k1" "^1.7.1"
-    "@threefold/rmb_direct_client" "^2.1.1"
-    "@threefold/tfchain_client" "^2.1.1"
+    "@threefold/rmb_direct_client" "^2.2.0-rc1"
+    "@threefold/tfchain_client" "^2.2.0-rc1"
     algosdk "^1.19.0"
     appdata-path "^1.0.0"
     axios "^0.27.2"
@@ -1559,14 +1559,14 @@
     url-parse "^1.5.10"
     uuid4 "^2.0.2"
 
-"@threefold/rmb_direct_client@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@threefold/rmb_direct_client/-/rmb_direct_client-2.1.1.tgz#c2f9b29af22761f558efe815760403fcbd4accd7"
-  integrity sha512-V5HFzPQt5q1vXas4Q3G+AJjrXaSM9/MbH0s3XTYJT4tVtMBn97Lf7rSWnIlK6/Rdox12j+wJKiUZAY0C+ndTog==
+"@threefold/rmb_direct_client@^2.2.0-rc1":
+  version "2.2.0-rc1"
+  resolved "https://registry.yarnpkg.com/@threefold/rmb_direct_client/-/rmb_direct_client-2.2.0-rc1.tgz#aa567a29cad3e5fae2f54be1c51fe13f77dfe100"
+  integrity sha512-izvoWKnEpLEC1JSfKgKYEs3qs0SlzIIe4KfgAj79VsH+Vd3Lis93/pOOfbA/ye6eiOEam5XgUc+qYqKJ4fJNYA==
   dependencies:
     "@noble/secp256k1" "^1.7.1"
     "@polkadot/api" "^8.9.1"
-    "@threefold/tfchain_client" "^2.1.1"
+    "@threefold/tfchain_client" "^2.2.0-rc1"
     base64url "^3.0.1"
     bip39 "^3.1.0"
     buffer "^6.0.3"
@@ -1576,10 +1576,10 @@
     uuid "^8.3.2"
     ws "^8.12.0"
 
-"@threefold/tfchain_client@^2.1.1":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@threefold/tfchain_client/-/tfchain_client-2.1.1.tgz#26f25a6d0cca8050742400d889ccb3af3192aa16"
-  integrity sha512-Xwp5R6lSiqaAPpSrawAZ5vju1CNCKpas/0Sz/h2IKscTjbMMeNEcyP1bxM7QR9L/VmLsjeSNLk6jtBLFbQMSsw==
+"@threefold/tfchain_client@^2.2.0-rc1":
+  version "2.2.0-rc1"
+  resolved "https://registry.yarnpkg.com/@threefold/tfchain_client/-/tfchain_client-2.2.0-rc1.tgz#e3c18a152dec3c3c17192d300334399083c53803"
+  integrity sha512-eJSfkvgP09M0BHlz7ZHwfuF9Y60IIl6ARD57kBxLiB+SmjkES/53pjEdVoIHbCRmyJ47ZET+3MrH5gZ4gHRw2w==
   dependencies:
     "@polkadot/api" "^8.9.1"
     await-lock "^2.2.2"

From 7a3b9911b5d22e65155cc8a0196bc7900e39d837 Mon Sep 17 00:00:00 2001
From: ahmedhanafy725 <hanafya@incubaid.com>
Date: Thu, 2 Nov 2023 12:00:53 +0200
Subject: [PATCH 32/54] Update yarn lock

---
 packages/weblets/playground/yarn.lock | 141 +++++++++++++-------------
 1 file changed, 69 insertions(+), 72 deletions(-)

diff --git a/packages/weblets/playground/yarn.lock b/packages/weblets/playground/yarn.lock
index cc9c05ec2a..ab6f5f3477 100644
--- a/packages/weblets/playground/yarn.lock
+++ b/packages/weblets/playground/yarn.lock
@@ -880,9 +880,9 @@
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.13", "@babel/runtime@^7.20.6":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8"
-  integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
+  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -1619,9 +1619,9 @@
     "@babel/types" "^7.3.0"
 
 "@types/bn.js@^5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.1.tgz#b51e1b55920a4ca26e9285ff79936bbdec910682"
-  integrity sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/@types/bn.js/-/bn.js-5.1.4.tgz#0853d5f92dfdbc8fe1ae60700411a60845fa7d27"
+  integrity sha512-ZtBd9L8hVtoBpPMSWfbwjC4dhQtJdlPS+e1A0Rydb7vg7bDcUwiRklPx24sMYtXcmAMST/k0Wze7JLbNU/5SkA==
   dependencies:
     "@types/node" "*"
 
@@ -1649,9 +1649,9 @@
     "@types/node" "*"
 
 "@types/eventsource@^1.1.2":
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/@types/eventsource/-/eventsource-1.1.11.tgz#a2c0bfd0436b7db42ed1b2b2117f7ec2e8478dc7"
-  integrity sha512-L7wLDZlWm5mROzv87W0ofIYeQP5K2UhoFnnUyEWLKM6UBb0ZNRgAqp98qE5DkgfBXdWfc2kYmw9KZm4NLjRbsw==
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/@types/eventsource/-/eventsource-1.1.14.tgz#b5b115b19f3a392a6c29331486bc88dcb4e8a4e2"
+  integrity sha512-WiPIkZ5fuhTkeaVaPKbaP6vHuTX9FHnFNTrkSbm+Uf6g4TH3YNbdfw5/1oLzKIWsQRbrvSiByO2nPSxjr5/cgQ==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.24"
@@ -1740,12 +1740,12 @@
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/node-fetch@^2.6.2":
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660"
-  integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==
+  version "2.6.8"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.8.tgz#9a2993583975849c2e1f360b6ca2f11755b2c504"
+  integrity sha512-nnH5lV9QCMPsbEVdTb5Y+F3GQxLSw1xQgIydrb2gSfEavRPs50FnMr+KUaa+LoPSqibm2N+ZZxH7lavZlAT4GA==
   dependencies:
     "@types/node" "*"
-    form-data "^3.0.0"
+    form-data "^4.0.0"
 
 "@types/node@*":
   version "16.11.6"
@@ -1758,9 +1758,11 @@
   integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==
 
 "@types/node@>= 8":
-  version "20.6.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.6.0.tgz#9d7daa855d33d4efec8aea88cd66db1c2f0ebe16"
-  integrity sha512-najjVq5KN2vsH2U/xyh2opaSEz6cZMR2SetLIlxlj08nOcmPOemJmUK2o4kUzfLqfrWE0PIrNeE16XhYDd3nqg==
+  version "20.8.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.10.tgz#a5448b895c753ae929c26ce85cab557c6d4a365e"
+  integrity sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -1783,9 +1785,9 @@
   integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
 "@types/randombytes@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/randombytes/-/randombytes-2.0.0.tgz#0087ff5e60ae68023b9bc4398b406fea7ad18304"
-  integrity sha512-bz8PhAVlwN72vqefzxa14DKNT8jK/mV66CSjwdVQM/k3Th3EPKfUtdMniwZgMedQTFuywAsfjnZsg+pEnltaMA==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@types/randombytes/-/randombytes-2.0.2.tgz#646831f06b295b086ea227d33089f42bc88e90d5"
+  integrity sha512-B7C5oKZppg1QzPbcb7uGAVge3Up+0HfSLgMDd4Hx2nCdf2JrjTzuIV5m12C11eQdpnPvNoTT1LK/0XCkHGABdw==
   dependencies:
     "@types/node" "*"
 
@@ -1835,14 +1837,14 @@
     source-map "^0.6.1"
 
 "@types/urijs@^1.19.6":
-  version "1.19.20"
-  resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.20.tgz#7ea4254f4c2cdbd7d34e47d483e76fa1b81e19a4"
-  integrity sha512-77Mq/2BeHU894J364dUv9tSwxxyCLtcX228Pc8TwZpP5bvOoMns+gZoftp3LYl3FBH8vChpWbuagKGiMki2c1A==
+  version "1.19.22"
+  resolved "https://registry.yarnpkg.com/@types/urijs/-/urijs-1.19.22.tgz#188c573007001de3be3983af5437727bf3042dd6"
+  integrity sha512-qnYBwfN7O/+i6E1Kr8JaCKsrCLpRCiQ1XxkSxNIYuJ/5Aagt0+HlMX78DJMUrNzDULMz0eu2gcprlxJaDtACOw==
 
 "@types/validator@^13.7.10":
-  version "13.11.1"
-  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.11.1.tgz#6560af76ed54490e68c42f717ab4e742ba7be74b"
-  integrity sha512-d/MUkJYdOeKycmm75Arql4M5+UuXmf4cHdHKsyw1GcvnNgL6s77UkgSgJ8TE/rI5PYsnwYq5jkcWBLuN/MpQ1A==
+  version "13.11.5"
+  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.11.5.tgz#1911964fd5556b08d3479d1ded977c06f89a44a7"
+  integrity sha512-xW4qsT4UIYILu+7ZrBnfQdBYniZrMLYYK3wN9M/NdeIHgBN5pZI2/8Q7UfdWIcr5RLJv/OGENsx91JIpUUoC7Q==
 
 "@types/webpack-dev-server@^3.11.0":
   version "3.11.6"
@@ -1882,9 +1884,9 @@
     source-map "^0.6.0"
 
 "@types/websocket@^1.0.5":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.6.tgz#ec8dce5915741632ac3a4b1f951b6d4156e32d03"
-  integrity sha512-JXkliwz93B2cMWOI1ukElQBPN88vMg3CruvW4KVSKpflt3NyNCJImnhIuB/f97rG7kakqRJGFiwkA895Kn02Dg==
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.8.tgz#382fb5de567e2b8bce9e88bbe3ed6c09f7622e97"
+  integrity sha512-wvkOpWApbuxVfHhSQ1XrjVN4363vsfLJwEo4AboIZk0g1vJA5nmLp8GXUHuIdf4/Fe7+/V0Efe2HvWiLqHtlqw==
   dependencies:
     "@types/node" "*"
 
@@ -3275,9 +3277,9 @@ buffer@^6.0.2, buffer@^6.0.3:
     ieee754 "^1.2.1"
 
 bufferutil@^4.0.1:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad"
-  integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.8.tgz#1de6a71092d65d7766c4d8a522b261a6e787e8ea"
+  integrity sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==
   dependencies:
     node-gyp-build "^4.3.0"
 
@@ -4019,9 +4021,9 @@ crypto-browserify@^3.11.0, crypto-browserify@^3.12.0:
     randomfill "^1.0.3"
 
 crypto-js@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
-  integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
+  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
 
 css-color-names@0.0.4, css-color-names@^0.0.4:
   version "0.0.4"
@@ -5241,9 +5243,9 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.4:
   integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==
 
 follow-redirects@^1.14.7, follow-redirects@^1.14.9:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -5293,15 +5295,6 @@ fork-ts-checker-webpack-plugin@^3.1.1:
     tapable "^1.0.0"
     worker-rpc "^0.1.0"
 
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -6953,16 +6946,16 @@ js-beautify@^1.6.12, js-beautify@^1.6.14:
     nopt "^5.0.0"
 
 js-crypto-aes@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/js-crypto-aes/-/js-crypto-aes-1.0.5.tgz#a6faa64ecc5ccda0caa84dd7e95eefd61d5e9117"
-  integrity sha512-tP+SbHbhHx6ck0VE9dDPDC0QUN5WzngXomERrvI8gXovIrN1V8mI6mL4EI4mfORkSh3f4fXSIxb079rRTSHqtw==
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/js-crypto-aes/-/js-crypto-aes-1.0.6.tgz#8445a4ebb8bb6670bb10f54b29c2f22991944b7d"
+  integrity sha512-E2hu9z5+YtpDg9Un/bDfmH+I5dv/8aN+ozxv9L0ybZldcQ9T5iYDbBKdlKGBUKI3IvzoWSBSdnZnhwZaRIN46w==
   dependencies:
-    js-crypto-env "^1.0.4"
+    js-crypto-env "^1.0.5"
 
-js-crypto-env@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/js-crypto-env/-/js-crypto-env-1.0.4.tgz#2be3b0987124bfaf094aadd3c9d91a56aedb0f2a"
-  integrity sha512-b7WdjaX4csatMPfZ/mQ94yb/XTKe3o6qt0jPBVbKmaiOH97e+FlmIANoFEMrhxQM1xxKfA2QYLjgqL/YtdMm9g==
+js-crypto-env@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/js-crypto-env/-/js-crypto-env-1.0.5.tgz#aed3ba39ea6641b8052d47842bf8e48502c4eb63"
+  integrity sha512-8/UNN3sG8J+yMzqwSNVaobaWhIz4MqZFoOg5OB0DFXqS8eFjj2YvdmLJqIWXPl57Yw10SvYx0DQOtkfsWIV9Aw==
 
 js-message@1.0.7:
   version "1.0.7"
@@ -7246,21 +7239,21 @@ levn@~0.3.0:
     type-check "~0.3.2"
 
 libphonenumber-js@^1.10.14:
-  version "1.10.44"
-  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.44.tgz#6709722461173e744190494aaaec9c1c690d8ca8"
-  integrity sha512-svlRdNBI5WgBjRC20GrCfbFiclbF0Cx+sCcQob/C1r57nsoq0xg8r65QbTyVyweQIlB33P+Uahyho6EMYgcOyQ==
+  version "1.10.49"
+  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.10.49.tgz#c871661c62452348d228c96425f75ddf7e10f05a"
+  integrity sha512-gvLtyC3tIuqfPzjvYLH9BmVdqzGDiSi4VjtWe2fAgSdBf0yt8yPmbNnRIHNbR5IdtVkm0ayGuzwQKTWmU0hdjQ==
 
 libsodium-wrappers@^0.7.10, libsodium-wrappers@^0.7.6:
-  version "0.7.11"
-  resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz#53bd20606dffcc54ea2122133c7da38218f575f7"
-  integrity sha512-SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q==
+  version "0.7.13"
+  resolved "https://registry.yarnpkg.com/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz#83299e06ee1466057ba0e64e532777d2929b90d3"
+  integrity sha512-kasvDsEi/r1fMzKouIDv7B8I6vNmknXwGiYodErGuESoFTohGSKZplFtVxZqHaoQ217AynyIFgnOVRitpHs0Qw==
   dependencies:
-    libsodium "^0.7.11"
+    libsodium "^0.7.13"
 
-libsodium@^0.7.11:
-  version "0.7.11"
-  resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.11.tgz#cd10aae7bcc34a300cc6ad0ac88fcca674cfbc2e"
-  integrity sha512-WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A==
+libsodium@^0.7.13:
+  version "0.7.13"
+  resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.13.tgz#230712ec0b7447c57b39489c48a4af01985fb393"
+  integrity sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw==
 
 lines-and-columns@^1.1.6:
   version "1.1.6"
@@ -7805,13 +7798,12 @@ no-case@^2.2.0:
     lower-case "^1.1.1"
 
 nock@^13.2.9:
-  version "13.3.3"
-  resolved "https://registry.yarnpkg.com/nock/-/nock-13.3.3.tgz#179759c07d3f88ad3e794ace885629c1adfd3fe7"
-  integrity sha512-z+KUlILy9SK/RjpeXDiDUEAq4T94ADPHE3qaRkf66mpEhzc/ytOMm3Bwdrbq6k1tMWkbdujiKim3G2tfQARuJw==
+  version "13.3.7"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-13.3.7.tgz#27c8a2709d602a0570e45d3f182db342c6bd5551"
+  integrity sha512-z3voRxo6G0JxqCsjuzERh1ReFC4Vp2b7JpSgcMJB6jnJbUszf88awAeQLIID2UNMwbMh9/Zm5sFscagj0QYHEg==
   dependencies:
     debug "^4.1.0"
     json-stringify-safe "^5.0.1"
-    lodash "^4.17.21"
     propagate "^2.0.0"
 
 node-addon-api@^1.7.1:
@@ -10663,6 +10655,11 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -11429,9 +11426,9 @@ ws@^7.0.0:
   integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
 
 ws@^8.12.0:
-  version "8.14.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.1.tgz#4b9586b4f70f9e6534c7bb1d3dc0baa8b8cf01e0"
-  integrity sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A==
+  version "8.14.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f"
+  integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"

From 911a5c20a5877e53f94cf9344302ec4660302c13 Mon Sep 17 00:00:00 2001
From: ahmedhanafy725 <hanafya@incubaid.com>
Date: Thu, 2 Nov 2023 12:21:18 +0200
Subject: [PATCH 33/54] Use nodejs 18.16.0 for building the weblets

---
 .github/workflows/weblets_build.yaml   | 6 ++----
 .github/workflows/weblets_cd.yml       | 6 ++----
 .github/workflows/weblets_cypress.yaml | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/weblets_build.yaml b/.github/workflows/weblets_build.yaml
index 01b06d1e82..eef1c6da36 100644
--- a/.github/workflows/weblets_build.yaml
+++ b/.github/workflows/weblets_build.yaml
@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: ["18.16.0"]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -36,9 +36,7 @@ jobs:
       - name: Install dependencies
         run: |
           yarn install
-          cd packages/weblets
-          yarn install
-          cd playground
+          cd packages/weblets/playground
           yarn install
 
       - name: Build
diff --git a/.github/workflows/weblets_cd.yml b/.github/workflows/weblets_cd.yml
index 9c71946dc3..11ea82de55 100644
--- a/.github/workflows/weblets_cd.yml
+++ b/.github/workflows/weblets_cd.yml
@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: ["18.16.0"]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -38,9 +38,7 @@ jobs:
       - name: Install dependencies
         run: |
           yarn install
-          cd packages/weblets
-          yarn install
-          cd playground
+          cd packages/weblets/playground
           yarn install
 
       - name: Build in case development
diff --git a/.github/workflows/weblets_cypress.yaml b/.github/workflows/weblets_cypress.yaml
index fb13e6ffc2..fd616007ad 100644
--- a/.github/workflows/weblets_cypress.yaml
+++ b/.github/workflows/weblets_cypress.yaml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: ["18.16.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

From f53feeeadebdff0f7a5f2a1fb3531aacacb11f55 Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 2 Nov 2023 13:19:23 +0200
Subject: [PATCH 34/54] Downgrade the node version of the weblets docker to
 '18.16.0'

---
 packages/weblets/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/weblets/Dockerfile b/packages/weblets/Dockerfile
index f75aa09fbc..cbfc9c2164 100644
--- a/packages/weblets/Dockerfile
+++ b/packages/weblets/Dockerfile
@@ -1,5 +1,5 @@
 # choose the Image which has Node installed already
-FROM node:18 AS build
+FROM node:18.16.0 AS build
 
 # add arg for the network
 ARG NETWORK

From 2d47109b4457786eecd28cd0959bd6d1b43e56ac Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 2 Nov 2023 13:23:25 +0200
Subject: [PATCH 35/54] Update the version of the values and charts.

---
 packages/dashboard/charts/tfgrid-dashboard/Chart.yaml  | 2 +-
 packages/dashboard/charts/tfgrid-dashboard/values.yaml | 2 +-
 packages/playground/playground-charts/Chart.yaml       | 2 +-
 packages/playground/playground-charts/values.yaml      | 2 +-
 packages/stats/chart/Chart.yaml                        | 2 +-
 packages/stats/chart/values.yaml                       | 2 +-
 packages/weblets/weblets-chart/Chart.yaml              | 2 +-
 packages/weblets/weblets-chart/values.yaml             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
index 07ada165bb..7ab1359ee8 100644
--- a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
+++ b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.6
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc1"
+appVersion: "v2.2.0-rc2"
diff --git a/packages/dashboard/charts/tfgrid-dashboard/values.yaml b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
index e6237ca54a..fac4ead975 100644
--- a/packages/dashboard/charts/tfgrid-dashboard/values.yaml
+++ b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/threefoldtech/dashboard
   pullPolicy: Always
-  tag: "2.2.0-rc1"
+  tag: "2.2.0-rc2"
 
   env:
     - name: "STELLAR_NETWORK"
diff --git a/packages/playground/playground-charts/Chart.yaml b/packages/playground/playground-charts/Chart.yaml
index a71431f51c..b118521231 100644
--- a/packages/playground/playground-charts/Chart.yaml
+++ b/packages/playground/playground-charts/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc1"
+appVersion: "v2.2.0-rc2"
diff --git a/packages/playground/playground-charts/values.yaml b/packages/playground/playground-charts/values.yaml
index 2906a8ee3e..bb6bb9dea0 100644
--- a/packages/playground/playground-charts/values.yaml
+++ b/packages/playground/playground-charts/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/playground
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc1"
+  tag: "2.2.0-rc2"
   
   env:
     - name: "MODE"
diff --git a/packages/stats/chart/Chart.yaml b/packages/stats/chart/Chart.yaml
index 9490995767..605d3d88d4 100644
--- a/packages/stats/chart/Chart.yaml
+++ b/packages/stats/chart/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc1"
+appVersion: "v2.2.0-rc2"
diff --git a/packages/stats/chart/values.yaml b/packages/stats/chart/values.yaml
index 4f3cf81416..2ce92e9199 100644
--- a/packages/stats/chart/values.yaml
+++ b/packages/stats/chart/values.yaml
@@ -4,7 +4,7 @@ image:
   repository: ghcr.io/threefoldtech/stats
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc1"
+  tag: "2.2.0-rc2"
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/packages/weblets/weblets-chart/Chart.yaml b/packages/weblets/weblets-chart/Chart.yaml
index ab54b8ed20..5e50cade35 100644
--- a/packages/weblets/weblets-chart/Chart.yaml
+++ b/packages/weblets/weblets-chart/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc1"
+appVersion: "v2.2.0-rc2"
diff --git a/packages/weblets/weblets-chart/values.yaml b/packages/weblets/weblets-chart/values.yaml
index 6e78454f03..dae97daad1 100644
--- a/packages/weblets/weblets-chart/values.yaml
+++ b/packages/weblets/weblets-chart/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/weblets
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc1"
+  tag: "2.2.0-rc2"
   
   env:
     - name: "MODE"

From 01df99d8b55a1a235821de704461991b4e4dfc54 Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 2 Nov 2023 13:45:51 +0200
Subject: [PATCH 36/54] v2.2.0-rc2

---
 lerna.json                              | 2 +-
 packages/UI/package.json                | 2 +-
 packages/dashboard/package.json         | 6 +++---
 packages/grid_client/package.json       | 6 +++---
 packages/grid_http_server/package.json  | 4 ++--
 packages/grid_rmb_server/package.json   | 8 ++++----
 packages/playground/package.json        | 4 ++--
 packages/rmb_direct_client/package.json | 4 ++--
 packages/rmb_peer_client/package.json   | 2 +-
 packages/rmb_peer_server/package.json   | 2 +-
 packages/stats/package.json             | 2 +-
 packages/tfchain_client/package.json    | 2 +-
 packages/weblets/package.json           | 4 ++--
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index bd1e69381e..8e8c4a3faf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "npmClient": "yarn"
 }
diff --git a/packages/UI/package.json b/packages/UI/package.json
index ecc322524c..2b8f591f85 100644
--- a/packages/UI/package.json
+++ b/packages/UI/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/ui",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index b2dbcc84df..d610724c67 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/dashboard",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,8 +19,8 @@
     "@polkadot/extension-dapp": "0.45.1",
     "@polkadot/ui-keyring": "^2.2.1",
     "@popperjs/core": "^2.11.5",
-    "@threefold/grid_client": "^2.2.0-rc1",
-    "@threefold/tfchain_client": "^2.2.0-rc1",
+    "@threefold/grid_client": "^2.2.0-rc2",
+    "@threefold/tfchain_client": "^2.2.0-rc2",
     "@types/ip": "^1.1.0",
     "@types/md5": "^2.3.2",
     "apollo-cache-inmemory": "^1.6.6",
diff --git a/packages/grid_client/package.json b/packages/grid_client/package.json
index 1eb27ceb2a..20d771415d 100644
--- a/packages/grid_client/package.json
+++ b/packages/grid_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_client",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md",
   "repository": {
@@ -14,8 +14,8 @@
   "dependencies": {
     "@jimber/pkid": "1.0.4",
     "@noble/secp256k1": "^1.7.1",
-    "@threefold/rmb_direct_client": "^2.2.0-rc1",
-    "@threefold/tfchain_client": "^2.2.0-rc1",
+    "@threefold/rmb_direct_client": "^2.2.0-rc2",
+    "@threefold/tfchain_client": "^2.2.0-rc2",
     "algosdk": "^1.19.0",
     "appdata-path": "^1.0.0",
     "axios": "^0.27.2",
diff --git a/packages/grid_http_server/package.json b/packages/grid_http_server/package.json
index d197254dad..b8b82992bc 100644
--- a/packages/grid_http_server/package.json
+++ b/packages/grid_http_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_http_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_http_server/README.md",
   "repository": {
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/grid_client": "^2.2.0-rc2",
     "express": "^4.18.1",
     "http-server": "^14.1.1",
     "typescript": "^4.7.4"
diff --git a/packages/grid_rmb_server/package.json b/packages/grid_rmb_server/package.json
index 4b9d65dfd4..70cc97ceb2 100644
--- a/packages/grid_rmb_server/package.json
+++ b/packages/grid_rmb_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_rmb_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_rmb_server/README.md",
   "repository": {
@@ -12,12 +12,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.2.0-rc1",
-    "@threefold/rmb_peer_server": "^2.2.0-rc1",
+    "@threefold/grid_client": "^2.2.0-rc2",
+    "@threefold/rmb_peer_server": "^2.2.0-rc2",
     "typescript": "^4.7.4"
   },
   "devDependencies": {
-    "@threefold/rmb_peer_client": "^2.2.0-rc1",
+    "@threefold/rmb_peer_client": "^2.2.0-rc2",
     "ts-node": "^10.9.1"
   },
   "main": "./dist/index.js",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index 67ac067104..33b23ee723 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/playground",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@mdi/font": "^7.2.96",
-    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/grid_client": "^2.2.0-rc2",
     "@threefold/gridproxy_client": "^2.1.1-rc1",
     "bip39": "^3.1.0",
     "cryptr": "^6.2.0",
diff --git a/packages/rmb_direct_client/package.json b/packages/rmb_direct_client/package.json
index 7f7229fe7b..6cf7cf4523 100644
--- a/packages/rmb_direct_client/package.json
+++ b/packages/rmb_direct_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/rmb_direct_client",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "repository": {
     "type": "git",
     "url": "https://github.com/threefoldtech/tfgrid-sdk-ts.git"
@@ -23,7 +23,7 @@
   "dependencies": {
     "@noble/secp256k1": "^1.7.1",
     "@polkadot/api": "^8.9.1",
-    "@threefold/tfchain_client": "^2.2.0-rc1",
+    "@threefold/tfchain_client": "^2.2.0-rc2",
     "base64url": "^3.0.1",
     "bip39": "^3.1.0",
     "buffer": "^6.0.3",
diff --git a/packages/rmb_peer_client/package.json b/packages/rmb_peer_client/package.json
index bddab0bf2a..f1a5482eac 100644
--- a/packages/rmb_peer_client/package.json
+++ b/packages/rmb_peer_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_client",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_client/README.md",
   "repository": {
diff --git a/packages/rmb_peer_server/package.json b/packages/rmb_peer_server/package.json
index 8595ce2a36..34dbd4486c 100644
--- a/packages/rmb_peer_server/package.json
+++ b/packages/rmb_peer_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_server/README.md",
   "repository": {
diff --git a/packages/stats/package.json b/packages/stats/package.json
index a682f1d944..4baf623e51 100644
--- a/packages/stats/package.json
+++ b/packages/stats/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/stats",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "private": true,
   "scripts": {
     "build": "rollup -c",
diff --git a/packages/tfchain_client/package.json b/packages/tfchain_client/package.json
index 9311f9aa89..7ea3a44f63 100644
--- a/packages/tfchain_client/package.json
+++ b/packages/tfchain_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/tfchain_client",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "description": "A client for TF chain",
   "private": false,
   "publishConfig": {
diff --git a/packages/weblets/package.json b/packages/weblets/package.json
index 70e421ce3d..1a46b4b0c6 100644
--- a/packages/weblets/package.json
+++ b/packages/weblets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/weblets",
-  "version": "2.2.0-rc1",
+  "version": "2.2.0-rc2",
   "private": true,
   "scripts": {
     "rollup-build": "rollup -c",
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@threefold/grid_client": "^2.2.0-rc1",
+    "@threefold/grid_client": "^2.2.0-rc2",
     "add": "^2.0.6",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",

From 256ea5e09d2a061fd1c0ed4a6e9449a5f9b9a128 Mon Sep 17 00:00:00 2001
From: Mahmoud Emad <mahmmoud.hassanein@gmail.com>
Date: Thu, 2 Nov 2023 13:50:48 +0200
Subject: [PATCH 37/54] Change the grid_client version.

---
 packages/weblets/playground/package.json |  2 +-
 packages/weblets/playground/yarn.lock    | 30 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/weblets/playground/package.json b/packages/weblets/playground/package.json
index 1ff3215a51..8e1242d582 100644
--- a/packages/weblets/playground/package.json
+++ b/packages/weblets/playground/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@open-wc/webpack-import-meta-loader": "^0.4.7",
-    "@threefold/grid_client": "2.2.0-rc1",
+    "@threefold/grid_client": "2.2.0-rc2",
     "axios": "^0.24.0",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",
diff --git a/packages/weblets/playground/yarn.lock b/packages/weblets/playground/yarn.lock
index ab6f5f3477..352d003e5e 100644
--- a/packages/weblets/playground/yarn.lock
+++ b/packages/weblets/playground/yarn.lock
@@ -1529,15 +1529,15 @@
   resolved "https://registry.yarnpkg.com/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz#93108e45cb7ef6d82560c153e3692c2aa1c711b3"
   integrity sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==
 
-"@threefold/grid_client@2.2.0-rc1":
-  version "2.2.0-rc1"
-  resolved "https://registry.yarnpkg.com/@threefold/grid_client/-/grid_client-2.2.0-rc1.tgz#6153393e35febcfffaced57e2f0acf8f1795d14c"
-  integrity sha512-qtFo0MQOBJsZuGpiiP9QcN9JZXKXa2mBtByowVbxi2f319hBF8QXANzmb9tj75GrVVDDy+UXdwyebAubwlX5Vw==
+"@threefold/grid_client@2.2.0-rc2":
+  version "2.2.0-rc2"
+  resolved "https://registry.yarnpkg.com/@threefold/grid_client/-/grid_client-2.2.0-rc2.tgz#8cca7ff40bfbd8881d646ca65e44f3ede330595c"
+  integrity sha512-3xSUut0SMFgB7ijdXc701Zh+2OmiSB+7qobE24X2QXS0fII2NALaq4+f26/YVqee3/SPQZCZWrRgllVxSZvqzQ==
   dependencies:
     "@jimber/pkid" "1.0.4"
     "@noble/secp256k1" "^1.7.1"
-    "@threefold/rmb_direct_client" "^2.2.0-rc1"
-    "@threefold/tfchain_client" "^2.2.0-rc1"
+    "@threefold/rmb_direct_client" "^2.2.0-rc2"
+    "@threefold/tfchain_client" "^2.2.0-rc2"
     algosdk "^1.19.0"
     appdata-path "^1.0.0"
     axios "^0.27.2"
@@ -1559,14 +1559,14 @@
     url-parse "^1.5.10"
     uuid4 "^2.0.2"
 
-"@threefold/rmb_direct_client@^2.2.0-rc1":
-  version "2.2.0-rc1"
-  resolved "https://registry.yarnpkg.com/@threefold/rmb_direct_client/-/rmb_direct_client-2.2.0-rc1.tgz#aa567a29cad3e5fae2f54be1c51fe13f77dfe100"
-  integrity sha512-izvoWKnEpLEC1JSfKgKYEs3qs0SlzIIe4KfgAj79VsH+Vd3Lis93/pOOfbA/ye6eiOEam5XgUc+qYqKJ4fJNYA==
+"@threefold/rmb_direct_client@^2.2.0-rc2":
+  version "2.2.0-rc2"
+  resolved "https://registry.yarnpkg.com/@threefold/rmb_direct_client/-/rmb_direct_client-2.2.0-rc2.tgz#de5d83d5822bd7390e0e5af79daab9505f8308a6"
+  integrity sha512-znuSQWpXMiBvsq8APor7U7odPexyHHCMSMZ6YFbXH8giaOpfAJInL3XNJnpxEbx/ZEnf12EDcFYq3CYyVgGwyQ==
   dependencies:
     "@noble/secp256k1" "^1.7.1"
     "@polkadot/api" "^8.9.1"
-    "@threefold/tfchain_client" "^2.2.0-rc1"
+    "@threefold/tfchain_client" "^2.2.0-rc2"
     base64url "^3.0.1"
     bip39 "^3.1.0"
     buffer "^6.0.3"
@@ -1576,10 +1576,10 @@
     uuid "^8.3.2"
     ws "^8.12.0"
 
-"@threefold/tfchain_client@^2.2.0-rc1":
-  version "2.2.0-rc1"
-  resolved "https://registry.yarnpkg.com/@threefold/tfchain_client/-/tfchain_client-2.2.0-rc1.tgz#e3c18a152dec3c3c17192d300334399083c53803"
-  integrity sha512-eJSfkvgP09M0BHlz7ZHwfuF9Y60IIl6ARD57kBxLiB+SmjkES/53pjEdVoIHbCRmyJ47ZET+3MrH5gZ4gHRw2w==
+"@threefold/tfchain_client@^2.2.0-rc2":
+  version "2.2.0-rc2"
+  resolved "https://registry.yarnpkg.com/@threefold/tfchain_client/-/tfchain_client-2.2.0-rc2.tgz#1e57f099d40fb830ed7de5cac8ab7b8788cc06bd"
+  integrity sha512-3qlg4CwWkwfsWveIDuz5SKkDXROfiDZLBha2cuTT/ITfkSn/p1LGVpn6DULyJfv+3H8EcsMoicKEPrTXk2kuKQ==
   dependencies:
     "@polkadot/api" "^8.9.1"
     await-lock "^2.2.2"

From d3a2b4b5efaf50f4d233dc63cadca84c932b3519 Mon Sep 17 00:00:00 2001
From: ahmedhanafy725 <hanafya@incubaid.com>
Date: Thu, 2 Nov 2023 14:16:34 +0200
Subject: [PATCH 38/54] Fix weblets docker image build

---
 packages/weblets/Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/weblets/Dockerfile b/packages/weblets/Dockerfile
index cbfc9c2164..50d1c962d4 100644
--- a/packages/weblets/Dockerfile
+++ b/packages/weblets/Dockerfile
@@ -13,9 +13,6 @@ WORKDIR /app
 # copy project files and folders to the current working directory (i.e. 'app' folder)
 COPY . .
 
-# increase the max memory for node
-ENV NODE_OPTIONS="--max-old-space-size=8192 --openssl-legacy-provider"
-
 # install project dependencies
 RUN yarn install && yarn workspace @threefold/weblets deps
 
@@ -23,7 +20,12 @@ RUN yarn install && yarn workspace @threefold/weblets deps
 RUN cd packages/weblets/playground && yarn add @threefold/grid_client@${VERSION}
 
 # build project solutions
-RUN yarn lerna run build --no-private && yarn workspace @threefold/weblets build:app
+RUN yarn lerna run build --no-private
+
+# increase the max memory for node
+ENV NODE_OPTIONS="--max-old-space-size=8192 --openssl-legacy-provider"
+
+RUN yarn workspace @threefold/weblets build:app
 
 # install nginx
 FROM nginx:1.19-alpine

From fe149a1ce8e7eddc1dfab2026090adaa6faf463a Mon Sep 17 00:00:00 2001
From: MohamedElmdary <engm5081@gmail.com>
Date: Sun, 5 Nov 2023 15:16:57 +0200
Subject: [PATCH 39/54] hotfix: add cropping for fromkey/tokey while moving
 kvstore key's value

---
 packages/grid_client/src/storage/tfkvstore.ts |  5 ++++-
 packages/grid_client/src/storage/utils.ts     | 10 +++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/grid_client/src/storage/tfkvstore.ts b/packages/grid_client/src/storage/tfkvstore.ts
index b47bbb6ad4..13ec26cd38 100644
--- a/packages/grid_client/src/storage/tfkvstore.ts
+++ b/packages/grid_client/src/storage/tfkvstore.ts
@@ -5,7 +5,7 @@ import { ExtrinsicResult } from "@threefold/tfchain_client";
 import { TFClient } from "../clients/tf-grid/client";
 import { KeypairType } from "../zos/deployment";
 import BackendStorageInterface from "./BackendStorageInterface";
-import { crop } from "./utils";
+import { crop, cropKey } from "./utils";
 
 const SPLIT_SIZE = 1490;
 
@@ -95,6 +95,9 @@ class TFKVStoreBackend implements BackendStorageInterface {
   }
 
   public async moveValue(fromKey: string, toKey: string): Promise<ExtrinsicResult<void>[]> {
+    fromKey = cropKey(fromKey);
+    toKey = cropKey(toKey);
+
     const exts: ExtrinsicResult<void>[] = [];
 
     for (let i = 0; ; i++) {
diff --git a/packages/grid_client/src/storage/utils.ts b/packages/grid_client/src/storage/utils.ts
index c5fa925721..b7d2cc4084 100644
--- a/packages/grid_client/src/storage/utils.ts
+++ b/packages/grid_client/src/storage/utils.ts
@@ -1,10 +1,14 @@
+function cropKey(key: string): string {
+  const [x, y] = key.split("grid3_client/");
+  return y || x;
+}
+
 function crop(target, propertyKey: string, descriptor: PropertyDescriptor) {
   const method = descriptor.value;
   descriptor.value = function (...args) {
-    const x = args[0].split("grid3_client/");
-    args[0] = x.length === 2 ? x[1] : x[0];
+    args[0] = cropKey(args[0]);
     return method.apply(this, args);
   };
 }
 
-export { crop };
+export { cropKey, crop };

From b58e8c6f7df843a2474641d521900aa38b80071f Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Wed, 8 Nov 2023 12:27:58 +0200
Subject: [PATCH 40/54] update tag and version in private pkg to 2.2.0-rc3

---
 packages/dashboard/charts/tfgrid-dashboard/Chart.yaml  | 2 +-
 packages/dashboard/charts/tfgrid-dashboard/values.yaml | 2 +-
 packages/playground/playground-charts/Chart.yaml       | 2 +-
 packages/playground/playground-charts/values.yaml      | 2 +-
 packages/stats/chart/Chart.yaml                        | 2 +-
 packages/stats/chart/values.yaml                       | 2 +-
 packages/weblets/weblets-chart/Chart.yaml              | 2 +-
 packages/weblets/weblets-chart/values.yaml             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
index 7ab1359ee8..615038c456 100644
--- a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
+++ b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.6
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc2"
+appVersion: "v2.2.0-rc3"
diff --git a/packages/dashboard/charts/tfgrid-dashboard/values.yaml b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
index fac4ead975..ae3251107d 100644
--- a/packages/dashboard/charts/tfgrid-dashboard/values.yaml
+++ b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/threefoldtech/dashboard
   pullPolicy: Always
-  tag: "2.2.0-rc2"
+  tag: "2.2.0-rc3"
 
   env:
     - name: "STELLAR_NETWORK"
diff --git a/packages/playground/playground-charts/Chart.yaml b/packages/playground/playground-charts/Chart.yaml
index b118521231..8f05ed5e71 100644
--- a/packages/playground/playground-charts/Chart.yaml
+++ b/packages/playground/playground-charts/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc2"
+appVersion: "v2.2.0-rc3"
diff --git a/packages/playground/playground-charts/values.yaml b/packages/playground/playground-charts/values.yaml
index bb6bb9dea0..e293c271d3 100644
--- a/packages/playground/playground-charts/values.yaml
+++ b/packages/playground/playground-charts/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/playground
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc2"
+  tag: "2.2.0-rc3"
   
   env:
     - name: "MODE"
diff --git a/packages/stats/chart/Chart.yaml b/packages/stats/chart/Chart.yaml
index 605d3d88d4..4791ebfe52 100644
--- a/packages/stats/chart/Chart.yaml
+++ b/packages/stats/chart/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc2"
+appVersion: "v2.2.0-rc3"
diff --git a/packages/stats/chart/values.yaml b/packages/stats/chart/values.yaml
index 2ce92e9199..8f7314a1ca 100644
--- a/packages/stats/chart/values.yaml
+++ b/packages/stats/chart/values.yaml
@@ -4,7 +4,7 @@ image:
   repository: ghcr.io/threefoldtech/stats
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc2"
+  tag: "2.2.0-rc3"
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/packages/weblets/weblets-chart/Chart.yaml b/packages/weblets/weblets-chart/Chart.yaml
index 5e50cade35..d056baf937 100644
--- a/packages/weblets/weblets-chart/Chart.yaml
+++ b/packages/weblets/weblets-chart/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc2"
+appVersion: "v2.2.0-rc3"
diff --git a/packages/weblets/weblets-chart/values.yaml b/packages/weblets/weblets-chart/values.yaml
index dae97daad1..e52d0eaa46 100644
--- a/packages/weblets/weblets-chart/values.yaml
+++ b/packages/weblets/weblets-chart/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/weblets
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc2"
+  tag: "2.2.0-rc3"
   
   env:
     - name: "MODE"

From b09595d4352d9de185772f39ea79787a0faeff99 Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Wed, 8 Nov 2023 12:45:47 +0200
Subject: [PATCH 41/54] v2.2.0-rc3

---
 lerna.json                              | 2 +-
 packages/UI/package.json                | 2 +-
 packages/dashboard/package.json         | 6 +++---
 packages/grid_client/package.json       | 6 +++---
 packages/grid_http_server/package.json  | 4 ++--
 packages/grid_rmb_server/package.json   | 8 ++++----
 packages/playground/package.json        | 4 ++--
 packages/rmb_direct_client/package.json | 4 ++--
 packages/rmb_peer_client/package.json   | 2 +-
 packages/rmb_peer_server/package.json   | 2 +-
 packages/stats/package.json             | 2 +-
 packages/tfchain_client/package.json    | 2 +-
 packages/weblets/package.json           | 4 ++--
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index 8e8c4a3faf..ea6a792623 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "npmClient": "yarn"
 }
diff --git a/packages/UI/package.json b/packages/UI/package.json
index 2b8f591f85..508d973198 100644
--- a/packages/UI/package.json
+++ b/packages/UI/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/ui",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index d610724c67..8a0d4d8757 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/dashboard",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,8 +19,8 @@
     "@polkadot/extension-dapp": "0.45.1",
     "@polkadot/ui-keyring": "^2.2.1",
     "@popperjs/core": "^2.11.5",
-    "@threefold/grid_client": "^2.2.0-rc2",
-    "@threefold/tfchain_client": "^2.2.0-rc2",
+    "@threefold/grid_client": "^2.2.0-rc3",
+    "@threefold/tfchain_client": "^2.2.0-rc3",
     "@types/ip": "^1.1.0",
     "@types/md5": "^2.3.2",
     "apollo-cache-inmemory": "^1.6.6",
diff --git a/packages/grid_client/package.json b/packages/grid_client/package.json
index 20d771415d..a79296ec09 100644
--- a/packages/grid_client/package.json
+++ b/packages/grid_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_client",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md",
   "repository": {
@@ -14,8 +14,8 @@
   "dependencies": {
     "@jimber/pkid": "1.0.4",
     "@noble/secp256k1": "^1.7.1",
-    "@threefold/rmb_direct_client": "^2.2.0-rc2",
-    "@threefold/tfchain_client": "^2.2.0-rc2",
+    "@threefold/rmb_direct_client": "^2.2.0-rc3",
+    "@threefold/tfchain_client": "^2.2.0-rc3",
     "algosdk": "^1.19.0",
     "appdata-path": "^1.0.0",
     "axios": "^0.27.2",
diff --git a/packages/grid_http_server/package.json b/packages/grid_http_server/package.json
index b8b82992bc..3bdc584bea 100644
--- a/packages/grid_http_server/package.json
+++ b/packages/grid_http_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_http_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_http_server/README.md",
   "repository": {
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.2.0-rc2",
+    "@threefold/grid_client": "^2.2.0-rc3",
     "express": "^4.18.1",
     "http-server": "^14.1.1",
     "typescript": "^4.7.4"
diff --git a/packages/grid_rmb_server/package.json b/packages/grid_rmb_server/package.json
index 70cc97ceb2..2b1e6eec11 100644
--- a/packages/grid_rmb_server/package.json
+++ b/packages/grid_rmb_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_rmb_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_rmb_server/README.md",
   "repository": {
@@ -12,12 +12,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.2.0-rc2",
-    "@threefold/rmb_peer_server": "^2.2.0-rc2",
+    "@threefold/grid_client": "^2.2.0-rc3",
+    "@threefold/rmb_peer_server": "^2.2.0-rc3",
     "typescript": "^4.7.4"
   },
   "devDependencies": {
-    "@threefold/rmb_peer_client": "^2.2.0-rc2",
+    "@threefold/rmb_peer_client": "^2.2.0-rc3",
     "ts-node": "^10.9.1"
   },
   "main": "./dist/index.js",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index 33b23ee723..020d321f7f 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/playground",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@mdi/font": "^7.2.96",
-    "@threefold/grid_client": "^2.2.0-rc2",
+    "@threefold/grid_client": "^2.2.0-rc3",
     "@threefold/gridproxy_client": "^2.1.1-rc1",
     "bip39": "^3.1.0",
     "cryptr": "^6.2.0",
diff --git a/packages/rmb_direct_client/package.json b/packages/rmb_direct_client/package.json
index 6cf7cf4523..202b57cd22 100644
--- a/packages/rmb_direct_client/package.json
+++ b/packages/rmb_direct_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/rmb_direct_client",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "repository": {
     "type": "git",
     "url": "https://github.com/threefoldtech/tfgrid-sdk-ts.git"
@@ -23,7 +23,7 @@
   "dependencies": {
     "@noble/secp256k1": "^1.7.1",
     "@polkadot/api": "^8.9.1",
-    "@threefold/tfchain_client": "^2.2.0-rc2",
+    "@threefold/tfchain_client": "^2.2.0-rc3",
     "base64url": "^3.0.1",
     "bip39": "^3.1.0",
     "buffer": "^6.0.3",
diff --git a/packages/rmb_peer_client/package.json b/packages/rmb_peer_client/package.json
index f1a5482eac..5bc2bd7123 100644
--- a/packages/rmb_peer_client/package.json
+++ b/packages/rmb_peer_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_client",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_client/README.md",
   "repository": {
diff --git a/packages/rmb_peer_server/package.json b/packages/rmb_peer_server/package.json
index 34dbd4486c..16e9976306 100644
--- a/packages/rmb_peer_server/package.json
+++ b/packages/rmb_peer_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_server/README.md",
   "repository": {
diff --git a/packages/stats/package.json b/packages/stats/package.json
index 4baf623e51..8c5a83f5cc 100644
--- a/packages/stats/package.json
+++ b/packages/stats/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/stats",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "private": true,
   "scripts": {
     "build": "rollup -c",
diff --git a/packages/tfchain_client/package.json b/packages/tfchain_client/package.json
index 7ea3a44f63..8383c4fe3b 100644
--- a/packages/tfchain_client/package.json
+++ b/packages/tfchain_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/tfchain_client",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "description": "A client for TF chain",
   "private": false,
   "publishConfig": {
diff --git a/packages/weblets/package.json b/packages/weblets/package.json
index 1a46b4b0c6..c0fe150d42 100644
--- a/packages/weblets/package.json
+++ b/packages/weblets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/weblets",
-  "version": "2.2.0-rc2",
+  "version": "2.2.0-rc3",
   "private": true,
   "scripts": {
     "rollup-build": "rollup -c",
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@threefold/grid_client": "^2.2.0-rc2",
+    "@threefold/grid_client": "^2.2.0-rc3",
     "add": "^2.0.6",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",

From 71821366dcb39316ed745819de90933061572224 Mon Sep 17 00:00:00 2001
From: AlaaElattar <alaamahmoud.1223@gmail.com>
Date: Wed, 8 Nov 2023 12:57:45 +0200
Subject: [PATCH 42/54] change grid_client version in weblets/playground

---
 packages/weblets/playground/package.json |  2 +-
 packages/weblets/playground/yarn.lock    | 30 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/weblets/playground/package.json b/packages/weblets/playground/package.json
index 8e1242d582..f7fd454548 100644
--- a/packages/weblets/playground/package.json
+++ b/packages/weblets/playground/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@open-wc/webpack-import-meta-loader": "^0.4.7",
-    "@threefold/grid_client": "2.2.0-rc2",
+    "@threefold/grid_client": "2.2.0-rc3",
     "axios": "^0.24.0",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",
diff --git a/packages/weblets/playground/yarn.lock b/packages/weblets/playground/yarn.lock
index 352d003e5e..78feb61ee4 100644
--- a/packages/weblets/playground/yarn.lock
+++ b/packages/weblets/playground/yarn.lock
@@ -1529,15 +1529,15 @@
   resolved "https://registry.yarnpkg.com/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz#93108e45cb7ef6d82560c153e3692c2aa1c711b3"
   integrity sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==
 
-"@threefold/grid_client@2.2.0-rc2":
-  version "2.2.0-rc2"
-  resolved "https://registry.yarnpkg.com/@threefold/grid_client/-/grid_client-2.2.0-rc2.tgz#8cca7ff40bfbd8881d646ca65e44f3ede330595c"
-  integrity sha512-3xSUut0SMFgB7ijdXc701Zh+2OmiSB+7qobE24X2QXS0fII2NALaq4+f26/YVqee3/SPQZCZWrRgllVxSZvqzQ==
+"@threefold/grid_client@2.2.0-rc3":
+  version "2.2.0-rc3"
+  resolved "https://registry.yarnpkg.com/@threefold/grid_client/-/grid_client-2.2.0-rc3.tgz#cb8360a225a4233ac24a29aaad39ca27e3fd933c"
+  integrity sha512-RiKXpMcDLrN9pUQs++g4Tr9zyeAf0wMNP0E6mHydPJz7vXo7dp3vciebS4XmmbIZhpPgGOAiASOxabcgLQE0sg==
   dependencies:
     "@jimber/pkid" "1.0.4"
     "@noble/secp256k1" "^1.7.1"
-    "@threefold/rmb_direct_client" "^2.2.0-rc2"
-    "@threefold/tfchain_client" "^2.2.0-rc2"
+    "@threefold/rmb_direct_client" "^2.2.0-rc3"
+    "@threefold/tfchain_client" "^2.2.0-rc3"
     algosdk "^1.19.0"
     appdata-path "^1.0.0"
     axios "^0.27.2"
@@ -1559,14 +1559,14 @@
     url-parse "^1.5.10"
     uuid4 "^2.0.2"
 
-"@threefold/rmb_direct_client@^2.2.0-rc2":
-  version "2.2.0-rc2"
-  resolved "https://registry.yarnpkg.com/@threefold/rmb_direct_client/-/rmb_direct_client-2.2.0-rc2.tgz#de5d83d5822bd7390e0e5af79daab9505f8308a6"
-  integrity sha512-znuSQWpXMiBvsq8APor7U7odPexyHHCMSMZ6YFbXH8giaOpfAJInL3XNJnpxEbx/ZEnf12EDcFYq3CYyVgGwyQ==
+"@threefold/rmb_direct_client@^2.2.0-rc3":
+  version "2.2.0-rc3"
+  resolved "https://registry.yarnpkg.com/@threefold/rmb_direct_client/-/rmb_direct_client-2.2.0-rc3.tgz#2b0f19786ee4f511a158559af85caef9f2fe7a2b"
+  integrity sha512-z5O++ixb8GKRfP1hYcpPXqX/XLE6L7kPzS9HOGG2o2jPWk5+88ZKDSRn9X4uB0EzBGY3ZWNFkAhHEnhUW8K/Dw==
   dependencies:
     "@noble/secp256k1" "^1.7.1"
     "@polkadot/api" "^8.9.1"
-    "@threefold/tfchain_client" "^2.2.0-rc2"
+    "@threefold/tfchain_client" "^2.2.0-rc3"
     base64url "^3.0.1"
     bip39 "^3.1.0"
     buffer "^6.0.3"
@@ -1576,10 +1576,10 @@
     uuid "^8.3.2"
     ws "^8.12.0"
 
-"@threefold/tfchain_client@^2.2.0-rc2":
-  version "2.2.0-rc2"
-  resolved "https://registry.yarnpkg.com/@threefold/tfchain_client/-/tfchain_client-2.2.0-rc2.tgz#1e57f099d40fb830ed7de5cac8ab7b8788cc06bd"
-  integrity sha512-3qlg4CwWkwfsWveIDuz5SKkDXROfiDZLBha2cuTT/ITfkSn/p1LGVpn6DULyJfv+3H8EcsMoicKEPrTXk2kuKQ==
+"@threefold/tfchain_client@^2.2.0-rc3":
+  version "2.2.0-rc3"
+  resolved "https://registry.yarnpkg.com/@threefold/tfchain_client/-/tfchain_client-2.2.0-rc3.tgz#02055f6d3f8189fb2f83e59eb4d9e620c062c4f0"
+  integrity sha512-BdQkFNVgO90Q1caGnRR8pngH4DbFWSlWbz646rrScxMmD5WJpbiTQ8qoK2wGzskXhyTfLsCh2Q4zhMl4cd2K3Q==
   dependencies:
     "@polkadot/api" "^8.9.1"
     await-lock "^2.2.2"

From c21a18445b46b1196596c8926a4a885eb693a3bb Mon Sep 17 00:00:00 2001
From: MohamedElmdary <engm5081@gmail.com>
Date: Sun, 12 Nov 2023 14:47:37 +0200
Subject: [PATCH 43/54] Fix k8s manage worker

---
 .../playground/src/components/manage_k8s_worker_dialog.vue     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/playground/src/components/manage_k8s_worker_dialog.vue b/packages/playground/src/components/manage_k8s_worker_dialog.vue
index 95b71b4524..81fcc40eea 100644
--- a/packages/playground/src/components/manage_k8s_worker_dialog.vue
+++ b/packages/playground/src/components/manage_k8s_worker_dialog.vue
@@ -63,8 +63,7 @@ function calcDiskSize(disks: { size: number }[]) {
 
 async function deploy(layout: any) {
   layout.setStatus("deploy");
-  const grid = await getGrid(profileManager.profile!);
-  console.log(props.data.deploymentName);
+  const grid = await getGrid(profileManager.profile!, props.data.deploymentName);
 
   deployWorker(grid!, {
     ...worker.value,

From 6f5fd38ea39215b62cadc34b5317ce57c17b15d3 Mon Sep 17 00:00:00 2001
From: MohamedElmdary <engm5081@gmail.com>
Date: Sun, 12 Nov 2023 14:59:49 +0200
Subject: [PATCH 44/54] Fix caprover manage worker

---
 .../playground/src/components/manage_caprover_worker_dialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/components/manage_caprover_worker_dialog.vue b/packages/playground/src/components/manage_caprover_worker_dialog.vue
index 44d7bc32a3..b443563494 100644
--- a/packages/playground/src/components/manage_caprover_worker_dialog.vue
+++ b/packages/playground/src/components/manage_caprover_worker_dialog.vue
@@ -113,7 +113,7 @@ async function deploy(layout: any) {
 
   try {
     layout.value?.validateSSH();
-    const grid = await getGrid(profileManager.profile!, ProjectName.Caprover.toLowerCase());
+    const grid = await getGrid(profileManager.profile!, props.master?.projectName);
 
     await layout.validateBalance(grid);
 

From b05a6be6bab52a5b0c8b47b68e463dc81cb63612 Mon Sep 17 00:00:00 2001
From: MohamedElmdary <engm5081@gmail.com>
Date: Mon, 13 Nov 2023 12:23:25 +0200
Subject: [PATCH 45/54] Fix projectName naming

---
 packages/playground/src/utils/migration.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/utils/migration.ts b/packages/playground/src/utils/migration.ts
index 63081f74de..bfa56db133 100644
--- a/packages/playground/src/utils/migration.ts
+++ b/packages/playground/src/utils/migration.ts
@@ -58,7 +58,7 @@ async function _migrateContracts(module: BaseModule, values: any[]) {
       return [];
     }
 
-    oldData.projectName = `${projectName}/${instanceName}`;
+    oldData.projectName = projectName ? `${projectName}/${instanceName}` : instanceName;
     return module.tfClient.contracts.updateNode({
       id: contract.contractId,
       data: JSON.stringify(oldData),

From ad3ad4c192b8683adaed64ab1a1b43771b57613a Mon Sep 17 00:00:00 2001
From: MohamedElmdary <engm5081@gmail.com>
Date: Mon, 13 Nov 2023 13:33:45 +0200
Subject: [PATCH 46/54] Fix issue while listing & Stop removing key if the new
 one override the old one (no projectName provided)

---
 packages/grid_client/src/storage/tfkvstore.ts |  9 +++---
 .../playground/src/utils/load_deployment.ts   | 32 ++++++++-----------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/packages/grid_client/src/storage/tfkvstore.ts b/packages/grid_client/src/storage/tfkvstore.ts
index 13ec26cd38..2c7f3bf300 100644
--- a/packages/grid_client/src/storage/tfkvstore.ts
+++ b/packages/grid_client/src/storage/tfkvstore.ts
@@ -104,10 +104,11 @@ class TFKVStoreBackend implements BackendStorageInterface {
       const key = i === 0 ? fromKey : fromKey + "." + i;
       const value = await this.client.kvStore.get({ key, decrypt: false });
       if (value) {
-        const e = await Promise.all([
-          this.client.kvStore.set({ key: toKey, value, encrypt: false }),
-          this.client.kvStore.delete({ key }),
-        ]);
+        const promises = [this.client.kvStore.set({ key: toKey, value, encrypt: false })];
+        if (fromKey !== toKey) {
+          promises.push(this.client.kvStore.delete({ key }));
+        }
+        const e = await Promise.all(promises);
         exts.push(...e.flat(1));
       } else {
         break;
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index 73651c72be..f8a138d1a4 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -47,21 +47,14 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
   )) as GridClient[];
 
   const promises = machines.map(async (name, index) => {
-    let contracts: any[] = [];
-    try {
-      contracts = await getDeploymentContracts(grids[index], name, projectName);
+    const contracts = await getDeploymentContracts(grids[index], name, projectName).catch(() => []);
+    const nodeIds = await grids[index].machines._getDeploymentNodeIds(name).catch(() => []);
 
-      if (contracts.length === 0) {
-        count--;
-        return;
-      }
-    } catch (e) {
-      console.log(e);
-      failedDeployments.push({ name, nodes: [], contracts: contracts });
+    if (contracts.length === 0) {
+      count--;
       return;
     }
 
-    const nodeIds = await grids[index].machines._getDeploymentNodeIds(name);
     const machinePromise = grids[index].machines.getObj(name);
     const timeoutPromise = new Promise((resolve, reject) => {
       setTimeout(() => {
@@ -156,16 +149,17 @@ export async function loadK8s(grid: GridClient) {
   const failedDeployments: FailedDeployment[] = [];
 
   const promises = clusters.map(async (name, index) => {
-    const contracts = await grids[index].k8s.getDeploymentContracts(name);
-    const nodeIds = await grids[index].k8s._getDeploymentNodeIds(name);
-    const clusterPromise = grids[index].k8s.getObj(name);
-    const timeoutPromise = new Promise((resolve, reject) => {
-      setTimeout(() => {
-        reject(new Error("Timeout"));
-      }, 10000);
-    });
+    const contracts = await grids[index].k8s.getDeploymentContracts(name).catch(() => []);
+    const nodeIds = await grids[index].k8s._getDeploymentNodeIds(name).catch(() => []);
 
     try {
+      const clusterPromise = grids[index].k8s.getObj(name);
+      const timeoutPromise = new Promise((resolve, reject) => {
+        setTimeout(() => {
+          reject(new Error("Timeout"));
+        }, 10000);
+      });
+
       const result = await Promise.race([clusterPromise, timeoutPromise]);
       if (result instanceof Error && result.message === "Timeout") {
         console.log(`%c[Error] Timeout loading deployment with name ${name}`, "color: rgb(207, 102, 121)");

From 024e922b13479dac355c414720d459282dea2c94 Mon Sep 17 00:00:00 2001
From: ahmedhanafy725 <hanafya@incubaid.com>
Date: Mon, 13 Nov 2023 14:46:38 +0200
Subject: [PATCH 47/54] Update relay host name if it's different than the
 configured one

---
 packages/rmb_direct_client/lib/client.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/rmb_direct_client/lib/client.ts b/packages/rmb_direct_client/lib/client.ts
index e9c0065b92..74ab5bef32 100644
--- a/packages/rmb_direct_client/lib/client.ts
+++ b/packages/rmb_direct_client/lib/client.ts
@@ -114,11 +114,10 @@ class Client {
       if (!this.twin) {
         throw new Error({ message: "twin does not exist, please create a twin first" });
       }
+      const relayHostName = this.relayUrl.replace("wss://", "").replace("/", "");
       const pk = generatePublicKey(this.mnemonics);
-      if (this.twin.pk !== pk) {
-        await (
-          await this.tfclient.twins.update({ pk, relay: this.relayUrl.replace("wss://", "").replace("/", "") })
-        ).apply();
+      if (this.twin.pk !== pk || this.twin.relay !== relayHostName) {
+        await (await this.tfclient.twins.update({ pk, relay: relayHostName })).apply();
         this.twin.pk = pk;
       }
 

From 62e82bdc8501b3bd5d07ff6cd8d31b7dfe9b8ec6 Mon Sep 17 00:00:00 2001
From: MohamedElmdary <engm5081@gmail.com>
Date: Mon, 13 Nov 2023 15:05:06 +0200
Subject: [PATCH 48/54] Turn time_out into an env var

---
 packages/playground/public/config.js             | 1 +
 packages/playground/scripts/build-env.sh         | 4 +++-
 packages/playground/src/global-components.d.ts   | 1 +
 packages/playground/src/utils/load_deployment.ts | 4 ++--
 packages/playground/vite.config.ts               | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/playground/public/config.js b/packages/playground/public/config.js
index 536931a52c..cea61619ff 100644
--- a/packages/playground/public/config.js
+++ b/packages/playground/public/config.js
@@ -9,4 +9,5 @@ window.env = {
   STELLAR_NETWORK: "test",
   STELLAR_HORIZON_URL: "https://horizon-testnet.stellar.org",
   TFT_ASSET_ISSUER: "GA47YZA3PKFUZMPLQ3B5F2E3CJIB57TGGU7SPCQT2WAEYKN766PWIMB3",
+  TIME_OUT: +"10000",
 };
diff --git a/packages/playground/scripts/build-env.sh b/packages/playground/scripts/build-env.sh
index c91275e90d..88e3157e4a 100644
--- a/packages/playground/scripts/build-env.sh
+++ b/packages/playground/scripts/build-env.sh
@@ -3,6 +3,7 @@
 # Env vars with default values
 MODE="${MODE:=dev}"
 STELLAR_NETWORK="${STELLAR_NETWORK:=test}"
+TIME_OUT="${TIME_OUT:=10000}"
 
 # Env vars must provide in `custom` mode
 REQUIRED_ENV_VARS=(
@@ -104,7 +105,8 @@ window.env = {
   BRIDGE_TFT_ADDRESS: '$BRIDGE_TFT_ADDRESS',
   STELLAR_NETWORK: '$STELLAR_NETWORK',
   STELLAR_HORIZON_URL: '$STELLAR_HORIZON_URL',
-  TFT_ASSET_ISSUER: '$TFT_ASSET_ISSUER'
+  TFT_ASSET_ISSUER: '$TFT_ASSET_ISSUER',
+  TIME_OUT: +'$TIME_OUT'
 };
 "
 
diff --git a/packages/playground/src/global-components.d.ts b/packages/playground/src/global-components.d.ts
index 18a3eebec2..b82c605af8 100644
--- a/packages/playground/src/global-components.d.ts
+++ b/packages/playground/src/global-components.d.ts
@@ -40,6 +40,7 @@ declare global {
       STELLAR_NETWORK: string;
       STELLAR_HORIZON_URL: string;
       TFT_ASSET_ISSUER: string;
+      TIME_OUT: number;
     };
   }
 }
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index f8a138d1a4..29420e5b29 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -59,7 +59,7 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
     const timeoutPromise = new Promise((resolve, reject) => {
       setTimeout(() => {
         reject(new Error("Timeout"));
-      }, 10000);
+      }, window.env.TIME_OUT);
     });
 
     try {
@@ -157,7 +157,7 @@ export async function loadK8s(grid: GridClient) {
       const timeoutPromise = new Promise((resolve, reject) => {
         setTimeout(() => {
           reject(new Error("Timeout"));
-        }, 10000);
+        }, window.env.TIME_OUT);
       });
 
       const result = await Promise.race([clusterPromise, timeoutPromise]);
diff --git a/packages/playground/vite.config.ts b/packages/playground/vite.config.ts
index ee1efb39c6..34d5fe19d5 100644
--- a/packages/playground/vite.config.ts
+++ b/packages/playground/vite.config.ts
@@ -19,6 +19,7 @@ export default defineConfig({
   define: {
     "process.env": {
       NETWORK: process.env.NETWORK,
+      TIME_OUT: 10000,
       VERSION: process.env.VERSION || "No version to show",
       INTERNAL_SOLUTION_PROVIDER_ID: process.env.INTERNAL_SOLUTION_PROVIDER_ID || 1,
     },

From 379b9ff8f081e30631dacbdc3dc74fd734a41ade Mon Sep 17 00:00:00 2001
From: MohamedElmdary <engm5081@gmail.com>
Date: Mon, 13 Nov 2023 15:15:03 +0200
Subject: [PATCH 49/54] change variable name to timeout

---
 packages/playground/public/config.js             | 2 +-
 packages/playground/scripts/build-env.sh         | 4 ++--
 packages/playground/src/global-components.d.ts   | 2 +-
 packages/playground/src/utils/load_deployment.ts | 4 ++--
 packages/playground/vite.config.ts               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/playground/public/config.js b/packages/playground/public/config.js
index cea61619ff..4db8d4be40 100644
--- a/packages/playground/public/config.js
+++ b/packages/playground/public/config.js
@@ -9,5 +9,5 @@ window.env = {
   STELLAR_NETWORK: "test",
   STELLAR_HORIZON_URL: "https://horizon-testnet.stellar.org",
   TFT_ASSET_ISSUER: "GA47YZA3PKFUZMPLQ3B5F2E3CJIB57TGGU7SPCQT2WAEYKN766PWIMB3",
-  TIME_OUT: +"10000",
+  TIMEOUT: +"10000",
 };
diff --git a/packages/playground/scripts/build-env.sh b/packages/playground/scripts/build-env.sh
index 88e3157e4a..4d5125ee23 100644
--- a/packages/playground/scripts/build-env.sh
+++ b/packages/playground/scripts/build-env.sh
@@ -3,7 +3,7 @@
 # Env vars with default values
 MODE="${MODE:=dev}"
 STELLAR_NETWORK="${STELLAR_NETWORK:=test}"
-TIME_OUT="${TIME_OUT:=10000}"
+TIMEOUT="${TIMEOUT:=10000}"
 
 # Env vars must provide in `custom` mode
 REQUIRED_ENV_VARS=(
@@ -106,7 +106,7 @@ window.env = {
   STELLAR_NETWORK: '$STELLAR_NETWORK',
   STELLAR_HORIZON_URL: '$STELLAR_HORIZON_URL',
   TFT_ASSET_ISSUER: '$TFT_ASSET_ISSUER',
-  TIME_OUT: +'$TIME_OUT'
+  TIMEOUT: +'$TIMEOUT'
 };
 "
 
diff --git a/packages/playground/src/global-components.d.ts b/packages/playground/src/global-components.d.ts
index b82c605af8..32543d4d44 100644
--- a/packages/playground/src/global-components.d.ts
+++ b/packages/playground/src/global-components.d.ts
@@ -40,7 +40,7 @@ declare global {
       STELLAR_NETWORK: string;
       STELLAR_HORIZON_URL: string;
       TFT_ASSET_ISSUER: string;
-      TIME_OUT: number;
+      TIMEOUT: number;
     };
   }
 }
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index 29420e5b29..8739644058 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -59,7 +59,7 @@ export async function loadVms(grid: GridClient, options: LoadVMsOptions = {}) {
     const timeoutPromise = new Promise((resolve, reject) => {
       setTimeout(() => {
         reject(new Error("Timeout"));
-      }, window.env.TIME_OUT);
+      }, window.env.TIMEOUT);
     });
 
     try {
@@ -157,7 +157,7 @@ export async function loadK8s(grid: GridClient) {
       const timeoutPromise = new Promise((resolve, reject) => {
         setTimeout(() => {
           reject(new Error("Timeout"));
-        }, window.env.TIME_OUT);
+        }, window.env.TIMEOUT);
       });
 
       const result = await Promise.race([clusterPromise, timeoutPromise]);
diff --git a/packages/playground/vite.config.ts b/packages/playground/vite.config.ts
index 34d5fe19d5..50aca36b34 100644
--- a/packages/playground/vite.config.ts
+++ b/packages/playground/vite.config.ts
@@ -19,7 +19,7 @@ export default defineConfig({
   define: {
     "process.env": {
       NETWORK: process.env.NETWORK,
-      TIME_OUT: 10000,
+      TIMEOUT: 10000,
       VERSION: process.env.VERSION || "No version to show",
       INTERNAL_SOLUTION_PROVIDER_ID: process.env.INTERNAL_SOLUTION_PROVIDER_ID || 1,
     },

From 1268b7418690a8e21623b2b0b86c4b9db5a136c1 Mon Sep 17 00:00:00 2001
From: mohamedamer453 <amerm@incubaid.com>
Date: Mon, 13 Nov 2023 16:27:58 +0200
Subject: [PATCH 50/54] update tag and version for charts

---
 packages/dashboard/charts/tfgrid-dashboard/Chart.yaml  | 2 +-
 packages/dashboard/charts/tfgrid-dashboard/values.yaml | 2 +-
 packages/playground/playground-charts/Chart.yaml       | 2 +-
 packages/playground/playground-charts/values.yaml      | 2 +-
 packages/stats/chart/Chart.yaml                        | 2 +-
 packages/stats/chart/values.yaml                       | 2 +-
 packages/weblets/weblets-chart/Chart.yaml              | 2 +-
 packages/weblets/weblets-chart/values.yaml             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
index 615038c456..d663e153f0 100644
--- a/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
+++ b/packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.6
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc3"
+appVersion: "v2.2.0-rc4"
diff --git a/packages/dashboard/charts/tfgrid-dashboard/values.yaml b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
index ae3251107d..ea7635d3d0 100644
--- a/packages/dashboard/charts/tfgrid-dashboard/values.yaml
+++ b/packages/dashboard/charts/tfgrid-dashboard/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/threefoldtech/dashboard
   pullPolicy: Always
-  tag: "2.2.0-rc3"
+  tag: "2.2.0-rc4"
 
   env:
     - name: "STELLAR_NETWORK"
diff --git a/packages/playground/playground-charts/Chart.yaml b/packages/playground/playground-charts/Chart.yaml
index 8f05ed5e71..b7a62041f7 100644
--- a/packages/playground/playground-charts/Chart.yaml
+++ b/packages/playground/playground-charts/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc3"
+appVersion: "v2.2.0-rc4"
diff --git a/packages/playground/playground-charts/values.yaml b/packages/playground/playground-charts/values.yaml
index e293c271d3..ce0fed7c0e 100644
--- a/packages/playground/playground-charts/values.yaml
+++ b/packages/playground/playground-charts/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/playground
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc3"
+  tag: "2.2.0-rc4"
   
   env:
     - name: "MODE"
diff --git a/packages/stats/chart/Chart.yaml b/packages/stats/chart/Chart.yaml
index 4791ebfe52..a13c225148 100644
--- a/packages/stats/chart/Chart.yaml
+++ b/packages/stats/chart/Chart.yaml
@@ -21,4 +21,4 @@ version: 1.0.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc3"
+appVersion: "v2.2.0-rc4"
diff --git a/packages/stats/chart/values.yaml b/packages/stats/chart/values.yaml
index 8f7314a1ca..fbf2468a4f 100644
--- a/packages/stats/chart/values.yaml
+++ b/packages/stats/chart/values.yaml
@@ -4,7 +4,7 @@ image:
   repository: ghcr.io/threefoldtech/stats
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc3"
+  tag: "2.2.0-rc4"
 
 imagePullSecrets: []
 nameOverride: ""
diff --git a/packages/weblets/weblets-chart/Chart.yaml b/packages/weblets/weblets-chart/Chart.yaml
index d056baf937..2dbc1af918 100644
--- a/packages/weblets/weblets-chart/Chart.yaml
+++ b/packages/weblets/weblets-chart/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.2.0-rc3"
+appVersion: "v2.2.0-rc4"
diff --git a/packages/weblets/weblets-chart/values.yaml b/packages/weblets/weblets-chart/values.yaml
index e52d0eaa46..b7f63f48b2 100644
--- a/packages/weblets/weblets-chart/values.yaml
+++ b/packages/weblets/weblets-chart/values.yaml
@@ -8,7 +8,7 @@ image:
   repository: ghcr.io/threefoldtech/weblets
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "2.2.0-rc3"
+  tag: "2.2.0-rc4"
   
   env:
     - name: "MODE"

From 5acddccc370ee4459d6f097dd695c05ba65a73cd Mon Sep 17 00:00:00 2001
From: mohamedamer453 <amerm@incubaid.com>
Date: Mon, 13 Nov 2023 16:43:01 +0200
Subject: [PATCH 51/54] v2.2.0-rc4

---
 lerna.json                              | 2 +-
 packages/UI/package.json                | 2 +-
 packages/dashboard/package.json         | 6 +++---
 packages/grid_client/package.json       | 6 +++---
 packages/grid_http_server/package.json  | 4 ++--
 packages/grid_rmb_server/package.json   | 8 ++++----
 packages/playground/package.json        | 4 ++--
 packages/rmb_direct_client/package.json | 4 ++--
 packages/rmb_peer_client/package.json   | 2 +-
 packages/rmb_peer_server/package.json   | 2 +-
 packages/stats/package.json             | 2 +-
 packages/tfchain_client/package.json    | 2 +-
 packages/weblets/package.json           | 4 ++--
 13 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lerna.json b/lerna.json
index ea6a792623..c06043202f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "npmClient": "yarn"
 }
diff --git a/packages/UI/package.json b/packages/UI/package.json
index 508d973198..af34a470fb 100644
--- a/packages/UI/package.json
+++ b/packages/UI/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/ui",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "private": true,
   "scripts": {
     "dev": "vite",
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index 8a0d4d8757..3ae96f3827 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/dashboard",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -19,8 +19,8 @@
     "@polkadot/extension-dapp": "0.45.1",
     "@polkadot/ui-keyring": "^2.2.1",
     "@popperjs/core": "^2.11.5",
-    "@threefold/grid_client": "^2.2.0-rc3",
-    "@threefold/tfchain_client": "^2.2.0-rc3",
+    "@threefold/grid_client": "^2.2.0-rc4",
+    "@threefold/tfchain_client": "^2.2.0-rc4",
     "@types/ip": "^1.1.0",
     "@types/md5": "^2.3.2",
     "apollo-cache-inmemory": "^1.6.6",
diff --git a/packages/grid_client/package.json b/packages/grid_client/package.json
index a79296ec09..bb5c213eab 100644
--- a/packages/grid_client/package.json
+++ b/packages/grid_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_client",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md",
   "repository": {
@@ -14,8 +14,8 @@
   "dependencies": {
     "@jimber/pkid": "1.0.4",
     "@noble/secp256k1": "^1.7.1",
-    "@threefold/rmb_direct_client": "^2.2.0-rc3",
-    "@threefold/tfchain_client": "^2.2.0-rc3",
+    "@threefold/rmb_direct_client": "^2.2.0-rc4",
+    "@threefold/tfchain_client": "^2.2.0-rc4",
     "algosdk": "^1.19.0",
     "appdata-path": "^1.0.0",
     "axios": "^0.27.2",
diff --git a/packages/grid_http_server/package.json b/packages/grid_http_server/package.json
index 3bdc584bea..96f4c278a3 100644
--- a/packages/grid_http_server/package.json
+++ b/packages/grid_http_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_http_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_http_server/README.md",
   "repository": {
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.2.0-rc3",
+    "@threefold/grid_client": "^2.2.0-rc4",
     "express": "^4.18.1",
     "http-server": "^14.1.1",
     "typescript": "^4.7.4"
diff --git a/packages/grid_rmb_server/package.json b/packages/grid_rmb_server/package.json
index 2b1e6eec11..dfc480c0a7 100644
--- a/packages/grid_rmb_server/package.json
+++ b/packages/grid_rmb_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_rmb_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_rmb_server/README.md",
   "repository": {
@@ -12,12 +12,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/grid_client": "^2.2.0-rc3",
-    "@threefold/rmb_peer_server": "^2.2.0-rc3",
+    "@threefold/grid_client": "^2.2.0-rc4",
+    "@threefold/rmb_peer_server": "^2.2.0-rc4",
     "typescript": "^4.7.4"
   },
   "devDependencies": {
-    "@threefold/rmb_peer_client": "^2.2.0-rc3",
+    "@threefold/rmb_peer_client": "^2.2.0-rc4",
     "ts-node": "^10.9.1"
   },
   "main": "./dist/index.js",
diff --git a/packages/playground/package.json b/packages/playground/package.json
index 020d321f7f..3039937a6c 100644
--- a/packages/playground/package.json
+++ b/packages/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/playground",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@mdi/font": "^7.2.96",
-    "@threefold/grid_client": "^2.2.0-rc3",
+    "@threefold/grid_client": "^2.2.0-rc4",
     "@threefold/gridproxy_client": "^2.1.1-rc1",
     "bip39": "^3.1.0",
     "cryptr": "^6.2.0",
diff --git a/packages/rmb_direct_client/package.json b/packages/rmb_direct_client/package.json
index 202b57cd22..a195815c9c 100644
--- a/packages/rmb_direct_client/package.json
+++ b/packages/rmb_direct_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/rmb_direct_client",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "repository": {
     "type": "git",
     "url": "https://github.com/threefoldtech/tfgrid-sdk-ts.git"
@@ -23,7 +23,7 @@
   "dependencies": {
     "@noble/secp256k1": "^1.7.1",
     "@polkadot/api": "^8.9.1",
-    "@threefold/tfchain_client": "^2.2.0-rc3",
+    "@threefold/tfchain_client": "^2.2.0-rc4",
     "base64url": "^3.0.1",
     "bip39": "^3.1.0",
     "buffer": "^6.0.3",
diff --git a/packages/rmb_peer_client/package.json b/packages/rmb_peer_client/package.json
index 5bc2bd7123..d7ff139dcf 100644
--- a/packages/rmb_peer_client/package.json
+++ b/packages/rmb_peer_client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_client",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_client/README.md",
   "repository": {
diff --git a/packages/rmb_peer_server/package.json b/packages/rmb_peer_server/package.json
index 16e9976306..5dab0c74f3 100644
--- a/packages/rmb_peer_server/package.json
+++ b/packages/rmb_peer_server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@threefold/rmb_peer_server",
   "author": "Ahmed Hanafy",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_server/README.md",
   "repository": {
diff --git a/packages/stats/package.json b/packages/stats/package.json
index 8c5a83f5cc..8f52af194c 100644
--- a/packages/stats/package.json
+++ b/packages/stats/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/stats",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "private": true,
   "scripts": {
     "build": "rollup -c",
diff --git a/packages/tfchain_client/package.json b/packages/tfchain_client/package.json
index 8383c4fe3b..3f2e9094f9 100644
--- a/packages/tfchain_client/package.json
+++ b/packages/tfchain_client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/tfchain_client",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "description": "A client for TF chain",
   "private": false,
   "publishConfig": {
diff --git a/packages/weblets/package.json b/packages/weblets/package.json
index c0fe150d42..f8a9f98189 100644
--- a/packages/weblets/package.json
+++ b/packages/weblets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@threefold/weblets",
-  "version": "2.2.0-rc3",
+  "version": "2.2.0-rc4",
   "private": true,
   "scripts": {
     "rollup-build": "rollup -c",
@@ -71,7 +71,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@threefold/grid_client": "^2.2.0-rc3",
+    "@threefold/grid_client": "^2.2.0-rc4",
     "add": "^2.0.6",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",

From 9f5843de0bd9acb204075ad096729167c185220c Mon Sep 17 00:00:00 2001
From: mohamedamer453 <amerm@incubaid.com>
Date: Mon, 13 Nov 2023 16:51:07 +0200
Subject: [PATCH 52/54] update weblets version

---
 packages/weblets/playground/package.json |  2 +-
 packages/weblets/playground/yarn.lock    | 30 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/weblets/playground/package.json b/packages/weblets/playground/package.json
index f7fd454548..ceda80ef39 100644
--- a/packages/weblets/playground/package.json
+++ b/packages/weblets/playground/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@open-wc/webpack-import-meta-loader": "^0.4.7",
-    "@threefold/grid_client": "2.2.0-rc3",
+    "@threefold/grid_client": "2.2.0-rc4",
     "axios": "^0.24.0",
     "bip39": "^3.0.4",
     "buffer": "^6.0.3",
diff --git a/packages/weblets/playground/yarn.lock b/packages/weblets/playground/yarn.lock
index 78feb61ee4..ee3603f9b4 100644
--- a/packages/weblets/playground/yarn.lock
+++ b/packages/weblets/playground/yarn.lock
@@ -1529,15 +1529,15 @@
   resolved "https://registry.yarnpkg.com/@substrate/ss58-registry/-/ss58-registry-1.43.0.tgz#93108e45cb7ef6d82560c153e3692c2aa1c711b3"
   integrity sha512-USEkXA46P9sqClL7PZv0QFsit4S8Im97wchKG0/H/9q3AT/S76r40UHfCr4Un7eBJPE23f7fU9BZ0ITpP9MCsA==
 
-"@threefold/grid_client@2.2.0-rc3":
-  version "2.2.0-rc3"
-  resolved "https://registry.yarnpkg.com/@threefold/grid_client/-/grid_client-2.2.0-rc3.tgz#cb8360a225a4233ac24a29aaad39ca27e3fd933c"
-  integrity sha512-RiKXpMcDLrN9pUQs++g4Tr9zyeAf0wMNP0E6mHydPJz7vXo7dp3vciebS4XmmbIZhpPgGOAiASOxabcgLQE0sg==
+"@threefold/grid_client@2.2.0-rc4":
+  version "2.2.0-rc4"
+  resolved "https://registry.yarnpkg.com/@threefold/grid_client/-/grid_client-2.2.0-rc4.tgz#1a01a112d00b33f9a0c490e1079dc49450e5b443"
+  integrity sha512-X1aFQMGiKFpD7xZdSudzwlJfUn2co9T878QuoLNqVa34JJdVnlhJcuDJLDq5/mOW+nVrn8/Kn1aDpvbVxQQoTA==
   dependencies:
     "@jimber/pkid" "1.0.4"
     "@noble/secp256k1" "^1.7.1"
-    "@threefold/rmb_direct_client" "^2.2.0-rc3"
-    "@threefold/tfchain_client" "^2.2.0-rc3"
+    "@threefold/rmb_direct_client" "^2.2.0-rc4"
+    "@threefold/tfchain_client" "^2.2.0-rc4"
     algosdk "^1.19.0"
     appdata-path "^1.0.0"
     axios "^0.27.2"
@@ -1559,14 +1559,14 @@
     url-parse "^1.5.10"
     uuid4 "^2.0.2"
 
-"@threefold/rmb_direct_client@^2.2.0-rc3":
-  version "2.2.0-rc3"
-  resolved "https://registry.yarnpkg.com/@threefold/rmb_direct_client/-/rmb_direct_client-2.2.0-rc3.tgz#2b0f19786ee4f511a158559af85caef9f2fe7a2b"
-  integrity sha512-z5O++ixb8GKRfP1hYcpPXqX/XLE6L7kPzS9HOGG2o2jPWk5+88ZKDSRn9X4uB0EzBGY3ZWNFkAhHEnhUW8K/Dw==
+"@threefold/rmb_direct_client@^2.2.0-rc4":
+  version "2.2.0-rc4"
+  resolved "https://registry.yarnpkg.com/@threefold/rmb_direct_client/-/rmb_direct_client-2.2.0-rc4.tgz#c21082bc9df3d2a0a60097893ddc8c872526904c"
+  integrity sha512-lyEthOZ6cxfy3ebJsAG6bx0M8Ywetnvyh8pmDXWNOzuv3zZfMvTd1IXbw5U+TtFOF1W9Z4OFCbr+xkbxyH7zlQ==
   dependencies:
     "@noble/secp256k1" "^1.7.1"
     "@polkadot/api" "^8.9.1"
-    "@threefold/tfchain_client" "^2.2.0-rc3"
+    "@threefold/tfchain_client" "^2.2.0-rc4"
     base64url "^3.0.1"
     bip39 "^3.1.0"
     buffer "^6.0.3"
@@ -1576,10 +1576,10 @@
     uuid "^8.3.2"
     ws "^8.12.0"
 
-"@threefold/tfchain_client@^2.2.0-rc3":
-  version "2.2.0-rc3"
-  resolved "https://registry.yarnpkg.com/@threefold/tfchain_client/-/tfchain_client-2.2.0-rc3.tgz#02055f6d3f8189fb2f83e59eb4d9e620c062c4f0"
-  integrity sha512-BdQkFNVgO90Q1caGnRR8pngH4DbFWSlWbz646rrScxMmD5WJpbiTQ8qoK2wGzskXhyTfLsCh2Q4zhMl4cd2K3Q==
+"@threefold/tfchain_client@^2.2.0-rc4":
+  version "2.2.0-rc4"
+  resolved "https://registry.yarnpkg.com/@threefold/tfchain_client/-/tfchain_client-2.2.0-rc4.tgz#1eeebf6f6c3b5e70f02f37357e322a274c9fa1e9"
+  integrity sha512-5y649tNlGCASMivyOwN3qESXfKqYPZH/KcKhe6y/UvqZrx1WCEM63nKgSwOuMDuSKVHg0VUbvn8QulMd5bYFgw==
   dependencies:
     "@polkadot/api" "^8.9.1"
     await-lock "^2.2.2"

From 8fdbafed5c4cc81b524feea2123dc81e30eac447 Mon Sep 17 00:00:00 2001
From: MohamedElmdary <engm5081@gmail.com>
Date: Tue, 14 Nov 2023 12:09:21 +0200
Subject: [PATCH 53/54] Fix metadata error

---
 packages/playground/src/utils/grid.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/src/utils/grid.ts b/packages/playground/src/utils/grid.ts
index d900f41383..021bbaa901 100644
--- a/packages/playground/src/utils/grid.ts
+++ b/packages/playground/src/utils/grid.ts
@@ -79,8 +79,8 @@ export async function loadProfile(grid: GridClient): Promise<Profile> {
 }
 
 export async function getMetadata(grid: GridClient): Promise<{ [key: string]: any }> {
-  const metadata = await grid.kvstore.get({ key: "metadata" });
   try {
+    const metadata = await grid.kvstore.get({ key: "metadata" });
     return JSON.parse(metadata);
   } catch {
     return {};

From 704e339146c90253c9d582fb4ebd70bcb903e054 Mon Sep 17 00:00:00 2001
From: Mohamed Rabie <31689104+MohamedElmdary@users.noreply.github.com>
Date: Thu, 16 Nov 2023 09:55:01 +0200
Subject: [PATCH 54/54] Fix projectName in deleting workers for k8s/caprover
 (#1416)

---
 .../src/components/manage_caprover_worker_dialog.vue       | 7 +++----
 .../playground/src/components/manage_k8s_worker_dialog.vue | 4 ++--
 packages/playground/src/utils/deploy_k8s.ts                | 7 +++++--
 packages/playground/src/utils/deploy_vm.ts                 | 5 +++--
 packages/playground/src/utils/load_deployment.ts           | 4 +---
 packages/playground/src/weblets/tf_deployment_list.vue     | 1 +
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/playground/src/components/manage_caprover_worker_dialog.vue b/packages/playground/src/components/manage_caprover_worker_dialog.vue
index b443563494..b8a911eaf7 100644
--- a/packages/playground/src/components/manage_caprover_worker_dialog.vue
+++ b/packages/playground/src/components/manage_caprover_worker_dialog.vue
@@ -81,12 +81,11 @@
 import { ref } from "vue";
 
 import { useProfileManager } from "../stores";
-import { ProjectName } from "../types";
 import { addMachine, deleteMachine, loadVM } from "../utils/deploy_vm";
 import { getGrid } from "../utils/grid";
 import rootFs from "../utils/root_fs";
 
-const props = defineProps<{ master: any; data: any[] }>();
+const props = defineProps<{ master: any; data: any[]; projectName: string }>();
 const emits = defineEmits<{ (event: "close"): void; (event: "update:caprover", data: any): void }>();
 
 const profileManager = useProfileManager();
@@ -113,7 +112,7 @@ async function deploy(layout: any) {
 
   try {
     layout.value?.validateSSH();
-    const grid = await getGrid(profileManager.profile!, props.master?.projectName);
+    const grid = await getGrid(profileManager.profile!, props.projectName);
 
     await layout.validateBalance(grid);
 
@@ -153,7 +152,7 @@ async function deploy(layout: any) {
 
 async function onDelete(cb: (workers: any[]) => void) {
   deleting.value = true;
-  const grid = await getGrid(profileManager.profile!, ProjectName.Caprover.toLowerCase());
+  const grid = await getGrid(profileManager.profile!, props.projectName);
   for (const worker of selectedWorkers.value) {
     console.log(props.master.name, worker.name);
 
diff --git a/packages/playground/src/components/manage_k8s_worker_dialog.vue b/packages/playground/src/components/manage_k8s_worker_dialog.vue
index 81fcc40eea..fa9cacd45e 100644
--- a/packages/playground/src/components/manage_k8s_worker_dialog.vue
+++ b/packages/playground/src/components/manage_k8s_worker_dialog.vue
@@ -63,7 +63,7 @@ function calcDiskSize(disks: { size: number }[]) {
 
 async function deploy(layout: any) {
   layout.setStatus("deploy");
-  const grid = await getGrid(profileManager.profile!, props.data.deploymentName);
+  const grid = await getGrid(profileManager.profile!, props.data.projectName);
 
   deployWorker(grid!, {
     ...worker.value,
@@ -82,7 +82,7 @@ async function deploy(layout: any) {
 
 async function onDelete(cb: (workers: any[]) => void) {
   deleting.value = true;
-  const grid = await getGrid(profileManager.profile!);
+  const grid = await getGrid(profileManager.profile!, props.data.projectName);
 
   for (const worker of selectedWorkers.value) {
     try {
diff --git a/packages/playground/src/utils/deploy_k8s.ts b/packages/playground/src/utils/deploy_k8s.ts
index 25e19b6d93..dc14628d53 100644
--- a/packages/playground/src/utils/deploy_k8s.ts
+++ b/packages/playground/src/utils/deploy_k8s.ts
@@ -33,8 +33,11 @@ export async function deployK8s(grid: GridClient, options: DeployK8SOptions) {
   return data;
 }
 
-export function loadK8S(grid: GridClient, name: string) {
-  return grid.k8s.getObj(name);
+export async function loadK8S(grid: GridClient, name: string) {
+  const k8s = grid.k8s.getObj(name);
+  (k8s as any).deploymentName = name;
+  (k8s as any).projectName = grid.clientOptions.projectName;
+  return k8s;
 }
 
 async function createWorker(data: K8SWorker) {
diff --git a/packages/playground/src/utils/deploy_vm.ts b/packages/playground/src/utils/deploy_vm.ts
index 57cdeadcb3..a92d5eda1d 100644
--- a/packages/playground/src/utils/deploy_vm.ts
+++ b/packages/playground/src/utils/deploy_vm.ts
@@ -19,7 +19,7 @@ export async function deployVM(grid: GridClient, options: DeployVMOptions) {
   vms.name = options.name;
   await grid.machines.getObj(vms.name); //invalidating the cashed keys
   vms.network = createNetwork(options.network);
-  vms.machines = await Promise.all(options.machines.map(machine => createMachine(grid, machine)));
+  vms.machines = await Promise.all(options.machines.map(createMachine));
   vms.metadata = options.metadata;
   vms.description = options.description;
   await grid.machines.deploy(vms);
@@ -29,12 +29,13 @@ export async function deployVM(grid: GridClient, options: DeployVMOptions) {
 export async function loadVM(grid: GridClient, name: string) {
   const vm = (await grid.machines.getObj(name)) as any;
   vm.deploymentName = name;
+  vm.projectName = grid.clientOptions.projectName;
   const wireguard = await getWireguardConfig(grid, vm[0].interfaces[0].network).catch(() => []);
   vm.wireguard = wireguard[0];
   return vm;
 }
 
-async function createMachine(grid: GridClient, machine: Machine): Promise<MachineModel> {
+async function createMachine(machine: Machine): Promise<MachineModel> {
   const vm = new MachineModel();
   vm.name = machine.name;
   vm.node_id = machine.nodeId!;
diff --git a/packages/playground/src/utils/load_deployment.ts b/packages/playground/src/utils/load_deployment.ts
index 8739644058..db9ee12b4c 100644
--- a/packages/playground/src/utils/load_deployment.ts
+++ b/packages/playground/src/utils/load_deployment.ts
@@ -1,7 +1,5 @@
 import type { GridClient } from "@threefold/grid_client";
 
-import { ProjectName } from "@/types";
-
 import { formatConsumption } from "./contracts";
 import { getGrid, updateGrid } from "./grid";
 import { normalizeError } from "./helpers";
@@ -136,7 +134,7 @@ export function getWireguardConfig(grid: GridClient, name: string) {
     .finally(() => updateGrid(grid, { projectName }));
 }
 
-export type K8S = { masters: any[]; workers: any[]; deploymentName: string; wireguard?: any };
+export type K8S = { masters: any[]; workers: any[]; deploymentName: string; projectName: string; wireguard?: any };
 export async function loadK8s(grid: GridClient) {
   await migrateModule(grid.k8s);
 
diff --git a/packages/playground/src/weblets/tf_deployment_list.vue b/packages/playground/src/weblets/tf_deployment_list.vue
index a63846bc0b..4c2f124f48 100644
--- a/packages/playground/src/weblets/tf_deployment_list.vue
+++ b/packages/playground/src/weblets/tf_deployment_list.vue
@@ -69,6 +69,7 @@
             v-if="dialog === item.value.deploymentName"
             :master="item.value[0]"
             :data="item.value.slice(1)"
+            :project-name="item.value.projectName || item.value[0].projectName"
             @close="dialog = undefined"
             @update:caprover="item.value = $event"
           />