Update btcutil import paths to new location.

chain/chain.go

@@ -21,9 +21,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcrpcclient"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
 	"github.com/conformal/btcwire"

chainntfns.go

@@ -17,8 +17,8 @@
 package main
 
 import (
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"

config.go

@@ -24,7 +24,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/conformal/btcutil"
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcwire"
 	"github.com/conformal/go-flags"
 )

createtx.go

@@ -23,9 +23,9 @@ import (
 	"sort"
 	"time"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
 	"github.com/conformal/btcwire"

createtx_test.go

@@ -6,8 +6,8 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"
 	"github.com/conformal/btcwire"

createtx_test_disabled.go

@@ -12,8 +12,8 @@ package main
 import (
 	"testing"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/tx"
 	"github.com/conformal/btcwire"
 )

keystore/keystore.go

@@ -36,10 +36,10 @@ import (
 
 	"golang.org/x/crypto/ripemd160"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/rename"
 	"github.com/conformal/btcwire"
 )

keystore/keystore_test.go

@@ -23,10 +23,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
 
 	"github.com/davecgh/go-spew/spew"

rescan.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/conformal/btcutil"
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwire"

rpcserver.go

@@ -37,11 +37,11 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcrpcclient"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"

txstore/json.go

@@ -17,11 +17,11 @@
 package txstore
 
 import (
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 )
 
 // ToJSON returns a slice of btcjson listtransactions result types for all credits

txstore/serialization.go

@@ -27,7 +27,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/conformal/btcutil"
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcwallet/rename"
 	"github.com/conformal/btcwire"
 )

txstore/tx.go

@@ -24,10 +24,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcnet"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwire"
 )
 

txstore/tx_test.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil"
 	. "github.com/conformal/btcwallet/txstore"
 	"github.com/conformal/btcwire"
 )

votingpool/internal_test.go

@@ -17,7 +17,7 @@
 package votingpool
 
 import (
-	"github.com/conformal/btcutil/hdkeychain"
+	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/conformal/btcwallet/waddrmgr"
 	"github.com/conformal/btcwallet/walletdb"
 )

votingpool/pool.go

@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/conformal/btcscript"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcutil/hdkeychain"
 	"github.com/conformal/btcwallet/waddrmgr"
 	"github.com/conformal/btcwallet/walletdb"
 )

votingpool/pool_test.go

@@ -27,8 +27,8 @@ import (
 	"runtime"
 	"testing"
 
+	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil/hdkeychain"
 	"github.com/conformal/btcwallet/votingpool"
 	"github.com/conformal/btcwallet/waddrmgr"
 	"github.com/conformal/btcwallet/walletdb"

waddrmgr/address.go

@@ -22,9 +22,9 @@ import (
 	"math/big"
 	"sync"
 
+	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/conformal/btcec"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcutil/hdkeychain"
 )
 
 // zero sets all bytes in the passed slice to zero.  This is used to

waddrmgr/error.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/conformal/btcutil/hdkeychain"
+	"github.com/btcsuite/btcutil/hdkeychain"
 )
 
 var (

waddrmgr/manager.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcutil/hdkeychain"
 	"github.com/conformal/btcec"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil"
-	"github.com/conformal/btcutil/hdkeychain"
 	"github.com/conformal/btcwallet/snacl"
 	"github.com/conformal/btcwallet/walletdb"
 	"github.com/conformal/btcwire"

waddrmgr/manager_test.go

@@ -23,8 +23,8 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/waddrmgr"
 	"github.com/conformal/btcwallet/walletdb"
 	"github.com/conformal/btcwire"

wallet.go

@@ -26,10 +26,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/btcutil"
 	"github.com/conformal/btcchain"
 	"github.com/conformal/btcjson"
 	"github.com/conformal/btcnet"
-	"github.com/conformal/btcutil"
 	"github.com/conformal/btcwallet/chain"
 	"github.com/conformal/btcwallet/keystore"
 	"github.com/conformal/btcwallet/txstore"