Add volume workload

.github/workflows/mass_deployments.yml

@@ -54,3 +54,11 @@ jobs:
         if: |
           steps.massdeployments.outcome != 'success'
         run: exit 1
+
+      - name: Send Telegram Notification
+        env:
+          TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
+          TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+        run: |
+          MESSAGE="Deployment Summary:\\nSuccessful Deployments: ${{ steps.massdeployments.outputs.success_count }}\\nFailed Deployments: ${{ steps.massdeployments.outputs.failed_count }}\\nErrors: ${{ steps.massdeployments.outputs.errors }}"
+          curl -X POST "https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}/sendMessage" -d "chat_id=${TELEGRAM_CHAT_ID}&text=${MESSAGE}&parse_mode=Markdown"

lerna.json

@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.3.3",
+  "version": "2.4.0-rc1",
   "npmClient": "yarn"
 }

packages/UI/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threefold/ui",
-  "version": "2.3.3",
+  "version": "2.4.0-rc1",
   "private": false,
   "main": "dist/threefold-ui.umd.js",
   "publishConfig": {

packages/graphql_client/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@threefold/graphql_client",
-  "version": "2.3.3",
+  "version": "2.4.0-rc1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
   "scripts": {
     "build": "tsc"
   },
   "dependencies": {
-    "@threefold/types": "^2.3.3",
+    "@threefold/types": "^2.4.0-rc1",
     "ts-mixer": "^6.0.2"
   },
   "devDependencies": {

packages/grid_client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_client",
   "author": "Ahmed Hanafy",
-  "version": "2.3.3",
+  "version": "2.4.0-rc1",
   "license": "ISC",
   "homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md",
   "repository": {
@@ -14,9 +14,9 @@
   "dependencies": {
     "@jimber/pkid": "1.0.4",
     "@noble/secp256k1": "^1.7.1",
-    "@threefold/rmb_direct_client": "^2.3.3",
-    "@threefold/tfchain_client": "^2.3.3",
-    "@threefold/types": "^2.3.3",
+    "@threefold/rmb_direct_client": "^2.4.0-rc1",
+    "@threefold/tfchain_client": "^2.4.0-rc1",
+    "@threefold/types": "^2.4.0-rc1",
     "algosdk": "^1.19.0",
     "appdata-path": "^1.0.0",
     "await-lock": "^2.2.2",

packages/grid_client/src/clients/tf-grid/balances.ts

@@ -19,7 +19,7 @@ class TFBalances extends Balances {
   }
 
   async getMoreFunds() {
-    if (this.client.url !== "wss://tfchain.dev.grid.tf/ws" && this.client.url !== "wss://tfchain.qa.grid.tf/ws") {
+    if (!this.client.url.includes("qa") && !this.client.url.includes("dev")) {
       throw new GridClientError("Unable to get more TFTs.");
     }
     await this.client.connect();

packages/grid_client/src/high_level/base.ts

@@ -28,6 +28,7 @@ class HighLevelBase {
       WorkloadTypes.ipv4, // TODO: remove deprecated
       WorkloadTypes.zmachine,
       WorkloadTypes.zmount,
+      WorkloadTypes.volume,
       WorkloadTypes.zdb,
       WorkloadTypes.qsfs,
       WorkloadTypes.gatewayfqdnproxy,
@@ -172,6 +173,7 @@ class HighLevelBase {
       WorkloadTypes.ipv4, // TODO: remove deprecated
       WorkloadTypes.zmachine,
       WorkloadTypes.zmount,
+      WorkloadTypes.volume,
       WorkloadTypes.zdb,
       WorkloadTypes.qsfs,
       WorkloadTypes.gatewayfqdnproxy,

packages/grid_client/src/high_level/kubernetes.ts

@@ -168,6 +168,7 @@ class KubernetesHL extends HighLevelBase {
     return await this._delete(deployment, names, [
       WorkloadTypes.zmachine,
       WorkloadTypes.zmount,
+      WorkloadTypes.volume,
       WorkloadTypes.ip,
       WorkloadTypes.ipv4,
       WorkloadTypes.zlogs,

packages/grid_client/src/high_level/machine.ts

@@ -401,6 +401,7 @@ class VMHL extends HighLevelBase {
       WorkloadTypes.ip,
       WorkloadTypes.ipv4, // TODO: remove deprecated
       WorkloadTypes.zmount,
+      WorkloadTypes.volume,
       WorkloadTypes.zmachine,
       WorkloadTypes.qsfs,
       WorkloadTypes.zlogs,

packages/grid_client/src/high_level/twinDeploymentHandler.ts

@@ -358,7 +358,7 @@ class TwinDeploymentHandler {
         rootfsDisks.push(workload.data["size"]);
         sru += workload.data["size"];
       }
-      if (workload.type == WorkloadTypes.zmount) {
+      if (workload.type == WorkloadTypes.zmount || workload.type == WorkloadTypes.volume) {
         ssdDisks.push(workload.data["size"]);
         sru += workload.data["size"];
       }

packages/grid_client/src/modules/base.ts

@@ -16,12 +16,12 @@ import { DeploymentFactory } from "../primitives/deployment";
 import { Network } from "../primitives/network";
 import { Nodes } from "../primitives/nodes";
 import { BackendStorage, BackendStorageType } from "../storage/backend";
+import { Volume } from "../zos";
 import { Deployment } from "../zos/deployment";
 import { PublicIPResult } from "../zos/public_ip";
 import { QuantumSafeFS, QuantumSafeFSResult } from "../zos/qsfs";
 import { Workload, WorkloadTypes } from "../zos/workload";
 import { Zmachine, ZmachineResult } from "../zos/zmachine";
-import { Zmount } from "../zos/zmount";
 import { ContractStates } from "./models";
 
 const modulesNames = {
@@ -335,9 +335,12 @@ class BaseModule {
     for (const deployment of deployments) {
       if (deployment.contract_id !== contractId) continue;
       for (const workload of deployment.workloads) {
-        if (workload.type === WorkloadTypes.zmount && workload.name === name) {
+        if (
+          (workload.type === WorkloadTypes.zmount || workload.type === WorkloadTypes.volume) &&
+          workload.name === name
+        ) {
           return {
-            size: (workload.data as Zmount).size,
+            size: (workload.data as Volume).size,
             state: workload.result.state,
             message: workload.result.message,
           };

packages/grid_client/src/modules/k8s.ts

@@ -18,6 +18,7 @@ class K8sModule extends BaseModule {
   workloadTypes = [
     WorkloadTypes.zmachine,
     WorkloadTypes.zmount,
+    WorkloadTypes.volume,
     WorkloadTypes.qsfs,
     WorkloadTypes.ip,
     WorkloadTypes.ipv4,

packages/grid_client/src/modules/machines.ts

@@ -18,6 +18,7 @@ class MachinesModule extends BaseModule {
   workloadTypes = [
     WorkloadTypes.zmachine,
     WorkloadTypes.zmount,
+    WorkloadTypes.volume,
     WorkloadTypes.qsfs,
     WorkloadTypes.ip,
     WorkloadTypes.ipv4,

packages/grid_client/src/primitives/disk.ts

@@ -1,6 +1,6 @@
+import { Volume } from "../zos/volume";
 import { Workload, WorkloadTypes } from "../zos/workload";
 import { Mount } from "../zos/zmachine";
-import { Zmount } from "../zos/zmount";
 
 class DiskPrimitive {
   createMount(name: string, mountpoint: string): Mount {
@@ -10,17 +10,17 @@ class DiskPrimitive {
     return mount;
   }
   create(size: number, name: string, metadata = "", description = "", version = 0): Workload {
-    const zmount = new Zmount();
-    zmount.size = size * 1024 ** 3;
+    const volume = new Volume();
+    volume.size = size * 1024 ** 3;
 
-    const zmount_workload = new Workload();
-    zmount_workload.version = version;
-    zmount_workload.name = name;
-    zmount_workload.type = WorkloadTypes.zmount;
-    zmount_workload.data = zmount;
-    zmount_workload.metadata = metadata;
-    zmount_workload.description = description;
-    return zmount_workload;
+    const volume_workload = new Workload();
+    volume_workload.version = version;
+    volume_workload.name = name;
+    volume_workload.type = WorkloadTypes.volume;
+    volume_workload.data = volume;
+    volume_workload.metadata = metadata;
+    volume_workload.description = description;
+    return volume_workload;
   }
   update(size: number, name: string, metadata = "", description = "", old_version = 1): Workload {
     return this.create(size, name, metadata, description, old_version + 1);

packages/grid_client/src/primitives/nodes.ts

@@ -63,6 +63,10 @@ interface NodeInfo {
   rentedByTwinId: number;
   rentContractId: number;
   serialNumber?: string;
+  healthy: boolean;
+  rentable: boolean;
+  rented: boolean;
+  price_usd: number;
 }
 interface PublicConfig {
   domain: string;

packages/grid_client/src/zos/index.ts

@@ -6,6 +6,7 @@ export * from "./workload";
 export * from "./zdb";
 export * from "./zmachine";
 export * from "./zmount";
+export * from "./volume";
 export * from "./znet";
 export * from "./gateway";
 export * from "./qsfs";

packages/grid_client/src/zos/volume.ts

@@ -0,0 +1,17 @@
+import { Expose } from "class-transformer";
+import { IsInt, Max, Min } from "class-validator";
+
+import { WorkloadData, WorkloadDataResult } from "./workload_base";
+
+class Volume extends WorkloadData {
+  @Expose() @IsInt() @Min(100 * 1024 ** 2) @Max(10 * 1024 ** 4) size: number; // in bytes
+
+  challenge(): string {
+    return this.size.toString();
+  }
+}
+
+class VolumeResult extends WorkloadDataResult {
+  @Expose() volume_id: string;
+}
+export { Volume, VolumeResult };

packages/grid_client/src/zos/workload.ts

@@ -5,6 +5,7 @@ import { GatewayFQDNProxy, GatewayNameProxy, GatewayResult } from "./gateway";
 import { PublicIPv4, PublicIPv4Result } from "./ipv4"; // TODO: remove deprecated
 import { PublicIP, PublicIPResult } from "./public_ip";
 import { QuantumSafeFS, QuantumSafeFSResult } from "./qsfs";
+import { Volume, VolumeResult } from "./volume";
 import { WorkloadData, WorkloadDataResult } from "./workload_base";
 import { Zdb, ZdbResult } from "./zdb";
 import { Zlogs, ZlogsResult } from "./zlogs";
@@ -21,6 +22,7 @@ enum ResultStates {
 enum WorkloadTypes {
   zmachine = "zmachine",
   zmount = "zmount",
+  volume = "volume",
   network = "network",
   zdb = "zdb",
   ipv4 = "ipv4", // TODO: remove deprecated
@@ -41,6 +43,7 @@ class DeploymentResult {
       property: "__type",
       subTypes: [
         { value: ZmountResult, name: WorkloadTypes.zmount },
+        { value: VolumeResult, name: WorkloadTypes.volume },
         { value: WorkloadDataResult, name: WorkloadTypes.network },
         { value: ZmachineResult, name: WorkloadTypes.zmachine },
         { value: ZdbResult, name: WorkloadTypes.zdb },
@@ -55,6 +58,7 @@ class DeploymentResult {
   })
   data:
     | ZmountResult
+    | VolumeResult
     | ZmachineResult
     | ZdbResult
     | PublicIPResult
@@ -79,6 +83,7 @@ class Workload {
       property: "__type",
       subTypes: [
         { value: Zmount, name: WorkloadTypes.zmount },
+        { value: Volume, name: WorkloadTypes.volume },
         { value: Znet, name: WorkloadTypes.network },
         { value: Zmachine, name: WorkloadTypes.zmachine },
         { value: Zdb, name: WorkloadTypes.zdb },
@@ -94,6 +99,7 @@ class Workload {
   // TODO: remove public IPv4 deprecated
   data:
     | Zmount
+    | Volume
     | Znet
     | Zmachine
     | Zdb

packages/grid_http_server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_http_server",
   "author": "Ahmed Hanafy",
-  "version": "2.3.3",
+  "version": "2.4.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.3.3",
+    "@threefold/grid_client": "^2.4.0-rc1",
     "express": "^4.18.1",
     "http-server": "^14.1.1",
     "typescript": "^4.7.4"

packages/grid_rmb_server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@threefold/grid_rmb_server",
   "author": "Ahmed Hanafy",
-  "version": "2.3.3",
+  "version": "2.4.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.3.3",
-    "@threefold/rmb_peer_server": "^2.3.3",
+    "@threefold/grid_client": "^2.4.0-rc1",
+    "@threefold/rmb_peer_server": "^2.4.0-rc1",
     "typescript": "^4.7.4"
   },
   "devDependencies": {
-    "@threefold/rmb_peer_client": "^2.3.3",
+    "@threefold/rmb_peer_client": "^2.4.0-rc1",
     "ts-node": "^10.9.1"
   },
   "main": "./dist/index.js",

packages/gridproxy_client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threefold/gridproxy_client",
-  "version": "2.3.3",
+  "version": "2.4.0-rc1",
   "description": "gridproxy_client help to interact with gridproxy based on network",
   "main": "dist/public_api.js",
   "types": "dist/public_api.d.ts",

packages/monitoring/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threefold/monitoring",
-  "version": "2.3.3",
+  "version": "2.4.0-rc1",
   "description": "Threefold monitoring package",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -16,9 +16,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@threefold/rmb_direct_client": "^2.3.3",
-    "@threefold/tfchain_client": "^2.3.3",
-    "@threefold/types": "^2.3.3",
+    "@threefold/rmb_direct_client": "^2.4.0-rc1",
+    "@threefold/tfchain_client": "^2.4.0-rc1",
+    "@threefold/types": "^2.4.0-rc1",
     "axios": "^0.27.2",
     "chalk": "4.1.2",
     "ts-node": "^10.9.1",

packages/playground/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threefold/playground",
-  "version": "2.3.3",
+  "version": "2.4.0-rc1",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -12,10 +12,10 @@
   },
   "dependencies": {
     "@mdi/font": "^7.2.96",
-    "@threefold/graphql_client": "^2.3.3",
-    "@threefold/grid_client": "^2.3.3",
-    "@threefold/gridproxy_client": "^2.3.3",
-    "@threefold/types": "^2.3.3",
+    "@threefold/graphql_client": "^2.4.0-rc1",
+    "@threefold/grid_client": "^2.4.0-rc1",
+    "@threefold/gridproxy_client": "^2.4.0-rc1",
+    "@threefold/types": "^2.4.0-rc1",
     "@types/ip": "^1.1.3",
     "@types/md5": "^2.3.5",
     "await-lock": "^2.2.2",

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.3.3"
+appVersion: "v2.4.0-rc1"

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.3.3"
+  tag: "2.4.0-rc1"
 
   env:
     - name: "MODE"