fix chainparams config & imported classes

chainparams.go

@@ -2,12 +2,11 @@ package main
 
 import (
 	"github.com/Actinium-project/acmd/chaincfg"
+	actiniumCfg "github.com/Actinium-project/acmd/chaincfg"
 	bitcoinCfg "github.com/Actinium-project/acmd/chaincfg"
 	"github.com/Actinium-project/acmd/chaincfg/chainhash"
 	bitcoinWire "github.com/Actinium-project/acmd/wire"
 	"github.com/Actinium-project/lnd/keychain"
-	actiniumCfg "github.com/Actinium-project/acmd/chaincfg"
-	actiniumWire "github.com/Actinium-project/acmd/wire"
 )
 
 // activeNetParams is a pointer to the parameters specific to the currently
@@ -33,7 +32,7 @@ type actiniumNetParams struct {
 // bitcoinTestNetParams contains parameters specific to the 3rd version of the
 // test network.
 var bitcoinTestNetParams = bitcoinNetParams{
-	Params:   &bitcoinCfg.TestNet3Params,
+	Params:   &bitcoinCfg.TestNet4Params,
 	rpcPort:  "18334",
 	CoinType: keychain.CoinTypeTestnet,
 }
@@ -122,7 +121,7 @@ func applyActiniumParams(params *bitcoinNetParams, actiniumParams *actiniumNetPa
 // parameter configuration.
 func isTestnet(params *bitcoinNetParams) bool {
 	switch params.Params.Net {
-	case bitcoinWire.TestNet3, bitcoinWire.BitcoinNet(actiniumWire.TestNet4):
+	case bitcoinWire.TestNet4:
 		return true
 	default:
 		return false

chainregistry.go

@@ -12,6 +12,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Actinium-project/acmd/chaincfg/chainhash"
+	"github.com/Actinium-project/acmd/rpcclient"
+	"github.com/Actinium-project/acmutil"
+	"github.com/Actinium-project/acmwallet/chain"
+	"github.com/Actinium-project/acmwallet/wallet"
+	"github.com/Actinium-project/acmwallet/walletdb"
+	neutrino "github.com/Actinium-project/actrino"
 	"github.com/Actinium-project/lnd/chainntnfs"
 	"github.com/Actinium-project/lnd/chainntnfs/bitcoindnotify"
 	"github.com/Actinium-project/lnd/chainntnfs/btcdnotify"
@@ -24,13 +31,6 @@ import (
 	"github.com/Actinium-project/lnd/lnwallet/btcwallet"
 	"github.com/Actinium-project/lnd/lnwire"
 	"github.com/Actinium-project/lnd/routing/chainview"
-	"github.com/Actinium-project/acmd/chaincfg/chainhash"
-	"github.com/Actinium-project/acmd/rpcclient"
-	"github.com/Actinium-project/acmutil"
-	"github.com/Actinium-project/acmwallet/chain"
-	"github.com/Actinium-project/acmwallet/wallet"
-	"github.com/Actinium-project/acmwallet/walletdb"
-	"github.com/Actinium-project/actrino"
 )
 
 const (

go.mod

@@ -1,20 +1,16 @@
 module github.com/Actinium-project/lnd
 
 require (
-	git.schwanenlied.me/yawning/bsaes.git v0.0.0-20180720073208-c0276d75487e // indirect
 	github.com/Actinium-project/acmd v0.0.12
 	github.com/Actinium-project/acmutil v0.0.8
 	github.com/Actinium-project/acmwallet v0.0.5
 	github.com/Actinium-project/actrino v0.0.2
-	github.com/Actinium-project/lightning-onion v0.0.1
-	github.com/NebulousLabs/fastrand v0.0.0-20180208210444-3cf7173006a0 // indirect
+	github.com/Actinium-project/lightning-onion v0.0.2
+	github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e // indirect
 	github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82
 	github.com/Yawning/aez v0.0.0-20180114000226-4dad034d9db2
-	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
-	github.com/boltdb/bolt v1.3.1 // indirect
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
 	github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941
-	github.com/btcsuite/goleveldb v1.0.0 // indirect
 	github.com/coreos/bbolt v1.3.2
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-errors/errors v1.0.1
@@ -24,25 +20,17 @@ require (
 	github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/jrick/logrotate v1.0.0
-	github.com/juju/clock v0.0.0-20180808021310-bab88fc67299 // indirect
-	github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5 // indirect
-	github.com/juju/loggo v0.0.0-20180524022052-584905176618 // indirect
-	github.com/juju/retry v0.0.0-20180821225755-9058e192b216 // indirect
-	github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073 // indirect
-	github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect
-	github.com/juju/version v0.0.0-20180108022336-b64dbd566305 // indirect
+	github.com/juju/loggo v0.0.0-20190212223446-d976af380377 // indirect
 	github.com/kkdai/bstream v0.0.0-20181106074824-b3251f7901ec
 	github.com/miekg/dns v0.0.0-20171125082028-79bfde677fa8
-	github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af // indirect
+	github.com/rogpeppe/fastuuid v1.0.0 // indirect
 	github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02
 	github.com/urfave/cli v1.18.0
 	golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67
 	golang.org/x/net v0.0.0-20190206173232-65e2d4e15006
 	golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2
 	google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922
 	google.golang.org/grpc v1.18.0
-	gopkg.in/errgo.v1 v1.0.0 // indirect
 	gopkg.in/macaroon-bakery.v2 v2.0.1
 	gopkg.in/macaroon.v2 v2.0.0
-	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
 )

go.sum

@@ -19,10 +19,14 @@ github.com/Actinium-project/acmwallet v0.0.5/go.mod h1:+2n5r8AFyzSScslUBdwsYm7bH
 github.com/Actinium-project/actrino v0.0.1/go.mod h1:36slvODVE7VautvYVsKL0TgJ4pnJLehzV6ZRi22riFo=
 github.com/Actinium-project/actrino v0.0.2 h1:+0GQBQ77OSQRuZdyN7n8l0Xn4NJJxMqO13XJPx1oP9s=
 github.com/Actinium-project/actrino v0.0.2/go.mod h1:zFRfMbcZ0XDloU4JV7XYegg0Qw90JQ2tVi7RcsP8I6Y=
-github.com/Actinium-project/lightning-onion v0.0.1 h1:XvOoMWtiDc0K7ffdt2EpKtF3wnrOn0mDIeIN/A637yQ=
 github.com/Actinium-project/lightning-onion v0.0.1/go.mod h1:vwGJUBPKnTSJLNAtTmgXmMABtmJf5YL+HXmpPkzCuW8=
+github.com/Actinium-project/lightning-onion v0.0.2 h1:effaIsM5GThn3I2HgdfkzRgGp3avCdFrEgt7ZIAYbcM=
+github.com/Actinium-project/lightning-onion v0.0.2/go.mod h1:JfD72RcLrnAlrPh6Y5pMKp5JG1djypXKS9K4fvCAiIY=
+github.com/Actinium-project/lnd v0.0.5/go.mod h1:wZPWINenra+pfQ9Zy9RzGfUp0d66T/2UTPxqpJCbXFE=
 github.com/NebulousLabs/fastrand v0.0.0-20180208210444-3cf7173006a0 h1:g/ETZwHx5wN2fqKWS3gCUrEU7dLko+DvVs3hakQCfyE=
 github.com/NebulousLabs/fastrand v0.0.0-20180208210444-3cf7173006a0/go.mod h1:Bdzq+51GR4/0DIhaICZEOm+OHvXGwwB2trKZ8B4Y6eQ=
+github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e h1:n+DcnTNkQnHlwpsrHoQtkrJIO7CBx029fw6oR4vIob4=
+github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e/go.mod h1:Bdzq+51GR4/0DIhaICZEOm+OHvXGwwB2trKZ8B4Y6eQ=
 github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82 h1:MG93+PZYs9PyEsj/n5/haQu2gK0h4tUtSy9ejtMwWa0=
 github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82/go.mod h1:GbuBk21JqF+driLX3XtJYNZjGa45YDoa9IqCTzNSfEc=
 github.com/Yawning/aez v0.0.0-20180114000226-4dad034d9db2 h1:2be4ykKKov3M1yISM2E8gnGXZ/N2SsPawfnGiXxaYEU=
@@ -32,11 +36,9 @@ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSi
 github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
-github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32 h1:qkOC5Gd33k54tobS36cXdAzJbeHaduLtnLQQwNoIi78=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
-github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803 h1:j3AgPKKZtZStM2nyhrDSLSYgT7YHrZKdSkq1OYeLjvM=
 github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941 h1:kij1x2aL7VE6gtx8KMIt8PGPgI5GV9LgtHFG5KaEMPY=
 github.com/btcsuite/fastsha256 v0.0.0-20160815193821-637e65642941/go.mod h1:QcFA8DZHtuIAdYKCq/BzELOaznRsCvwf4zTPmaYwaig=
@@ -83,6 +85,8 @@ github.com/juju/clock v0.0.0-20180808021310-bab88fc67299/go.mod h1:nD0vlnrUjcjJh
 github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
 github.com/juju/loggo v0.0.0-20180524022052-584905176618 h1:MK144iBQF9hTSwBW/9eJm034bVoG30IshVm688T2hi8=
 github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
+github.com/juju/loggo v0.0.0-20190212223446-d976af380377 h1:n6QjW3g5JNY3xPmIjFt6z1H6tFQA6BhwOC2bvTAm1YU=
+github.com/juju/loggo v0.0.0-20190212223446-d976af380377/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
 github.com/juju/retry v0.0.0-20180821225755-9058e192b216/go.mod h1:OohPQGsr4pnxwD5YljhQ+TZnuVRYpa5irjugL1Yuif4=
 github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
 github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d/go.mod h1:6/KLg8Wz/y2KVGWEpkK9vMNGkOnu4k/cqs8Z1fKjTOk=
@@ -104,6 +108,8 @@ github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af h1:gu+uRPtBe88sKxUCEXRoeCvVG90TJmwhiqRpvdhQFng=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/fastuuid v1.0.0 h1:f5eq2L8Y87sP63CaPojeD05ON4/AEe/wejW/jp8N6QQ=
+github.com/rogpeppe/fastuuid v1.0.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 h1:tcJ6OjwOMvExLlzrAVZute09ocAGa7KqOON60++Gz4E=
 github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02/go.mod h1:tHlrkM198S068ZqfrO6S8HsoJq2bF3ETfTL+kt4tInY=
 github.com/urfave/cli v1.18.0 h1:m9MfmZWX7bwr9kUcs/Asr95j0IVXzGNNc+/5ku2m26Q=

log.go

@@ -9,7 +9,7 @@ import (
 	"github.com/Actinium-project/acmd/connmgr"
 	"github.com/btcsuite/btclog"
 	"github.com/jrick/logrotate/rotator"
-	"github.com/Actinium-project/actrino"
+	neutrino "github.com/Actinium-project/actrino"
 	"github.com/Actinium-project/lightning-onion"
 	"github.com/Actinium-project/lnd/autopilot"
 	"github.com/Actinium-project/lnd/build"