Features/handle storage class validation (#134)

* Update akashjs & remove patch

* Call akashjs validation and show error message as CustomValidation

deploy-web/package.json

@@ -15,7 +15,7 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@akashnetwork/akashjs": "0.5.4",
+    "@akashnetwork/akashjs": "0.5.10",
     "@auth0/nextjs-auth0": "^3.1.0",
     "@cosmjs/encoding": "^0.29.5",
     "@cosmjs/stargate": "^0.29.5",

deploy-web/src/components/deploymentDetail/ManifestUpdate.tsx

@@ -73,13 +73,11 @@ export const ManifestUpdate: React.FunctionComponent<Props> = ({ deployment, lea
    * Validate the manifest periodically
    */
   useEffect(() => {
-    async function createAndValidateDeploymentData(yamlStr, dseq) {
+    async function createAndValidateDeploymentData(yamlStr: string, dseq: string) {
       try {
         if (!editedManifest) return null;
 
-        const yamlJson = yaml.load(yamlStr);
-
-        await deploymentData.NewDeploymentData(settings.apiEndpoint, yamlJson, dseq, address);
+        await deploymentData.NewDeploymentData(settings.apiEndpoint, yamlStr, dseq, address);
 
         setParsingError(null);
       } catch (err) {
@@ -134,7 +132,7 @@ export const ManifestUpdate: React.FunctionComponent<Props> = ({ deployment, lea
     try {
       const doc = yaml.load(editedManifest);
 
-      const dd = await deploymentData.NewDeploymentData(settings.apiEndpoint, doc, parseInt(deployment.dseq), address); // TODO Flags
+      const dd = await deploymentData.NewDeploymentData(settings.apiEndpoint, editedManifest, deployment.dseq, address); // TODO Flags
       const mani = deploymentData.getManifest(doc, true);
 
       // const sdl = getSdl(doc as any, "beta3");

deploy-web/src/components/newDeploymentWizard/ManifestEdit.tsx

@@ -30,8 +30,6 @@ import { SdlBuilder, SdlBuilderRefType } from "./SdlBuilder";
 import { validateDeploymentData } from "@src/utils/deploymentUtils";
 import { useChainParam } from "@src/context/ChainParamProvider";
 
-const yaml = require("js-yaml");
-
 const useStyles = makeStyles()(theme => ({
   tooltip: {
     fontSize: "1rem"
@@ -98,12 +96,11 @@ export const ManifestEdit: React.FunctionComponent<Props> = ({ editedManifest, s
     setEditedManifest(value);
   }
 
-  async function createAndValidateDeploymentData(yamlStr, dseq = null, deposit = defaultInitialDeposit, depositorAddress = null) {
+  async function createAndValidateDeploymentData(yamlStr: string, dseq = null, deposit = defaultInitialDeposit, depositorAddress = null) {
     try {
       if (!yamlStr) return null;
 
-      const doc = yaml.load(yamlStr);
-      const dd = await deploymentData.NewDeploymentData(settings.apiEndpoint, doc, dseq, address, deposit, depositorAddress);
+      const dd = await deploymentData.NewDeploymentData(settings.apiEndpoint, yamlStr, dseq, address, deposit, depositorAddress);
       validateDeploymentData(dd, selectedTemplate);
 
       setSdlDenom(dd.deposit.denom);

deploy-web/src/components/sdl/RentGpusForm.tsx

@@ -37,8 +37,6 @@ import { event } from "nextjs-google-analytics";
 import { AnalyticsEvents } from "@src/utils/analytics";
 import { useChainParam } from "@src/context/ChainParamProvider";
 
-const yaml = require("js-yaml");
-
 type Props = {};
 
 export const RentGpusForm: React.FunctionComponent<Props> = ({}) => {
@@ -82,12 +80,11 @@ export const RentGpusForm: React.FunctionComponent<Props> = ({}) => {
     return () => subscription.unsubscribe();
   }, []);
 
-  async function createAndValidateDeploymentData(yamlStr, dseq = null, deposit = defaultInitialDeposit, depositorAddress = null) {
+  async function createAndValidateDeploymentData(yamlStr: string, dseq = null, deposit = defaultInitialDeposit, depositorAddress = null) {
     try {
       if (!yamlStr) return null;
 
-      const doc = yaml.load(yamlStr);
-      const dd = await deploymentData.NewDeploymentData(settings.apiEndpoint, doc, dseq, address, deposit, depositorAddress);
+      const dd = await deploymentData.NewDeploymentData(settings.apiEndpoint, yamlStr, dseq, address, deposit, depositorAddress);
       validateDeploymentData(dd);
 
       setSdlDenom(dd.deposit.denom);

deploy-web/src/utils/deploymentData/helpers.ts

@@ -57,12 +57,12 @@ export function parseSizeStr(str: string) {
 
 type NetworkType = "beta2" | "beta3";
 
-function isString(value: unknown): value is string {
-  return typeof value === "object" && value !== null && value.constructor === String;
+function isValidString(value: unknown): value is string {
+  return typeof value === "string" && !!value;
 }
 
 export function getSdl(yamlJson: string | v2Sdl, networkType: NetworkType) {
-  return isString(yamlJson) ? SDL.fromString(yamlJson, networkType) : new SDL(yamlJson, networkType);
+  return isValidString(yamlJson) ? SDL.fromString(yamlJson, networkType) : new SDL(yamlJson, networkType);
 }
 
 export function DeploymentGroups(yamlJson: string | v2Sdl, networkType: NetworkType) {

deploy-web/src/utils/deploymentData/v1beta2.ts

@@ -2,11 +2,19 @@ import { CustomValidationError, ManifestVersion, getCurrentHeight, Manifest, Dep
 import { defaultInitialDeposit } from "../constants";
 import { stringToBoolean } from "../stringUtils";
 import path from "path";
+import yaml from "js-yaml";
+import { SDL } from "@akashnetwork/akashjs/build/sdl";
 
 const endpointNameValidationRegex = /^[a-z]+[-_\da-z]+$/;
 const endpointKindIP = "ip";
 
-function validate(yamlJson) {
+function validate(yamlStr: string, yamlJson) {
+  try {
+    SDL.validate(yamlStr, "beta2");
+  } catch (e) {
+    throw new CustomValidationError(e.message);
+  }
+
   const sdl = getSdl(yamlJson, "beta2");
 
   // ENDPOINT VALIDATION
@@ -185,9 +193,18 @@ export async function getManifestVersion(yamlJson, asString = false) {
   }
 }
 
-export async function NewDeploymentData(apiEndpoint, yamlJson, dseq, fromAddress, deposit = defaultInitialDeposit, depositorAddress = null) {
+export async function NewDeploymentData(
+  apiEndpoint: string,
+  yamlStr: string,
+  dseq: string,
+  fromAddress: string,
+  deposit = defaultInitialDeposit,
+  depositorAddress = null
+) {
+  const yamlJson = yaml.load(yamlStr) as any;
+
   // Validate the integrity of the yaml
-  validate(yamlJson);
+  validate(yamlStr, yamlJson);
 
   const groups = DeploymentGroups(yamlJson, "beta2");
   const mani = Manifest(yamlJson, "beta2");
@@ -202,7 +219,7 @@ export async function NewDeploymentData(apiEndpoint, yamlJson, dseq, fromAddress
   };
 
   if (!id.dseq) {
-    id.dseq = await getCurrentHeight(apiEndpoint);
+    id.dseq = (await getCurrentHeight(apiEndpoint)).toString();
   }
 
   return {

deploy-web/src/utils/deploymentData/v1beta3.ts

@@ -2,12 +2,20 @@ import { CustomValidationError, DeploymentGroups, Manifest, ManifestVersion, get
 import { defaultInitialDeposit } from "../constants";
 import { stringToBoolean } from "../stringUtils";
 import path from "path";
+import yaml from "js-yaml";
 import { getUsdcDenom } from "@src/hooks/useDenom";
+import { SDL } from "@akashnetwork/akashjs/build/sdl";
 
 export const endpointNameValidationRegex = /^[a-z]+[-_\da-z]+$/;
 export const endpointKindIP = "ip";
 
-function validate(yamlJson) {
+function validate(yamlStr: string, yamlJson) {
+  try {
+    SDL.validate(yamlStr, "beta3");
+  } catch (e) {
+    throw new CustomValidationError(e.message);
+  }
+
   const sdl = getSdl(yamlJson, "beta3");
 
   // DENOM VALIDATION
@@ -227,9 +235,18 @@ const getDenomFromSdl = (groups: any[]): string => {
   return denoms[0];
 };
 
-export async function NewDeploymentData(apiEndpoint, yamlJson, dseq, fromAddress, deposit = defaultInitialDeposit, depositorAddress = null) {
+export async function NewDeploymentData(
+  apiEndpoint: string,
+  yamlStr: string,
+  dseq: string,
+  fromAddress: string,
+  deposit = defaultInitialDeposit,
+  depositorAddress = null
+) {
+  const yamlJson = yaml.load(yamlStr) as any;
+
   // Validate the integrity of the yaml
-  validate(yamlJson);
+  validate(yamlStr, yamlJson);
 
   const groups = DeploymentGroups(yamlJson, "beta3");
   const mani = Manifest(yamlJson, "beta3");
@@ -245,7 +262,7 @@ export async function NewDeploymentData(apiEndpoint, yamlJson, dseq, fromAddress
   };
 
   if (!id.dseq) {
-    id.dseq = await getCurrentHeight(apiEndpoint);
+    id.dseq = (await getCurrentHeight(apiEndpoint)).toString();
   }
 
   return {