From 3b9b11cb4114d35afe28d4b38520429a5577e654 Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Tue, 18 Mar 2014 20:44:03 -0500
Subject: [PATCH] Update for recent btcutil.Address API change.

---
 rpcserver.go    | 3 ++-
 rpcwebsocket.go | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rpcserver.go b/rpcserver.go
index 85baa07b..e6dea524 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -531,7 +531,8 @@ func handleCreateRawTransaction(s *rpcServer, cmd btcjson.Cmd) (interface{}, err
 		}
 
 		// Decode the provided address.
-		addr, err := btcutil.DecodeAddr(encodedAddr)
+		addr, err := btcutil.DecodeAddress(encodedAddr,
+			activeNetParams.btcnet)
 		if err != nil {
 			return nil, btcjson.Error{
 				Code: btcjson.ErrInvalidAddressOrKey.Code,
diff --git a/rpcwebsocket.go b/rpcwebsocket.go
index e9c805bc..d32bf774 100644
--- a/rpcwebsocket.go
+++ b/rpcwebsocket.go
@@ -1416,7 +1416,7 @@ func handleNotifyNewTXs(wsc *wsClient, icmd btcjson.Cmd) (interface{}, *btcjson.
 	}
 
 	for _, addrStr := range cmd.Addresses {
-		addr, err := btcutil.DecodeAddr(addrStr)
+		addr, err := btcutil.DecodeAddress(addrStr, activeNetParams.btcnet)
 		if err != nil {
 			e := btcjson.Error{
 				Code:    btcjson.ErrInvalidAddressOrKey.Code,