fix: remove old type of ibc channels (#22)

* fix: remove old type of ibc channels * fix: remove channels for merge
initia-labs · Mar 26, 2024 · 394643e · 394643e
1 parent 063273f
commit 394643e
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 157 deletions.
diff --git a/_package/package.json b/_package/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@initia/initia-registry-types",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "The package provides TypeScript type definitions and Zod integration for initia-registry.",
   "types": "./dist/types/index.d.ts",
   "exports": {

diff --git a/_package/src/types/Chain.ts b/_package/src/types/Chain.ts
@@ -226,20 +226,12 @@ export interface Chain {
     /**
      * [Optional] The list of IBC channels that are supported by the chain.
      */
-    ibc_channels?:
-      | {
-          chain_id: string;
-          port_id: string;
-          channel_id: string;
-          version: string;
-        }[]
-      | {
-          channel?: {
-            chain_id: string;
-            transfer?: string;
-            "nft-transfer"?: string;
-          }[];
-        };
+    ibc_channels?: {
+      chain_id: string;
+      port_id: string;
+      channel_id: string;
+      version: string;
+    }[];
     /**
      * URL pointing to the asset list, which provides metadata associated with Cosmos denoms.
      */

diff --git a/_package/src/zods/Chain.ts b/_package/src/zods/Chain.ts
@@ -496,52 +496,16 @@ export const ChainSchema = z
           )
           .optional(),
         ibc_channels: z
-          .any()
-          .superRefine((x, ctx) => {
-            const schemas = [
-              z.array(
-                z
-                  .object({
-                    chain_id: z.string(),
-                    port_id: z.string(),
-                    channel_id: z.string(),
-                    version: z.string(),
-                  })
-                  .strict()
-              ),
-              z
-                .object({
-                  channel: z
-                    .array(
-                      z
-                        .object({
-                          chain_id: z.string(),
-                          transfer: z.string().optional(),
-                          "nft-transfer": z.string().optional(),
-                        })
-                        .strict()
-                    )
-                    .optional(),
-                })
-                .strict(),
-            ];
-            const errors = schemas.reduce(
-              (errors: z.ZodError[], schema) =>
-                ((result) =>
-                  "error" in result ? [...errors, result.error] : errors)(
-                  schema.safeParse(x)
-                ),
-              []
-            );
-            if (schemas.length - errors.length !== 1) {
-              ctx.addIssue({
-                path: ctx.path,
-                code: "invalid_union",
-                unionErrors: errors,
-                message: "Invalid input: Should pass single schema",
-              });
-            }
-          })
+          .array(
+            z
+              .object({
+                chain_id: z.string(),
+                port_id: z.string(),
+                channel_id: z.string(),
+                version: z.string(),
+              })
+              .strict()
+          )
           .describe(
             "[Optional] The list of IBC channels that are supported by the chain."
           )

diff --git a/chain.schema.json b/chain.schema.json
@@ -639,63 +639,31 @@
           "description": "[Optional] A list specifying coin amounts by denomination that exempt users from transaction fees when their balance meets or exceeds these amounts."
         },
         "ibc_channels": {
-          "oneOf": [
-            { 
-              "type": "array",
-              "items": {
-                "type": "object",
-                "required": [
-                  "chain_id",
-                  "port_id",
-                  "channel_id",
-                  "version"
-                ],
-                "properties": {
-                  "chain_id": {
-                    "type": "string"
-                  },
-                  "port_id": {
-                    "type": "string"
-                  },
-                  "channel_id": {
-                    "type": "string"
-                  },
-                  "version": {
-                    "type": "string"
-                  }
-                },
-                "additionalProperties": false
+          "type": "array",
+          "items": {
+            "type": "object",
+            "required": [
+              "chain_id",
+              "port_id",
+              "channel_id",
+              "version"
+            ],
+            "properties": {
+              "chain_id": {
+                "type": "string"
               },
-              "additionalProperties": false
-            },
-            {
-              "type": "object",
-              "properties": {
-                "channel": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "required": [
-                      "chain_id"
-                    ],
-                    "properties": {
-                      "chain_id": {
-                        "type": "string"
-                      },
-                      "transfer": {
-                        "type": "string"
-                      },
-                      "nft-transfer": {
-                        "type": "string"
-                      }
-                    },
-                    "additionalProperties": false
-                  }
-                }
+              "port_id": {
+                "type": "string"
               },
-              "additionalProperties": false
-            }
-          ],
+              "channel_id": {
+                "type": "string"
+              },
+              "version": {
+                "type": "string"
+              }
+            },
+            "additionalProperties": false
+          },
           "description": "[Optional] The list of IBC channels that are supported by the chain."
         },
         "assetlist": {

diff --git a/devnets/mahalo/chain.json b/devnets/mahalo/chain.json
@@ -142,18 +142,7 @@
   },
   "metadata": {
     "is_l1": true,
-    "ibc_channels": {
-      "channel": [
-        {
-          "chain_id": "minimove-1",
-          "transfer": "channel-0"
-        },
-        {
-          "chain_id": "miniwasm-1",
-          "transfer": "channel-1"
-        }
-      ]
-    },
+    "ibc_channels": [],
     "assetlist": "https://raw.githubusercontent.com/initia-labs/initia-registry/main/devnets/mahalo/assetlist.json"
   }
 }
diff --git a/devnets/minimove/chain.json b/devnets/minimove/chain.json
@@ -128,17 +128,8 @@
   "metadata": {
     "op_bridge_id": "1",
     "creator": "0x723e7894466de983976cc54302f9c436b3291106",
-    "op_denoms": [
-      "uinit"
-    ],
-    "ibc_channels": {
-      "channel": [
-        {
-          "chain_id": "mahalo-1",
-          "transfer": "channel-0"
-        }
-      ]
-    },
+    "op_denoms": ["uinit"],
+    "ibc_channels": [],
     "assetlist": "https://raw.githubusercontent.com/initia-labs/initia-registry/main/devnets/minimove/assetlist.json"
   }
 }
diff --git a/devnets/miniwasm/chain.json b/devnets/miniwasm/chain.json
@@ -9,9 +9,7 @@
   "bech32_prefix": "init",
   "daemon_name": "minitiad",
   "node_home": "$HOME/.minitia",
-  "key_algos": [
-    "secp256k1"
-  ],
+  "key_algos": ["secp256k1"],
   "slip44": 118,
   "fees": {
     "fee_tokens": [
@@ -37,10 +35,7 @@
   "codebase": {
     "git_repo": "https://github.com/initia-labs/miniwasm",
     "recommended_version": "v0.2.0-beta.2",
-    "compatible_versions": [
-      "v0.2.0-beta.2",
-      "main"
-    ],
+    "compatible_versions": ["v0.2.0-beta.2", "main"],
     "binaries": {
       "linux/amd64": "https://initia.s3.ap-southeast-1.amazonaws.com/miniwasm-1/miniwasm_v0.2.0-beta.2_Linux_x86_64.tar.gz",
       "linux/arm64": "https://initia.s3.ap-southeast-1.amazonaws.com/miniwasm-1/miniwasm_v0.2.0-beta.2_Linux_aarch64.tar.gz",
@@ -133,17 +128,8 @@
   "metadata": {
     "op_bridge_id": "2",
     "creator": "0xf324bf4f355abec6d49fdfd0d45419ba99d363d9",
-    "op_denoms": [
-      "uinit"
-    ],
-    "ibc_channels": {
-      "channel": [
-        {
-          "chain_id": "mahalo-1",
-          "transfer": "channel-0"
-        }
-      ]
-    },
+    "op_denoms": ["uinit"],
+    "ibc_channels": [],
     "assetlist": "https://raw.githubusercontent.com/initia-labs/initia-registry/main/devnets/miniwasm/assetlist.json"
   }
 }