X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=wallet%2Fannotated.go;h=db305e5735aa10d0c042d9732846b91c4eefb379;hp=746ac5a2be7a2f32e99f31889b0f104c2f8c772f;hb=a177b8b4f2828248c5bf34561b877c2578b77dd1;hpb=feed757163f1e2a5d1d6194b5f0323cd60cf0a81 diff --git a/wallet/annotated.go b/wallet/annotated.go index 746ac5a2..db305e57 100644 --- a/wallet/annotated.go +++ b/wallet/annotated.go @@ -220,18 +220,18 @@ func (w *Wallet) getAddressFromControlProgram(prog []byte, isMainchain bool) str if segwit.IsP2WPKHScript(prog) { if pubHash, err := segwit.GetHashFromStandardProg(prog); err == nil { - return buildP2PKHAddress(pubHash, netParams) + return BuildP2PKHAddress(pubHash, netParams) } } else if segwit.IsP2WSHScript(prog) { if scriptHash, err := segwit.GetHashFromStandardProg(prog); err == nil { - return buildP2SHAddress(scriptHash, netParams) + return BuildP2SHAddress(scriptHash, netParams) } } return "" } -func buildP2PKHAddress(pubHash []byte, netParams *consensus.Params) string { +func BuildP2PKHAddress(pubHash []byte, netParams *consensus.Params) string { address, err := common.NewAddressWitnessPubKeyHash(pubHash, netParams) if err != nil { return "" @@ -240,7 +240,7 @@ func buildP2PKHAddress(pubHash []byte, netParams *consensus.Params) string { return address.EncodeAddress() } -func buildP2SHAddress(scriptHash []byte, netParams *consensus.Params) string { +func BuildP2SHAddress(scriptHash []byte, netParams *consensus.Params) string { address, err := common.NewAddressWitnessScriptHash(scriptHash, netParams) if err != nil { return ""