interncom
diff --git a/‎dist/browsers-sumo/sodium.js
Lines changed: 1 addition & 1 deletion b/‎dist/browsers-sumo/sodium.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/browsers/sodium.js
Lines changed: 1 addition & 1 deletion b/‎dist/browsers/sodium.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/modules-sumo/libsodium-wrappers.js
Lines changed: 1 addition & 1 deletion b/‎dist/modules-sumo/libsodium-wrappers.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎dist/modules/libsodium-wrappers.js
Lines changed: 1 addition & 1 deletion b/‎dist/modules/libsodium-wrappers.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎wrapper/build-doc.js
Lines changed: 2 additions & 0 deletions b/‎wrapper/build-doc.js
Lines changed: 2 additions & 0 deletions
diff --git a/‎wrapper/macros/input_u64.js
Lines changed: 16 additions & 0 deletions b/‎wrapper/macros/input_u64.js
Lines changed: 16 additions & 0 deletions
diff --git a/‎wrapper/symbols/crypto_kdf_derive_from_key.json
Lines changed: 2 additions & 2 deletions b/‎wrapper/symbols/crypto_kdf_derive_from_key.json
Lines changed: 2 additions & 2 deletions
@@ -109,6 +109,8 @@ exports.buildDocForSymbol = function (s) {
         sDoc += "Randombytes implementation";
       } else if (paramType == "string") {
         sDoc += "A string";
+      } else if (paramType == "u64") {
+        sDoc += "An unsigned int or 64-bit BigInt";
       } else throw new Error("Unknown parameter type: " + paramType);
       sDoc += newLine();
     }
 
@@ -0,0 +1,16 @@
+// ---------- input: {var_name} (u64)
+
+_require_defined(address_pool, {var_name}, "{var_name}");
+var {var_name}_hi = 0, {var_name}_lo;
+if (typeof {var_name} === "bigint" && {var_name} >= BigInt(0)) {
+        const hi = {var_name} >> BigInt(32);
+        if (hi > BigInt(4294967295)) {
+                _free_and_throw_type_error(address_pool, "{var_name} cannot be more than 64 bits");
+        }        
+        {var_name}_hi = Number(hi);
+        {var_name}_lo = Number({var_name} & BigInt(4294967295));
+} else if (typeof {var_name} === "number" && ({var_name} | 0) === {var_name} && {var_name} >= 0) {
+        {var_name}_lo = {var_name}
+} else {
+        _free_and_throw_type_error(address_pool, "{var_name} must be an unsigned integer or bigint");
+}
@@ -8,7 +8,7 @@
     },
     {
       "name": "subkey_id",
-      "type": "uint"
+      "type": "u64"
     },
     {
       "name": "ctx",
@@ -28,6 +28,6 @@
       "type": "buf"
     }
   ],
-  "target": "libsodium._crypto_kdf_derive_from_key(subkey_address, subkey_len, subkey_id, (subkey_id >>> 24) >>> 8, ctx_address, key_address)",
+  "target": "libsodium._crypto_kdf_derive_from_key(subkey_address, subkey_len, subkey_id_lo, subkey_id_hi, ctx_address, key_address)",
   "return": "_format_output(subkey, outputFormat)"
 }
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,8 @@ exports.buildDocForSymbol = function (s) {`
`109`	`109`	`sDoc += "Randombytes implementation";`
`110`	`110`	`} else if (paramType == "string") {`
`111`	`111`	`sDoc += "A string";`
	`112`	`+ } else if (paramType == "u64") {`
	`113`	`+ sDoc += "An unsigned int or 64-bit BigInt";`
`112`	`114`	`} else throw new Error("Unknown parameter type: " + paramType);`
`113`	`115`	`sDoc += newLine();`
`114`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`},`
`9`	`9`	`{`
`10`	`10`	`"name": "subkey_id",`
`11`		`- "type": "uint"`
	`11`	`+ "type": "u64"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"name": "ctx",`
`@@ -28,6 +28,6 @@`
`28`	`28`	`"type": "buf"`
`29`	`29`	`}`
`30`	`30`	`],`
`31`		`- "target": "libsodium._crypto_kdf_derive_from_key(subkey_address, subkey_len, subkey_id, (subkey_id >>> 24) >>> 8, ctx_address, key_address)",`
	`31`	`+ "target": "libsodium._crypto_kdf_derive_from_key(subkey_address, subkey_len, subkey_id_lo, subkey_id_hi, ctx_address, key_address)",`
`32`	`32`	`"return": "_format_output(subkey, outputFormat)"`
`33`	`33`	`}`