From 96082841239a9407fcdaa7e3cb65f945ccd513aa Mon Sep 17 00:00:00 2001 From: naach Date: Tue, 27 Oct 2020 16:09:47 +0700 Subject: [PATCH] fix(regtest): network are not address prefix and refactor for clear easy to read and extend --- lib/Address.ts | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/Address.ts b/lib/Address.ts index 84d36acb..cd9daf32 100644 --- a/lib/Address.ts +++ b/lib/Address.ts @@ -237,15 +237,29 @@ export class Address { network: string = "mainnet" ): string { let netParam: any - if (network !== "bitcoincash" && network !== "mainnet") - netParam = Bitcoin.networks.testnet - - const regtest: boolean = network === "bchreg" + let isRegtest: boolean + switch (network) { + case 'mainnet': + netParam = Bitcoin.networks.bitcoin + isRegtest = false + break + case 'testnet': + netParam = Bitcoin.networks.testnet + isRegtest = false + break + case 'regtest': + netParam = Bitcoin.networks.testnet + isRegtest = true + break + default: + netParam = Bitcoin.networks.bitcoin + isRegtest = false + } return this.toCashAddress( Bitcoin.address.fromOutputScript(scriptPubKey, netParam), true, - regtest + isRegtest ) }