fix: Data variants support in hash_type

nervosnetwork · Nov 14, 2024 · df74aee · df74aee
1 parent 0a499af
commit df74aee
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/dist/ckb-js-toolkit.esm.js b/dist/ckb-js-toolkit.esm.js
diff --git a/dist/ckb-js-toolkit.node.js b/dist/ckb-js-toolkit.node.js
diff --git a/dist/ckb-js-toolkit.node.js.map b/dist/ckb-js-toolkit.node.js.map
diff --git a/dist/ckb-js-toolkit.umd.js b/dist/ckb-js-toolkit.umd.js
diff --git a/src/validators.js b/src/validators.js
@@ -75,7 +75,8 @@ export function ValidateScript(
   assertHash(`${debugPath}.code_hash`, script.code_hash);
   assertHexString(`${debugPath}.args`, script.args);
 
-  if (script.hash_type !== "data" && script.hash_type !== "type") {
+  const DATA_VARIANTS = /^data([1-9][0-9]*)?$/;
+  if (script.hash_type !== "type" && !DATA_VARIANTS.test(script.hash_type)) {
     throw new Error(`${debugPath}.hash_type must be either data or type!`);
   }
 }

diff --git a/tests/validators.js b/tests/validators.js
@@ -59,6 +59,27 @@ test("script with invalid hash type", t => {
   });
 });
 
+test("script with data variants", t => {
+  validators.ValidateScript({
+    code_hash:
+      "0xa98c57135830e1b91345948df6c4b8870828199a786b26f09f7dec4bc27a73da",
+    args: "0x1234",
+    hash_type: "data2"
+  });
+  t.pass();
+});
+
+test("script with invalid data variants", t => {
+  t.throws(() => {
+    validators.ValidateScript({
+      code_hash:
+        "0xa98c57135830e1b91345948df6c4b8870828199a786b26f09f7dec4bc27a73da",
+      args: "0x1234",
+      hash_type: "dataf"
+    });
+  });
+});
+
 test("correct outpoint", t => {
   validators.ValidateOutPoint({
     tx_hash: