flip/dcrd
1
0
Fork 0
mirror of https://github.com/FlipsideCrypto/dcrd.git synced 2026-02-06 10:56:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

multi: Update DecodeAddress function signature

Browse Source
This commit is contained in:
Donald Adu-Poku 2017-07-17 23:03:07 +00:00 committed by Dave Collins
parent b661265c5b
commit db727aeeb6
10 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blockchain/chaingen/generator.go
View File

@ -1865,7 +1865,7 @@ func (g *Generator) CreatePremineBlock(blockName string, additionalAmount dcruti
// in order to set the input value appropriately.
var totalSubsidy dcrutil.Amount
for _, payout := range g.params.BlockOneLedger {
payoutAddr, err := dcrutil.DecodeAddress(payout.Address, g.params)
payoutAddr, err := dcrutil.DecodeAddress(payout.Address)
if err != nil {
panic(err)
}

2
blockchain/subsidy.go
View File

@ -258,7 +258,7 @@ func BlockOneCoinbasePaysTokens(tx *dcrutil.Tx,
return ruleError(ErrBlockOneOutputs, errStr)
}
addrLedger, err := dcrutil.DecodeAddress(ledger[i].Address, params)
addrLedger, err := dcrutil.DecodeAddress(ledger[i].Address)
if err != nil {
return err
}

3
blockchain/validate_test.go
View File

@ -1773,8 +1773,7 @@ func TestBlockValidationRules(t *testing.T) {
sstxCBIn.SignatureScript = []byte{0x51, 0x51}
sstxToUse166.AddTxIn(sstxCBIn)
orgAddr, _ := dcrutil.DecodeAddress("ScuQxvveKGfpG1ypt6u27F99Anf7EW3cqhq",
simNetParams)
orgAddr, _ := dcrutil.DecodeAddress("ScuQxvveKGfpG1ypt6u27F99Anf7EW3cqhq")
pkScript, _ := txscript.GenerateSStxAddrPush(orgAddr,
dcrutil.Amount(29702992297), 0x0000)
txOut := wire.NewTxOut(int64(0), pkScript)

5
config.go
View File

@ -768,8 +768,7 @@ func loadConfig() (*config, []string, error) {
cfg.miningAddrs = make([]dcrutil.Address, 0, len(cfg.GetWorkKeys)+
len(cfg.MiningAddrs))
for _, strAddr := range cfg.GetWorkKeys {
addr, err := dcrutil.DecodeAddress(strAddr,
activeNetParams.Params)
addr, err := dcrutil.DecodeAddress(strAddr)
if err != nil {
str := "%s: getworkkey '%s' failed to decode: %v"
err := fmt.Errorf(str, funcName, strAddr, err)
@ -789,7 +788,7 @@ func loadConfig() (*config, []string, error) {
// Check mining addresses are valid and saved parsed versions.
for _, strAddr := range cfg.MiningAddrs {
addr, err := dcrutil.DecodeAddress(strAddr, activeNetParams.Params)
addr, err := dcrutil.DecodeAddress(strAddr)
if err != nil {
str := "%s: mining address '%s' failed to decode: %v"
err := fmt.Errorf(str, funcName, strAddr, err)

7
glide.lock generated
View File

@ -1,5 +1,5 @@
hash: 153a3e6a1f31b2b29a113e953098f2b42a645103ee3e10040b5e03727a7b003c
updated: 2017-06-28T14:40:45.6812682-04:00
hash: 4b6e3c74874c418e9dd83046051037dabebbba6cb4d4d2a8dfa9d524b32b7eeb
updated: 2017-07-17T22:58:54.586169116Z
imports:
- name: github.com/agl/ed25519
version: 278e1ec8e8a6e017cd07577924d6766039146ced
@ -51,7 +51,8 @@ imports:
- name: github.com/decred/dcrrpcclient
version: e7732bfa71b4b098494fa0ce62d42fded970c393
- name: github.com/decred/dcrutil
version: a5fab53cab39b793142c8453caa4c6f83bc152d4
version: 58e046aab848365647c44b295f4fab078fbc3392
repo: https://github.com/dnldd/dcrutil.git
subpackages:
- base58
- bloom

2
glide.yaml
View File

@ -31,6 +31,8 @@ import:
- package: github.com/decred/blake256
- package: github.com/decred/dcrrpcclient
- package: github.com/decred/dcrutil
version: 58e046aab848365647c44b295f4fab078fbc3392
repo: https://github.com/dnldd/dcrutil.git
subpackages:
- bloom
- package: golang.org/x/crypto

2
mining.go
View File

@ -551,7 +551,7 @@ func createCoinbaseTx(subsidyCache *blockchain.SubsidyCache,
// Convert the addresses in the ledger into useable format.
addrs := make([]dcrutil.Address, len(params.BlockOneLedger))
for i, payout := range params.BlockOneLedger {
addr, err := dcrutil.DecodeAddress(payout.Address, params)
addr, err := dcrutil.DecodeAddress(payout.Address)
if err != nil {
return nil, err
}

24
rpcserver.go
View File

@ -656,8 +656,7 @@ func handleCreateRawTransaction(s *rpcServer, cmd interface{}, closeChan <-chan
}
// Decode the provided address.
addr, err := dcrutil.DecodeAddress(encodedAddr,
activeNetParams.Params)
addr, err := dcrutil.DecodeAddress(encodedAddr)
if err != nil {
return nil, rpcAddressKeyError("Could not decode "+
"address: %v", err)
@ -762,8 +761,7 @@ func handleCreateRawSStx(s *rpcServer, cmd interface{}, closeChan <-chan struct{
}
// Decode the provided address.
addr, err := dcrutil.DecodeAddress(encodedAddr,
activeNetParams.Params)
addr, err := dcrutil.DecodeAddress(encodedAddr)
if err != nil {
return nil, rpcAddressKeyError("Could not decode "+
"address: %v", err)
@ -828,8 +826,7 @@ func handleCreateRawSStx(s *rpcServer, cmd interface{}, closeChan <-chan struct{
for i, cout := range c.COuts {
// 1. Append future commitment output.
addr, err := dcrutil.DecodeAddress(cout.Addr,
activeNetParams.Params)
addr, err := dcrutil.DecodeAddress(cout.Addr)
if err != nil {
return nil, rpcAddressKeyError("Could not decode "+
"address: %v", err)
@ -872,8 +869,7 @@ func handleCreateRawSStx(s *rpcServer, cmd interface{}, closeChan <-chan struct{
}
// Decode the provided address.
addr, err = dcrutil.DecodeAddress(cout.ChangeAddr,
activeNetParams.Params)
addr, err = dcrutil.DecodeAddress(cout.ChangeAddr)
if err != nil {
return nil, rpcAddressKeyError("Wrong network: %v",
addr)
@ -1548,7 +1544,7 @@ func handleExistsAddress(s *rpcServer, cmd interface{}, closeChan <-chan struct{
c := cmd.(*dcrjson.ExistsAddressCmd)
// Attempt to decode the supplied address.
addr, err := dcrutil.DecodeAddress(c.Address, s.server.chainParams)
addr, err := dcrutil.DecodeAddress(c.Address)
if err != nil {
return nil, rpcAddressKeyError("Could not decode address: %v",
err)
@ -1574,7 +1570,7 @@ func handleExistsAddresses(s *rpcServer, cmd interface{}, closeChan <-chan struc
addresses := make([]dcrutil.Address, len(c.Addresses))
for i := range c.Addresses {
// Attempt to decode the supplied address.
addr, err := dcrutil.DecodeAddress(c.Addresses[i], s.server.chainParams)
addr, err := dcrutil.DecodeAddress(c.Addresses[i])
if err != nil {
return nil, rpcAddressKeyError("Could not decode "+
"address: %v", err)
@ -4801,7 +4797,7 @@ func handleSearchRawTransactions(s *rpcServer, cmd interface{}, closeChan <-chan
}
// Attempt to decode the supplied address.
addr, err := dcrutil.DecodeAddress(c.Address, s.server.chainParams)
addr, err := dcrutil.DecodeAddress(c.Address)
if err != nil {
return nil, rpcAddressKeyError("Could not decode address: %v",
err)
@ -5468,7 +5464,7 @@ func handleTicketFeeInfo(s *rpcServer, cmd interface{}, closeChan <-chan struct{
func handleTicketsForAddress(s *rpcServer, cmd interface{}, closeChan <-chan struct{}) (interface{}, error) {
c := cmd.(*dcrjson.TicketsForAddressCmd)
addr, err := dcrutil.DecodeAddress(c.Address, s.server.chainParams)
addr, err := dcrutil.DecodeAddress(c.Address)
if err != nil {
return nil, rpcInvalidError("Invalid address: %v", err)
}
@ -5643,7 +5639,7 @@ func handleValidateAddress(s *rpcServer, cmd interface{}, closeChan <-chan struc
c := cmd.(*dcrjson.ValidateAddressCmd)
result := dcrjson.ValidateAddressChainResult{}
addr, err := dcrutil.DecodeAddress(c.Address, activeNetParams.Params)
addr, err := dcrutil.DecodeAddress(c.Address)
if err != nil {
// Return the default value (false) for IsValid.
return result, nil
@ -5712,7 +5708,7 @@ func handleVerifyMessage(s *rpcServer, cmd interface{}, closeChan <-chan struct{
c := cmd.(*dcrjson.VerifyMessageCmd)
// Decode the provided address.
addr, err := dcrutil.DecodeAddress(c.Address, activeNetParams.Params)
addr, err := dcrutil.DecodeAddress(c.Address)
if err != nil {
return nil, rpcAddressKeyError("Could not decode address: %v",
err)

4
rpcwebsocket.go
View File

@ -398,7 +398,7 @@ func (f *wsClientFilter) addAddress(a dcrutil.Address) {
}
func (f *wsClientFilter) addAddressStr(s string) {
a, err := dcrutil.DecodeAddress(s, activeNetParams.Params)
a, err := dcrutil.DecodeAddress(s)
// If address can't be decoded, no point in saving it since it should also
// impossible to create the address from an inspected transaction output
// script.
@ -470,7 +470,7 @@ func (f *wsClientFilter) removeAddress(a dcrutil.Address) {
}
func (f *wsClientFilter) removeAddressStr(s string) {
a, err := dcrutil.DecodeAddress(s, activeNetParams.Params)
a, err := dcrutil.DecodeAddress(s)
if err == nil {
f.removeAddress(a)
} else {

2
txscript/example_test.go
View File

@ -30,7 +30,7 @@ func ExamplePayToAddrScript() {
// the address type. It is also required for the upcoming call to
// PayToAddrScript.
addressStr := "DsSej1qR3Fyc8kV176DCh9n9cY9nqf9Quxk"
address, err := dcrutil.DecodeAddress(addressStr, &chaincfg.MainNetParams)
address, err := dcrutil.DecodeAddress(addressStr)
if err != nil {
fmt.Println(err)
return