@ocap/util 1.16.7 → 1.16.8

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 { base58btc } = require('multiformats/bases/base58');
+const base58 = require('bs58');
 const utf8 = require('utf8');
 const base64 = require('base64-url');
 const BN = require('bn.js');
@@ -31,15 +31,12 @@ 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]') {
+const base58btc = {
+  encode: (v) => `z${base58.encode(v)}`,
+  decode: (v) => base58.decode(v.slice(1)),
+};
+const isBase58btc = (data) => {
+  if (typeof data !== 'string') {
     return false;
   }
 
@@ -359,7 +356,7 @@ const toHex = (value, returnType) => {
     return returnType ? 'bytes' : bytesToHex(value);
   }
 
-  if (isBase58Encoded(value)) {
+  if (isBase58btc(value)) {
     return returnType ? 'bytes' : bytesToHex(base58btc.decode(value));
   }
 
@@ -575,7 +572,7 @@ function toUint8Array(v) {
     vb = new Uint8Array(hexToBytes(v));
   } else if (isUint8Array(v)) {
     vb = new Uint8Array(v);
-  } else if (isBase58Encoded(v)) {
+  } else if (isBase58btc(v)) {
     vb = new Uint8Array(base58btc.decode(v));
   } else if (typeof v === 'string') {
     vb = new Uint8Array(hexToBytes(toHex(v)));
@@ -624,7 +621,7 @@ function toBase58(v) {
  * @returns {buffer}
  */
 function fromBase58(v) {
-  if (isBase58Encoded(v) === false) {
+  if (isBase58btc(v) === false) {
     throw new Error('fromBase58 expect strict base58 encoded string as input');
   }
 

package/package.json

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