Remove wif. Use new bs58check

Author: paulmillr

package-lock.json

@@ -54,8 +54,7 @@
     "bip174": "^2.1.0",
     "bs58check": "^3.0.1",
     "typeforce": "^1.11.3",
-    "varuint-bitcoin": "^1.1.2",
-    "wif": "^2.0.1"
+    "varuint-bitcoin": "^1.1.2"
   },
   "devDependencies": {
     "@types/bs58": "^4.0.0",
@@ -64,7 +63,6 @@
     "@types/node": "^16.11.7",
     "@types/proxyquire": "^1.3.28",
     "@types/randombytes": "^2.0.0",
-    "@types/wif": "^2.0.2",
     "@typescript-eslint/eslint-plugin": "^5.45.0",
     "@typescript-eslint/parser": "^5.45.0",
     "better-npm-audit": "^3.7.3",

package.json

@@ -42,11 +42,11 @@ function _toFutureSegwitAddress(output, network) {
   return toBech32(data, version, network.bech32);
 }
 function fromBase58Check(address) {
-  const payload = bs58check.decode(address);
+  const payload = Buffer.from(bs58check.decode(address));
   // TODO: 4.0.0, move to "toOutputScript"
   if (payload.length < 21) throw new TypeError(address + ' is too short');
   if (payload.length > 21) throw new TypeError(address + ' is too long');
-  const version = payload.readUInt8(0);
+  const version = payload.readUint8(0);
   const hash = payload.slice(1);
   return { version, hash };
 }

src/address.js

@@ -27,7 +27,7 @@ function p2pkh(a, opts) {
     a,
   );
   const _address = lazy.value(() => {
-    const payload = bs58check.decode(a.address);
+    const payload = Buffer.from(bs58check.decode(a.address));
     const version = payload.readUInt8(0);
     const hash = payload.slice(1);
     return { version, hash };

src/payments/p2pkh.js

@@ -48,7 +48,7 @@ function p2sh(a, opts) {
   }
   const o = { network };
   const _address = lazy.value(() => {
-    const payload = bs58check.decode(a.address);
+    const payload = Buffer.from(bs58check.decode(a.address));
     const version = payload.readUInt8(0);
     const hash = payload.slice(1);
     return { version, hash };

src/payments/p2sh.js

@@ -53,13 +53,13 @@ function _toFutureSegwitAddress(output: Buffer, network: Network): string {
 }
 
 export function fromBase58Check(address: string): Base58CheckResult {
-  const payload = bs58check.decode(address);
+  const payload = Buffer.from(bs58check.decode(address));
 
   // TODO: 4.0.0, move to "toOutputScript"
   if (payload.length < 21) throw new TypeError(address + ' is too short');
   if (payload.length > 21) throw new TypeError(address + ' is too long');
 
-  const version = payload.readUInt8(0);
+  const version = payload.readUint8(0);
   const hash = payload.slice(1);
 
   return { version, hash };

ts_src/address.ts

@@ -29,7 +29,7 @@ export function p2pkh(a: Payment, opts?: PaymentOpts): Payment {
   );
 
   const _address = lazy.value(() => {
-    const payload = bs58check.decode(a.address!);
+    const payload = Buffer.from(bs58check.decode(a.address!));
     const version = payload.readUInt8(0);
     const hash = payload.slice(1);
     return { version, hash };

ts_src/payments/p2pkh.ts

@@ -57,7 +57,7 @@ export function p2sh(a: Payment, opts?: PaymentOpts): Payment {
   const o: Payment = { network };
 
   const _address = lazy.value(() => {
-    const payload = bs58check.decode(a.address!);
+    const payload = Buffer.from(bs58check.decode(a.address!));
     const version = payload.readUInt8(0);
     const hash = payload.slice(1);
     return { version, hash };