LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

rpcserver: avoid nested decodescript p2sh addrs

Browse source
This commit is contained in:
David Hill 2016-10-19 13:15:21 -04:00 committed by Dave Collins
parent e7caccc866
commit 403aaf5cf3
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
btcjson/chainsvrresults.go
View file

@ -56,7 +56,7 @@ type DecodeScriptResult struct {
ReqSigs int32 `json:"reqSigs,omitempty"` ReqSigs int32 `json:"reqSigs,omitempty"`
Type string `json:"type"` Type string `json:"type"`
Addresses []string `json:"addresses,omitempty"` Addresses []string `json:"addresses,omitempty"`
P2sh string `json:"p2sh"` P2sh string `json:"p2sh,omitempty"`
} }
// GetAddedNodeInfoResultAddr models the data of the addresses portion of the // GetAddedNodeInfoResultAddr models the data of the addresses portion of the

4
rpcserver.go
View file

@ -833,7 +833,9 @@ func handleDecodeScript(s *rpcServer, cmd interface{}, closeChan <-chan struct{}
ReqSigs: int32(reqSigs), ReqSigs: int32(reqSigs),
Type: scriptClass.String(), Type: scriptClass.String(),
Addresses: addresses, Addresses: addresses,
P2sh: p2sh.EncodeAddress(), }
if scriptClass != txscript.ScriptHashTy {
reply.P2sh = p2sh.EncodeAddress()
} }
return reply, nil return reply, nil
} }

2
rpcserverhelp.go
View file

@ -106,7 +106,7 @@ var helpDescsEnUS = map[string]string{
"decodescriptresult-reqSigs": "The number of required signatures", "decodescriptresult-reqSigs": "The number of required signatures",
"decodescriptresult-type": "The type of the script (e.g. 'pubkeyhash')", "decodescriptresult-type": "The type of the script (e.g. 'pubkeyhash')",
"decodescriptresult-addresses": "The bitcoin addresses associated with this script", "decodescriptresult-addresses": "The bitcoin addresses associated with this script",
"decodescriptresult-p2sh": "The script hash for use in pay-to-script-hash transactions", "decodescriptresult-p2sh": "The script hash for use in pay-to-script-hash transactions (only present if the provided redeem script is not already a pay-to-script-hash script)",
// DecodeScriptCmd help. // DecodeScriptCmd help.
"decodescript--synopsis": "Returns a JSON object with information about the provided hex-encoded script.", "decodescript--synopsis": "Returns a JSON object with information about the provided hex-encoded script.",