fix: fix mahalo type

initia-labs · Mar 19, 2024 · b160be4 · b160be4
1 parent 4548469
commit b160be4
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 27 deletions.
diff --git a/_package/src/types/Chain.ts b/_package/src/types/Chain.ts
@@ -230,17 +230,17 @@ export interface Chain {
       | {
           channel?: {
             chain_id: string;
-            port_id?: string;
-            channel_id?: string;
-            version?: string;
+            port_id: string;
+            channel_id: string;
+            version: string;
           }[];
         }
       | {
           channel?: {
             chain_id: string;
             transfer?: string;
             "nft-transfer"?: string;
-          };
+          }[];
         };
   };
 }

diff --git a/_package/src/zods/Chain.ts b/_package/src/zods/Chain.ts
@@ -506,9 +506,9 @@ export const ChainSchema = z
                       z
                         .object({
                           chain_id: z.string(),
-                          port_id: z.string().optional(),
-                          channel_id: z.string().optional(),
-                          version: z.string().optional(),
+                          port_id: z.string(),
+                          channel_id: z.string(),
+                          version: z.string(),
                         })
                         .strict()
                     )
@@ -518,12 +518,15 @@ export const ChainSchema = z
               z
                 .object({
                   channel: z
-                    .object({
-                      chain_id: z.string(),
-                      transfer: z.string().optional(),
-                      "nft-transfer": z.string().optional(),
-                    })
-                    .strict()
+                    .array(
+                      z
+                        .object({
+                          chain_id: z.string(),
+                          transfer: z.string().optional(),
+                          "nft-transfer": z.string().optional(),
+                        })
+                        .strict()
+                    )
                     .optional(),
                 })
                 .strict(),

diff --git a/chain.schema.json b/chain.schema.json
@@ -648,7 +648,10 @@
                   "items": {
                     "type": "object",
                     "required": [
-                      "chain_id"
+                      "chain_id",
+                      "port_id",
+                      "channel_id",
+                      "version"
                     ],
                     "properties": {
                       "chain_id": {
@@ -674,20 +677,25 @@
               "type": "object",
               "properties": {
                 "channel": {
-                  "type": "object",
-                  "properties": {
-                    "chain_id": {
-                      "type": "string"
-                    },
-                    "transfer": {
-                      "type": "string"
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "required": [
+                      "chain_id"
+                    ],
+                    "properties": {
+                      "chain_id": {
+                        "type": "string"
+                      },
+                      "transfer": {
+                        "type": "string"
+                      },
+                      "nft-transfer": {
+                        "type": "string"
+                      }
                     },
-                    "nft-transfer": {
-                      "type": "string"
-                    }
-                  },
-                  "additionalProperties": false,
-                  "required": ["chain_id"]
+                    "additionalProperties": false
+                  }
                 }
               },
               "additionalProperties": false