Add portal/farms

packages/grid_client/src/modules/farms.ts

@@ -2,7 +2,14 @@ import { TFClient } from "../clients/tf-grid/client";
 import { GridClientConfig } from "../config";
 import { expose } from "../helpers/expose";
 import { validateInput } from "../helpers/validator";
-import { FarmIdModel } from "./models";
+import {
+  AddFarmIPModel,
+  AddStellarAddressToFarmModel,
+  CreateFarmModel,
+  FarmIdModel,
+  RemoveFarmIPModel,
+} from "./models";
+import { checkBalance } from "./utils";
 
 class Farms {
   client: TFClient;
@@ -11,6 +18,34 @@ class Farms {
     this.client = config.tfclient;
   }
 
+  @expose
+  @validateInput
+  @checkBalance
+  async create(options: CreateFarmModel) {
+    return (await this.client.farms.create(options)).apply();
+  }
+
+  @expose
+  @validateInput
+  @checkBalance
+  async addFarmIp(options: AddFarmIPModel) {
+    return (await this.client.farms.addFarmIp(options)).apply();
+  }
+
+  @expose
+  @validateInput
+  @checkBalance
+  async removeFarmIp(options: RemoveFarmIPModel) {
+    return (await this.client.farms.removeFarmIp(options)).apply();
+  }
+
+  @expose
+  @validateInput
+  @checkBalance
+  async addStellarAddress(options: AddStellarAddressToFarmModel) {
+    return (await this.client.farms.addStellarAddress(options)).apply();
+  }
+
   @expose
   @validateInput
   async getFarmByID(options: FarmIdModel) {

packages/grid_client/src/modules/models.ts

@@ -658,6 +658,51 @@ class FarmIdModel {
   @Expose() @IsInt() @IsNotEmpty() @Min(1) id: number;
 }
 
+class FarmPublicIPsModel {
+  @Expose() @IsNotEmpty() @IsIP() ip: string;
+  @Expose() @IsNotEmpty() @IsString() gw: string;
+}
+
+class AddFarmIPModel {
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) farmId: number;
+  @Expose() @IsNotEmpty() @IsString() ip: string;
+  @Expose() @IsNotEmpty() @IsIP() gw: string;
+}
+
+class IPConfig {
+  @Expose() @IsNotEmpty() @IsString() ip: string;
+  @Expose() @IsNotEmpty() @IsIP() gw: string;
+}
+class PublicConfigModel {
+  @Expose() @IsNotEmpty() @Type(() => IPConfig) @ValidateNested() ip4: IPConfig;
+  @Expose() @IsOptional() ip6: IPConfig | null;
+  @Expose() @IsOptional() @IsString() domain: string | null;
+}
+class AddPublicConfig {
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) farmId: number;
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) nodeId: number;
+  @Expose() @IsOptional() @Type(() => PublicConfigModel) @ValidateNested() publicConfig?: PublicConfigModel | null;
+}
+
+class RemoveFarmIPModel {
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) farmId: number;
+  @Expose() @IsNotEmpty() @IsString() ip: string;
+}
+
+class AddStellarAddressToFarmModel {
+  @Expose() @IsInt() @IsNotEmpty() @Min(1) farmId: number;
+  @Expose() @IsString() @IsNotEmpty() stellarAddress: string;
+}
+
+class CreateFarmModel {
+  @Expose() @IsString() @IsNotEmpty() @MaxLength(NameLength) name: string;
+  @Expose()
+  @IsOptional()
+  @Type(() => FarmPublicIPsModel)
+  @ValidateNested({ each: true })
+  publicIps?: FarmPublicIPsModel[];
+}
+
 class pingFarmModel {
   @Expose() @IsInt() @IsNotEmpty() @Min(1) farmId: number;
 }
@@ -682,7 +727,7 @@ class NetworkGetModel {
 
 class SetDedicatedNodeExtraFeesModel {
   @Expose() @IsInt() @IsNotEmpty() @Min(1) nodeId: number;
-  @Expose() @IsInt() @IsNotEmpty() @Min(1) extraFee: number;
+  @Expose() @IsNumber() @IsNotEmpty() @Min(0) extraFee: number;
 }
 
 class GetDedicatedNodePriceModel {
@@ -812,6 +857,7 @@ export {
   ZOSNodeModel,
   NodePowerModel,
   FarmIdModel,
+  CreateFarmModel,
   pingFarmModel,
   CreateServiceContractModel,
   ServiceContractApproveModel,
@@ -828,5 +874,9 @@ export {
   GetDedicatedNodePriceModel,
   SwapToStellarModel,
   ListenToMintCompletedModel,
+  AddFarmIPModel,
+  RemoveFarmIPModel,
+  AddStellarAddressToFarmModel,
+  AddPublicConfig,
   GetActiveContractsModel,
 };

packages/grid_client/src/modules/nodes.ts

@@ -4,6 +4,7 @@ import { events, validateInput } from "../helpers";
 import { expose } from "../helpers/expose";
 import { capacity } from "./capacity";
 import {
+  AddPublicConfig,
   FilterOptions,
   NodeGetModel,
   NodePowerModel,
@@ -82,6 +83,13 @@ class Nodes {
     return (await this.client.nodes.setPower(options)).apply();
   }
 
+  @expose
+  @validateInput
+  @checkBalance
+  async addNodePublicConfig(options: AddPublicConfig) {
+    return (await this.client.nodes.addNodePublicConfig(options)).apply();
+  }
+
   @expose
   async all() {
     return await this.capacity.getAllNodes();

packages/playground/package.json

@@ -31,6 +31,7 @@
     "vue-router": "^4.1.6",
     "vuetify": "^3.1.15",
     "web-ssh-keygen": "^0.1.2",
+    "get-ip-range": "^4.0.1",
     "chart.js": "^4.4.0",
     "vue-chartjs": "^5.2.0",
     "moment": "^2.29.4"

packages/playground/src/App.vue

@@ -155,7 +155,7 @@
               <router-view v-slot="{ Component }">
                 <transition name="fade">
                   <div :key="$route.path">
-                    <component :is="Component" v-if="hasActiveProfile"></component>
+                    <component :is="Component" v-if="hasActiveProfile && hasGrid"></component>
                     <ConnectWalletLanding @openProfile="openProfile = true" v-else />
                   </div>
                 </transition>
@@ -179,13 +179,15 @@ import { useProfileManager } from "./stores/profile_manager";
 const $route = useRoute();
 const $router = useRouter();
 const profileManager = useProfileManager();
+const gridStore = useGrid();
 const network = process.env.NETWORK || (window as any).env.NETWORK;
 
 const openProfile = ref(true);
 const hasActiveProfile = computed(() => !!profileManager.profile);
 const theme = useTheme();
 const navbarConfig = ref();
 
+const hasGrid = computed(() => !!gridStore.grid);
 watch(
   () => $route.meta,
   meta => {
@@ -373,6 +375,7 @@ import FundsCard from "./components/funds_card.vue";
 import ProfileManagerController from "./components/profile_manager_controller.vue";
 import TftSwapPrice from "./components/swap_price.vue";
 import TFNotification from "./components/tf_notification.vue";
+import { useGrid } from "./stores";
 import ProfileManager from "./weblets/profile_manager.vue";
 
 interface AppRoute {
@@ -404,125 +407,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" global>
-:root {
-  --link-color: #5695ff;
-}
-
-.app-link {
-  text-decoration: none;
-  font-weight: bold;
-  color: var(--link-color);
-  cursor: pointer;
-}
-
-.fade-leave-active,
-.fade-enter-active {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  pointer-events: none;
-
-  transition: opacity 1s;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}
-
-.capitalize {
-  text-transform: capitalize !important;
-}
-
-.v-btn {
-  text-transform: capitalize !important;
-  font-size: 1rem !important;
-}
-
-.version {
-  position: absolute;
-  bottom: 15px;
-  right: 25px;
-}
-
-.v-tooltip > .v-overlay__content {
-  // background: var(--v-theme-surface);
-  border-color: rgba(var(--v-border-color), var(--v-border-opacity)) !important;
-  border-width: thin !important;
-  border-style: solid !important;
-  z-index: 99;
-  background-color: rgb(var(--v-theme-background));
-  color: var(--v-theme-text);
-  font-weight: 900;
-}
-
-a {
-  color: #5695ff !important;
-}
-
-.v-list-item__prepend {
-  width: 35px !important;
-}
-
-.v-list-item-title {
-  font-size: 0.875rem;
-}
-
-.v-list-item--density-default.v-list-item--one-line {
-  min-height: 40px;
-}
-
-.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: #5d5d5d !important;
-}
-
-.mosha__icon__light__warning {
-  fill: #5d5d5d !important;
-}
-
-.mosha__toast__content.dark__warning {
-  color: #5d5d5d;
-}
-
-.mosha__toast__content.light__warning {
-  color: #5d5d5d;
-}
-
-.mosha__toast__close-icon.dark__warning::before {
-  color: #5d5d5d !important;
-}
-
-.mosha__toast__close-icon.light__warning::before {
-  color: #5d5d5d !important;
-}
-
-.mosha__toast {
-  font-size: 14px !important;
-  font-weight: 600 !important;
-}
-
-.font-14 {
-  font-size: 14px !important;
-}
-
-.v-breadcrumbs-item--disabled {
-  opacity: 1;
-}
-</style>