diff --git a/cmd/kaspawallet/daemon/server/address.go b/cmd/kaspawallet/daemon/server/address.go index e290827d9..44f8484d8 100644 --- a/cmd/kaspawallet/daemon/server/address.go +++ b/cmd/kaspawallet/daemon/server/address.go @@ -99,11 +99,11 @@ func (s *server) CheckIfAddressesAreValid(_ context.Context, request *pb.CheckIf areValidAddresses := make([]*pb.IsValidAddress, len(request.Addresses)) for i, address := range request.Addresses { - areValidAddresses[i] = &pb.IsValidAddress{ - Address: address, - IsValid: util.CheckIfAddressIsValid(address, s.params.Prefix), - } + areValidAddresses[i] = &pb.IsValidAddress{ + Address: address, + IsValid: util.CheckIfAddressIsValid(address, s.params.Prefix), } + } return &pb.CheckIfAddressesAreValidResponse{ AreValidAddresses: areValidAddresses, }, nil diff --git a/util/address.go b/util/address.go index 5ddd63eb5..727260ca0 100644 --- a/util/address.go +++ b/util/address.go @@ -5,9 +5,9 @@ package util import ( + "github.com/kaspanet/kaspad/util/bech32" "github.com/pkg/errors" "golang.org/x/crypto/blake2b" - "github.com/kaspanet/kaspad/util/bech32" ) var ( @@ -153,8 +153,7 @@ func DecodeAddress(addr string, expectedPrefix Bech32Prefix) (Address, error) { } } - -// CheckIfAddressIsValid decodes the string encoding of an address and returns true +// CheckIfAddressIsValid decodes the string encoding of an address and returns true // if addr is a valid encoding for a known address type else it returns false // // If any expectedPrefix except Bech32PrefixUnknown is passed, it is compared to the @@ -169,17 +168,17 @@ func CheckIfAddressIsValid(addr string, expectedPrefix Bech32Prefix) bool { if err != nil { return false } - + if expectedPrefix != Bech32PrefixUnknown && expectedPrefix != prefix { return false } if version != pubKeyAddrID { return false - } else if version != pubKeyECDSAAddrID { - return false + } else if version != pubKeyECDSAAddrID { + return false } else if version != scriptHashAddrID { - return false + return false } return true