Fix build.

account.go

@@ -358,7 +358,7 @@ func (a *Account) ImportPrivateKey(pk []byte, compressed bool, bs *wallet.BlockS
 	if err != nil {
 		return "", err
 	}
-	addrStr := addr.String()
+	addrStr := addr.EncodeAddress()
 
 	// Immediately write wallet to disk.
 	AcctMgr.ds.ScheduleWalletWrite(a)

createtx.go

@@ -182,7 +182,7 @@ func (a *Account) txToPairs(pairs map[string]int64, minconf int) (*CreatedTx, er
 
 	// These are nil/zeroed until a change address is needed, and reused
 	// again in case a change utxo has already been chosen.
-	var changeAddr *btcutil.AddressPubKeyHash
+	var changeAddr btcutil.Address
 
 	var selectedInputs []*tx.RecvTxOut
 	hasChange := false