Merge branch 'development' into dev_add_discount_contracts

threefoldtech · Sep 21, 2024 · 8da4c15 · 8da4c15
2 parents 618ace6 + cc0b65f
commit 8da4c15
Show file tree

Hide file tree

Showing 38 changed files with 176 additions and 59 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1 +1 @@
-* @AhmedHanafy725 @zaelgohary @maayarosama @MohamedElmdary @Mahmoud-Emad @amiraabouhadid @AlaaElattar @0oM4R @mohamedamer453 @samaradel
+* @AhmedHanafy725 @zaelgohary @maayarosama @MohamedElmdary @Mahmoud-Emad @amiraabouhadid @AlaaElattar @0oM4R @samaradel
diff --git a/packages/grid_client/docs/network/wireguard_network.md b/packages/grid_client/docs/network/wireguard_network.md
@@ -6,7 +6,7 @@ The target is to make a private Mesh connection between the nodes so they can re
 
 ## Configuration
 
-This configuration is set on each node using [network workload](../src/zos/znet.ts)
+This configuration is set on each node using [network workload](../../src/zos/znet.ts)
 
 - `ip_range`: an ip range to be used for this network, it needs to be private ip range, normally a /16 subnet is used (e.g. `10.20.0.0/16`)
 - `subnet`: a subnet to be used for this network, it should be a subnet of the entire network ip range, normally a /24 subnet is used for the node (e.g. `10.20.1.0/24`)

diff --git a/packages/grid_client/scripts/add_node_to_network.ts b/packages/grid_client/scripts/add_node_to_network.ts
@@ -15,7 +15,7 @@ async function main() {
     name: "wedtest",
     ipRange: "10.249.0.0/16",
     nodeId: 14,
-    mycelium: false,
+    mycelium: true,
   };
   // if the network is not created, it will create one and add this node to it.
   await addNode(grid3, node);

diff --git a/packages/grid_client/scripts/applications/algorand.ts b/packages/grid_client/scripts/applications/algorand.ts
@@ -59,7 +59,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/casperlabs.ts b/packages/grid_client/scripts/applications/casperlabs.ts
@@ -86,7 +86,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/discourse.ts b/packages/grid_client/scripts/applications/discourse.ts
@@ -94,7 +94,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/funkwhale.ts b/packages/grid_client/scripts/applications/funkwhale.ts
@@ -86,7 +86,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/mattermost.ts b/packages/grid_client/scripts/applications/mattermost.ts
@@ -86,7 +86,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/nextcloud.ts b/packages/grid_client/scripts/applications/nextcloud.ts
@@ -86,7 +86,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/nodepilot.ts b/packages/grid_client/scripts/applications/nodepilot.ts
@@ -64,7 +64,7 @@ async function main() {
         planetary: false,
         public_ip: true,
         public_ip6: true,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 2,

diff --git a/packages/grid_client/scripts/applications/peertube.ts b/packages/grid_client/scripts/applications/peertube.ts
@@ -86,7 +86,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/presearch.ts b/packages/grid_client/scripts/applications/presearch.ts
@@ -59,7 +59,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/static_website.ts b/packages/grid_client/scripts/applications/static_website.ts
@@ -86,7 +86,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/subsquid.ts b/packages/grid_client/scripts/applications/subsquid.ts
@@ -86,7 +86,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/taiga.ts b/packages/grid_client/scripts/applications/taiga.ts
@@ -86,7 +86,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/umbrel.ts b/packages/grid_client/scripts/applications/umbrel.ts
@@ -65,7 +65,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/applications/wordpress.ts b/packages/grid_client/scripts/applications/wordpress.ts
@@ -87,7 +87,7 @@ async function main() {
         planetary: true,
         public_ip: false,
         public_ip6: false,
-        mycelium: false,
+        mycelium: true,
         cpu: instanceCapacity.cru,
         memory: 1024 * instanceCapacity.mru,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/dynamic_single_vm.ts b/packages/grid_client/scripts/dynamic_single_vm.ts
@@ -55,7 +55,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         cpu: 1,
         memory: 1024,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/multiple_vms.ts b/packages/grid_client/scripts/multiple_vms.ts
@@ -63,7 +63,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         cpu: 1,
         memory: 1024,
         rootfs_size: 0,
@@ -86,7 +86,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         cpu: 1,
         memory: 1024,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/orchestrators/caprover_leader.ts b/packages/grid_client/scripts/orchestrators/caprover_leader.ts
@@ -55,7 +55,7 @@ async function main() {
         public_ip: true,
         public_ip6: false,
         planetary: false,
-        mycelium: false,
+        mycelium: true,
         cpu: 4,
         memory: 1024 * 4,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/orchestrators/caprover_worker.ts b/packages/grid_client/scripts/orchestrators/caprover_worker.ts
@@ -54,7 +54,7 @@ async function main() {
         public_ip: true,
         public_ip6: false,
         planetary: false,
-        mycelium: false,
+        mycelium: true,
         cpu: 4,
         memory: 1024 * 4,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts b/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts
@@ -62,7 +62,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     workers: [
@@ -76,7 +76,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     metadata: "",

diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts b/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts
@@ -97,7 +97,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         qsfs_disks: [
           {
             qsfs_zdbs_name: qsfs_name,
@@ -123,7 +123,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
       },
     ],
     metadata: "",

diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_worker.ts b/packages/grid_client/scripts/orchestrators/kubernetes_worker.ts
@@ -47,7 +47,7 @@ async function main() {
     public_ip: false,
     public_ip6: false,
     planetary: true,
-    mycelium: false,
+    mycelium: true,
   };
 
   //Add Worker

diff --git a/packages/grid_client/scripts/single_vm.ts b/packages/grid_client/scripts/single_vm.ts
@@ -49,7 +49,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         cpu: 1,
         memory: 1024 * 2,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/vm_with_gpu.ts b/packages/grid_client/scripts/vm_with_gpu.ts
@@ -68,7 +68,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         cpu: 8,
         memory: 1024 * 16,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/vm_with_qsfs.ts b/packages/grid_client/scripts/vm_with_qsfs.ts
@@ -110,7 +110,7 @@ async function main() {
         public_ip: false,
         public_ip6: false,
         planetary: true,
-        mycelium: false,
+        mycelium: true,
         cpu: 1,
         memory: 1024,
         rootfs_size: 0,

diff --git a/packages/grid_client/scripts/wireguard_vm.ts b/packages/grid_client/scripts/wireguard_vm.ts
@@ -18,7 +18,7 @@ function createMachineModel(node: number) {
     node_id: node,
     public_ip: false,
     planetary: true,
-    mycelium: false,
+    mycelium: true,
     cpu: 1,
     memory: 1024 * 2,
     rootfs_size: 0,

diff --git a/packages/gridproxy_client/src/modules/contracts.ts b/packages/gridproxy_client/src/modules/contracts.ts
@@ -2,35 +2,20 @@ import { ContractsBuilder, ContractsQuery, ContractState, ContractType } from ".
 import { resolvePaginator } from "../utils";
 import { AbstractClient } from "./abstract_client";
 
-export enum Discount {
-  Default = "Default",
-  None = "none",
-  Bronze = "Bronze",
-  Silver = "Silver",
-  Gold = "Gold",
-}
-
 export interface ContractDetails {
   nodeId: number;
   deployment_data?: string;
   deployment_hash?: string;
   number_of_public_ips?: number;
 }
 
-export interface ContractBilling {
-  amountBilled: number;
-  discountReceived: Discount;
-  timestamp: number;
-}
-
 export interface Contract {
   contract_id: number;
   twin_id: number;
   state: ContractState;
   created_at: number;
   type: ContractType;
   details: ContractDetails;
-  billing: Array<ContractBilling>;
 }
 
 export class ContractsClient extends AbstractClient<ContractsBuilder, ContractsQuery> {

diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -31,7 +31,7 @@
     "get-ip-range": "^4.0.1",
     "highlight.js": "^11.7.0",
     "ip": "^2.0.1",
-    "jspdf": "^2.5.1",
+    "jspdf": "^2.5.2",
     "jspdf-autotable": "^3.8.2",
     "lodash": "^4.17.21",
     "logger-interceptor": "1.0.0",

diff --git a/packages/playground/src/App.vue b/packages/playground/src/App.vue
@@ -57,6 +57,12 @@
                           <span v-bind="props">
                             {{ item.title }}
                           </span>
+                          <v-badge
+                            dot
+                            inline
+                            color="primary"
+                            v-if="item.releaseDate && isReleasedOverMon(item.releaseDate, new Date())"
+                          ></v-badge>
                         </template>
                       </v-tooltip>
                     </v-list-item-title>
@@ -88,6 +94,12 @@
                         <span v-bind="props">
                           {{ item.title }}
                         </span>
+                        <v-badge
+                          dot
+                          inline
+                          color="primary"
+                          v-if="item.releaseDate && isReleasedOverMon(item.releaseDate, new Date())"
+                        ></v-badge>
                       </template>
                     </v-tooltip>
                   </v-list-item-title>
@@ -251,6 +263,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useTheme } from "vuetify";
 
 import TfLogger from "@/components/logger.vue";
+import { isReleasedOverMon } from "@/utils/date";
 import { LocalStorageSettingsKey } from "@/utils/settings";
 
 import { useProfileManager } from "./stores/profile_manager";
@@ -561,7 +574,6 @@ import TfRouterView from "./components/TfRouterView.vue";
 import TfSwapPrice from "./components/TfSwapPrice.vue";
 import { useGrid } from "./stores";
 import ProfileManager from "./weblets/profile_manager.vue";
-
 interface AppRoute {
   title: string;
   items: AppRouteItem[];
@@ -575,6 +587,7 @@ interface AppRouteItem {
   url?: string;
   icon?: string;
   tooltip?: string;
+  releaseDate?: Date;
 }
 
 export default {