Merge pull request #1381 from bitcoinjs/fixTypes

Fix address.*OutputScript and ECPairOptions rng

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "bitcoinjs-lib",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitcoinjs-lib",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Client-side Bitcoin JavaScript library",
   "main": "./src/index.js",
   "types": "./types/index.d.ts",

ts_src/address.ts

@@ -64,7 +64,7 @@ export function toBech32(
   return bech32.encode(prefix, words);
 }
 
-export function fromOutputScript(output: Buffer, network: Network): string {
+export function fromOutputScript(output: Buffer, network?: Network): string {
   // TODO: Network
   network = network || networks.bitcoin;
 
@@ -84,7 +84,7 @@ export function fromOutputScript(output: Buffer, network: Network): string {
   throw new Error(bscript.toASM(output) + ' has no matching Address');
 }
 
-export function toOutputScript(address: string, network: Network): Buffer {
+export function toOutputScript(address: string, network?: Network): Buffer {
   network = network || networks.bitcoin;
 
   let decodeBase58: Base58CheckResult | undefined;

ts_src/ecpair.ts

@@ -16,7 +16,7 @@ const isOptions = typeforce.maybe(
 interface ECPairOptions {
   compressed?: boolean;
   network?: Network;
-  rng?(arg0: Buffer): Buffer;
+  rng?(arg0: number): Buffer;
 }
 
 export interface ECPairInterface {

types/address.d.ts

@@ -13,5 +13,5 @@ export declare function fromBase58Check(address: string): Base58CheckResult;
 export declare function fromBech32(address: string): Bech32Result;
 export declare function toBase58Check(hash: Buffer, version: number): string;
 export declare function toBech32(data: Buffer, version: number, prefix: string): string;
-export declare function fromOutputScript(output: Buffer, network: Network): string;
+export declare function fromOutputScript(output: Buffer, network?: Network): string;
-export declare function toOutputScript(address: string, network: Network): Buffer;
+export declare function toOutputScript(address: string, network?: Network): Buffer;

types/ecpair.d.ts

@@ -3,7 +3,7 @@ import { Network } from './networks';
 interface ECPairOptions {
     compressed?: boolean;
     network?: Network;
-    rng?(arg0: Buffer): Buffer;
+    rng?(arg0: number): Buffer;
 }
 export interface ECPairInterface {
     compressed: boolean;