Merge pull request gcash#432 from gcash/pubkey-utxos

[Bug] Return pubkey outputs in pb.bchrpc.GetAddressUnspentOutputs
emberfarkas · Dec 9, 2020 · 0e0e371 · 0e0e371
2 parents ac37349 + 183d443
commit 0e0e371
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/bchrpc/server.go b/bchrpc/server.go
@@ -929,7 +929,17 @@ func (s *GrpcServer) GetAddressUnspentOutputs(ctx context.Context, req *pb.GetAd
 				continue
 			}
 
-			if addrs[0].EncodeAddress() == addr.EncodeAddress() {
+			matchAddr := ""
+
+			switch typedAddr := addrs[0].(type) {
+			case *bchutil.AddressPubKeyHash, *bchutil.AddressScriptHash:
+				matchAddr = addrs[0].EncodeAddress()
+
+			case *bchutil.AddressPubKey:
+				matchAddr = typedAddr.AddressPubKeyHash().EncodeAddress()
+			}
+
+			if matchAddr == addr.EncodeAddress() {
 				utxo := &pb.UnspentOutput{
 					Outpoint: &pb.Transaction_Input_Outpoint{
 						Hash:  txHash.CloneBytes(),