@ocap/util 1.16.4 → 1.16.7

package/lib/index.js

@@ -22,7 +22,7 @@ const camelCase = require('lodash/camelCase');
 const isNull = require('lodash/isNull');
 const rightPad = require('lodash/padEnd');
 const leftPad = require('lodash/padStart');
-const multibase = require('multibase');
+const { base58btc } = require('multiformats/bases/base58');
 const utf8 = require('utf8');
 const base64 = require('base64-url');
 const BN = require('bn.js');
@@ -31,6 +31,21 @@ const DID_PREFIX = 'did:abt:';
 const zero = new BN(0);
 const negative1 = new BN(-1);
 
+const textDecoder = new TextDecoder();
+const decodeText = (bytes) => textDecoder.decode(bytes);
+const isBase58Encoded = (data) => {
+  if (data instanceof Uint8Array) {
+    data = decodeText(data);
+  }
+
+  // Ensure bufOrString is a string
+  if (Object.prototype.toString.call(data) !== '[object String]') {
+    return false;
+  }
+
+  return data[0] === 'z';
+};
+
 /**
  * Returns a BN object, converts a number value to a BN
  * @param {String|Number|Object} `arg` input a string number, hex string number, number, BigNumber or BN object
@@ -344,8 +359,8 @@ const toHex = (value, returnType) => {
     return returnType ? 'bytes' : bytesToHex(value);
   }
 
-  if (multibase.isEncoded(value) === 'base58btc') {
-    return returnType ? 'bytes' : bytesToHex(multibase.decode(value));
+  if (isBase58Encoded(value)) {
+    return returnType ? 'bytes' : bytesToHex(base58btc.decode(value));
   }
 
   if (isBoolean(value)) {
@@ -553,17 +568,17 @@ function isUUID(str) {
 function toUint8Array(v) {
   let vb = null;
   if ([null, undefined, ''].includes(v)) {
-    vb = Uint8Array.from([]);
+    vb = new Uint8Array();
   } else if (Buffer.isBuffer(v)) {
-    vb = Uint8Array.from(v);
+    vb = new Uint8Array(v);
   } else if (isHexStrict(v)) {
-    vb = Uint8Array.from(hexToBytes(v));
+    vb = new Uint8Array(hexToBytes(v));
   } else if (isUint8Array(v)) {
-    vb = Uint8Array.from(v);
-  } else if (multibase.isEncoded(v) === 'base58btc') {
-    vb = Uint8Array.from(multibase.decode(v));
+    vb = new Uint8Array(v);
+  } else if (isBase58Encoded(v)) {
+    vb = new Uint8Array(base58btc.decode(v));
   } else if (typeof v === 'string') {
-    vb = Uint8Array.from(hexToBytes(toHex(v)));
+    vb = new Uint8Array(hexToBytes(toHex(v)));
   } else {
     throw new Error(
       `Unsupported input type ${typeof v} detected for toBuffer, only Uint8Array/Buffer/Hex/Base58 are supported`
@@ -596,7 +611,7 @@ function toBuffer(v) {
  * @throws {Error}
  */
 function toBase58(v) {
-  const buf = multibase.encode('base58btc', toUint8Array(v));
+  const buf = base58btc.encode(toUint8Array(v));
   return Buffer.from(buf).toString('utf-8');
 }
 
@@ -609,11 +624,11 @@ function toBase58(v) {
  * @returns {buffer}
  */
 function fromBase58(v) {
-  if (!multibase.isEncoded(v) === 'base58btc') {
+  if (isBase58Encoded(v) === false) {
     throw new Error('fromBase58 expect strict base58 encoded string as input');
   }
 
-  return Buffer.from(multibase.decode(v));
+  return Buffer.from(base58btc.decode(v));
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ocap/util",
-  "version": "1.16.4",
+  "version": "1.16.7",
   "description": "utils shared across multiple forge js libs, works in both node.js and browser",
   "keywords": [
     "forge",
@@ -16,7 +16,7 @@
     "base64-url": "^2.3.3",
     "bn.js": "5.2.0",
     "lodash": "^4.17.21",
-    "multibase": "^3.1.1",
+    "multiformats": "^9.6.5",
     "utf8": "^3.0.0"
   },
   "resolutions": {
@@ -56,5 +56,5 @@
   "bugs": {
     "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
-  "gitHead": "3ffb49a6ff1d0cfb5669c1d0af0fbdad2b7cbd39"
+  "gitHead": "2d9b07c134cf57b6f73bf1ff2e76406fb682318e"
 }