@ocap/util 1.16.6 → 1.16.9

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 // Generate by [js2dts@0.3.3](https://github.com/whxaxes/js2dts#readme)
 
+import * as bnJs from 'bn.js';
 /**
  * Validates if a value is an Uint8Array.
  *
@@ -106,15 +107,15 @@ declare function toAddress(did: string): string;
 declare const _Lib: _Lib.T100;
 declare namespace _Lib {
   export interface T100 {
-    BN: any;
+    BN: typeof bnJs;
     isBN: (object: any) => boolean;
     isBigNumber: (object: any) => boolean;
     isHexPrefixed: (str: string) => boolean;
     stripHexPrefix: (str: string) => any;
     utf8ToHex: (str: string) => string;
     hexToUtf8: (hex: string) => string;
-    numberToHex: (value: any) => string;
-    hexToNumber: (value: any) => number;
+    numberToHex: (value: string | number | bnJs) => string;
+    hexToNumber: (value: string | number | bnJs) => number;
     isHex: (hex: string) => boolean;
     isHexStrict: (hex: string) => boolean;
     isUint8Array: typeof isUint8Array;
@@ -123,8 +124,8 @@ declare namespace _Lib {
     toHex: (value: any, returnType: boolean) => string;
     numberToString: (arg: any) => any;
     fromUnitToToken: (input: string | number, decimal?: number, optionsInput?: any) => string;
-    fromTokenToUnit: (input: string, decimal?: number) => any;
-    toBN: (number: any) => any;
+    fromTokenToUnit: (input: string, decimal?: number) => bnJs;
+    toBN: (number: string | number | bnJs) => bnJs;
     toUint8Array: typeof toUint8Array;
     toBuffer: typeof toBuffer;
     toBase58: typeof toBase58;

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 base58 = require('bs58');
 const utf8 = require('utf8');
 const base64 = require('base64-url');
 const BN = require('bn.js');
@@ -31,6 +31,18 @@ const DID_PREFIX = 'did:abt:';
 const zero = new BN(0);
 const negative1 = new BN(-1);
 
+const base58btc = {
+  encode: (v) => `z${base58.encode(v)}`,
+  decode: (v) => base58.decode(v.slice(1)),
+};
+const isBase58btc = (data) => {
+  if (typeof data !== '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 +356,8 @@ const toHex = (value, returnType) => {
     return returnType ? 'bytes' : bytesToHex(value);
   }
 
-  if (multibase.isEncoded(value) === 'base58btc') {
-    return returnType ? 'bytes' : bytesToHex(multibase.decode(value));
+  if (isBase58btc(value)) {
+    return returnType ? 'bytes' : bytesToHex(base58btc.decode(value));
   }
 
   if (isBoolean(value)) {
@@ -560,8 +572,8 @@ function toUint8Array(v) {
     vb = new Uint8Array(hexToBytes(v));
   } else if (isUint8Array(v)) {
     vb = new Uint8Array(v);
-  } else if (multibase.isEncoded(v) === 'base58btc') {
-    vb = new Uint8Array(multibase.decode(v));
+  } else if (isBase58btc(v)) {
+    vb = new Uint8Array(base58btc.decode(v));
   } else if (typeof v === 'string') {
     vb = new Uint8Array(hexToBytes(toHex(v)));
   } else {
@@ -596,7 +608,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 +621,11 @@ function toBase58(v) {
  * @returns {buffer}
  */
 function fromBase58(v) {
-  if (!multibase.isEncoded(v) === 'base58btc') {
+  if (isBase58btc(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,9 +1,8 @@
 {
   "name": "@ocap/util",
-  "version": "1.16.6",
+  "version": "1.16.9",
   "description": "utils shared across multiple forge js libs, works in both node.js and browser",
   "keywords": [
-    "forge",
     "arcblock",
     "node.js",
     "browser",
@@ -15,8 +14,8 @@
   "dependencies": {
     "base64-url": "^2.3.3",
     "bn.js": "5.2.0",
+    "bs58": "^5.0.0",
     "lodash": "^4.17.21",
-    "multibase": "^3.1.1",
     "utf8": "^3.0.0"
   },
   "resolutions": {
@@ -25,13 +24,16 @@
   },
   "devDependencies": {
     "jest": "^27.3.1",
-    "jsdoc-to-markdown": "^5.0.0"
+    "jsdoc-to-markdown": "^7.1.1"
   },
   "author": {
     "name": "wangshijun",
     "email": "shijun@arcblock.io",
     "url": "https://github.com/wangshijun"
   },
+  "contributors": [
+    "wangshijun <shijun@arcblock.io> (https://github.com/wangshijun)"
+  ],
   "homepage": "https://github.com/ArcBlock/asset-chain/tree/master/core/forge-util",
   "license": "Apache-2.0",
   "main": "lib/index.js",
@@ -56,5 +58,5 @@
   "bugs": {
     "url": "https://github.com/ArcBlock/asset-chain/issues"
   },
-  "gitHead": "c37106e25f4ac2b4e64230e5ab559bdafb5a6a7e"
+  "gitHead": "16fb7ce43033d07f83794914f2d5dda731f80814"
 }