Use micro-base for base{32, 58, 64} (#1209)

packages/util-crypto/src/base58/bs58.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import baseX from 'base-x';
+export { base58 } from 'micro-base';
 
 // https://github.com/cryptocoinjs/base-x#alphabets
 export const BASE58_ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
-
-export const bs58 = baseX(BASE58_ALPHABET);

packages/util-crypto/src/base58/decode.spec.ts

@@ -0,0 +1,23 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { base32Decode } from '../base32';
+import { base58Decode } from './';
+
+describe('base58Encode', (): void => {
+  it('encodes a base58 to a base32', (): void => {
+    expect(
+      base58Decode('b2rhk6GMPQF3hfzwXTaNYFLKomMeC6UXdUt6jZKPpeVirLtV')
+    ).toEqual(
+      base32Decode('afkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy')
+    );
+  });
+
+  it('encodes a base58 to a base32 (ipfs-compat)', (): void => {
+    expect(
+      base58Decode('zb2rhk6GMPQF3hfzwXTaNYFLKomMeC6UXdUt6jZKPpeVirLtV', true)
+    ).toEqual(
+      base32Decode('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true)
+    );
+  });
+});

packages/util-crypto/src/base58/decode.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { bufferToU8a } from '@polkadot/util';
-
-import { bs58 } from './bs58';
+import { base58 } from './bs58';
 import { base58Validate } from './validate';
 
 /**
@@ -15,5 +13,9 @@ import { base58Validate } from './validate';
 export function base58Decode (value: string, ipfsCompat?: boolean): Uint8Array {
   base58Validate(value, ipfsCompat);
 
-  return bufferToU8a(bs58.decode(value.substr(ipfsCompat ? 1 : 0)));
+  return base58.decode(
+    ipfsCompat
+      ? value.substr(1)
+      : value
+  );
 }

packages/util-crypto/src/base58/encode.spec.ts

@@ -5,7 +5,15 @@ import { base32Decode } from '../base32';
 import { base58Encode } from './';
 
 describe('base58Encode', (): void => {
-  it('encodes a base32 to a base38', (): void => {
+  it('encodes a base32 to a base58', (): void => {
+    expect(
+      base58Encode(
+        base32Decode('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true)
+      )
+    ).toEqual('b2rhk6GMPQF3hfzwXTaNYFLKomMeC6UXdUt6jZKPpeVirLtV');
+  });
+
+  it('encodes a base32 to a base58 (ipfs-compat)', (): void => {
     expect(
       base58Encode(
         base32Decode('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true),

packages/util-crypto/src/base58/encode.ts

@@ -5,7 +5,7 @@ import type { U8aLike } from '@polkadot/util/types';
 
 import { u8aToU8a } from '@polkadot/util';
 
-import { bs58 } from './bs58';
+import { base58 } from './bs58';
 
 /**
  * @name base58Encode
@@ -14,7 +14,7 @@ import { bs58 } from './bs58';
  * From the provided input, create the base58 and return the result as a string.
  */
 export function base58Encode (value: U8aLike, ipfsCompat?: boolean): string {
-  const out = bs58.encode(u8aToU8a(value));
+  const out = base58.encode(u8aToU8a(value));
 
   return ipfsCompat
     ? `z${out}`