use newer lbcutil, rename refs for it

blockchain/accept.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/lbryio/lbcd/database"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // maybeAcceptBlock potentially accepts a block into the block chain and, if

blockchain/chain.go

@@ -16,7 +16,7 @@ import (
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 
 	"github.com/lbryio/lbcd/claimtrie"
 )

blockchain/chainio.go

@@ -15,7 +15,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

blockchain/checkpoints.go

@@ -11,7 +11,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/txscript"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // CheckpointConfirmations is the number of blocks before the end of the current

blockchain/claimtrie.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 
 	"github.com/lbryio/lbcd/claimtrie"
 	"github.com/lbryio/lbcd/claimtrie/change"

blockchain/common_test.go

@@ -20,7 +20,7 @@ import (
 	_ "github.com/lbryio/lbcd/database/ffldb"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

blockchain/fullblocktests/generate.go

@@ -24,7 +24,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

blockchain/indexers/addrindex.go

@@ -15,7 +15,7 @@ import (
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

blockchain/indexers/blocklogger.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btclog"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // blockProgressLogger provides periodic logging for other services in order

blockchain/indexers/cfindex.go

@@ -12,9 +12,9 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	"github.com/btcsuite/btcutil/gcs"
+	"github.com/lbryio/lbcutil/gcs"
-	"github.com/btcsuite/btcutil/gcs/builder"
+	"github.com/lbryio/lbcutil/gcs/builder"
 )
 
 const (

blockchain/indexers/common.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/database"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 var (

blockchain/indexers/manager.go

@@ -12,7 +12,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 var (

blockchain/indexers/txindex.go

@@ -12,7 +12,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

blockchain/merkle.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/txscript"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

blockchain/process.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/database"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // BehaviorFlags is a bitmask defining tweaks to the normal behavior when

blockchain/scriptval.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // txValidateItem holds a transaction along with which input to validate.

blockchain/utxoviewpoint.go

@@ -11,7 +11,7 @@ import (
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // txoFlags is a bitmask defining additional information and state for a

blockchain/validate.go

@@ -15,7 +15,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

blockchain/weight.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

btcjson/chainsvrresults.go

@@ -12,7 +12,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // GetBlockHeaderVerboseResult models the data from the getblockheader command when

btcjson/chainsvrresults_test.go

@@ -9,10 +9,10 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/davecgh/go-spew/spew"
 	"github.com/lbryio/lbcd/btcjson"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	"github.com/davecgh/go-spew/spew"
 )
 
 // TestChainSvrCustomResults ensures any results that have custom marshalling

btcjson/walletsvrcmds.go

@@ -12,7 +12,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // AddMultisigAddressCmd defines the addmutisigaddress JSON-RPC command.

btcjson/walletsvrcmds_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 
 	"github.com/lbryio/lbcd/btcjson"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // TestWalletSvrCmds tests all of the wallet server commands marshal and

btcjson/walletsvrresults_test.go

@@ -10,8 +10,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/lbryio/lbcd/txscript"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/lbryio/lbcd/txscript"
 )
 
 // TestGetAddressInfoResult ensures that custom unmarshalling of

chaincfg/doc.go

@@ -25,7 +25,7 @@
 //          "fmt"
 //          "log"
 //
-//          "github.com/btcsuite/btcutil"
+//          btcutil "github.com/lbryio/lbcutil"
 //          "github.com/lbryio/lbcd/chaincfg"
 //  )
 //

claimtrie/block/blockrepo/pebble.go

@@ -2,6 +2,7 @@ package blockrepo
 
 import (
 	"encoding/binary"
+
 	"github.com/pkg/errors"
 
 	"github.com/lbryio/lbcd/chaincfg/chainhash"

claimtrie/change/claimid.go

@@ -3,9 +3,10 @@ package change
 import (
 	"encoding/binary"
 	"encoding/hex"
+
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // ClaimID represents a Claim's ClaimID.

claimtrie/cmd/cmd/chain.go

@@ -16,7 +16,7 @@ import (
 	_ "github.com/lbryio/lbcd/database/ffldb"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/pebble"

claimtrie/cmd/cmd/node.go

@@ -6,10 +6,10 @@ import (
 	"math"
 	"path/filepath"
 
+	"github.com/cockroachdb/errors"
 	"github.com/lbryio/lbcd/claimtrie/change"
 	"github.com/lbryio/lbcd/claimtrie/node"
 	"github.com/lbryio/lbcd/claimtrie/node/noderepo"
-	"github.com/cockroachdb/errors"
 
 	"github.com/spf13/cobra"
 )

claimtrie/cmd/cmd/root.go

@@ -3,10 +3,10 @@ package cmd
 import (
 	"os"
 
+	"github.com/btcsuite/btclog"
 	"github.com/lbryio/lbcd/claimtrie/config"
 	"github.com/lbryio/lbcd/claimtrie/param"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btclog"
 
 	"github.com/spf13/cobra"
 )

claimtrie/config/config.go

@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 
 	"github.com/lbryio/lbcd/claimtrie/param"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 var DefaultConfig = Config{

claimtrie/merkletrie/collapsedtrie_test.go

@@ -2,10 +2,11 @@ package merkletrie
 
 import (
 	"bytes"
-	"github.com/stretchr/testify/assert"
 	"math/rand"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func b(value string) []byte      { return []byte(value) }

claimtrie/merkletrie/merkletrie.go

@@ -3,11 +3,12 @@ package merkletrie
 import (
 	"bytes"
 	"fmt"
-	"github.com/pkg/errors"
 	"runtime"
 	"sort"
 	"sync"
 
+	"github.com/pkg/errors"
+
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/claimtrie/node"
 )

claimtrie/merkletrie/merkletrierepo/pebble.go

@@ -1,9 +1,10 @@
 package merkletrierepo
 
 import (
+	"io"
+
 	"github.com/cockroachdb/pebble"
 	"github.com/pkg/errors"
-	"io"
 )
 
 type Pebble struct {

claimtrie/node/log.go

@@ -1,8 +1,9 @@
 package node
 
 import (
-	"github.com/btcsuite/btclog"
 	"sync"
+
+	"github.com/btcsuite/btclog"
 )
 
 // log is a logger that is initialized with no output filters.  This

claimtrie/node/manager.go

@@ -2,9 +2,10 @@ package node
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	"sort"
 
+	"github.com/pkg/errors"
+
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/claimtrie/change"
 	"github.com/lbryio/lbcd/claimtrie/param"

claimtrie/node/noderepo/pebble.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"sort"
 
-	"github.com/lbryio/lbcd/claimtrie/change"
 	"github.com/cockroachdb/pebble"
+	"github.com/lbryio/lbcd/claimtrie/change"
 	"github.com/pkg/errors"
 )
 

claimtrie/normalization/normalizer_icu_test.go

@@ -4,9 +4,10 @@ package normalization
 
 import (
 	"encoding/hex"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"unicode/utf8"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestNormalizationICU(t *testing.T) {
@@ -28,4 +29,4 @@ func TestBlock760150(t *testing.T) {
 	a = normalizeGo([]byte(test2))
 	b = normalizeICU([]byte(test2))
 	assert.Equal(t, a, b)
-}
+}

cmd/addblock/addblock.go

@@ -8,11 +8,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/btcsuite/btclog"
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/blockchain/indexers"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/limits"
-	"github.com/btcsuite/btclog"
 )
 
 const (

cmd/addblock/config.go

@@ -9,12 +9,12 @@ import (
 	"os"
 	"path/filepath"
 
+	flags "github.com/jessevdk/go-flags"
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/database"
 	_ "github.com/lbryio/lbcd/database/ffldb"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	flags "github.com/jessevdk/go-flags"
 )
 
 const (

cmd/addblock/import.go

@@ -16,7 +16,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 var zeroHash = chainhash.Hash{}

cmd/findcheckpoint/config.go

@@ -9,12 +9,12 @@ import (
 	"os"
 	"path/filepath"
 
+	flags "github.com/jessevdk/go-flags"
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/database"
 	_ "github.com/lbryio/lbcd/database/ffldb"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	flags "github.com/jessevdk/go-flags"
 )
 
 const (

cmd/gencerts/gencerts.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/btcsuite/btcutil"
 	flags "github.com/jessevdk/go-flags"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 type config struct {

cmd/lbcctl/config.go

@@ -13,10 +13,10 @@ import (
 	"regexp"
 	"strings"
 
+	flags "github.com/jessevdk/go-flags"
 	"github.com/lbryio/lbcd/btcjson"
 	"github.com/lbryio/lbcd/chaincfg"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	flags "github.com/jessevdk/go-flags"
 )
 
 const (

cmd/lbcctl/httpclient.go

@@ -10,8 +10,8 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/lbryio/lbcd/btcjson"
 	"github.com/btcsuite/go-socks/socks"
+	"github.com/lbryio/lbcd/btcjson"
 )
 
 // newHTTPClient returns a new HTTP client that is configured according to the

config.go

@@ -21,6 +21,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/btcsuite/go-socks/socks"
+	flags "github.com/jessevdk/go-flags"
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
@@ -29,9 +31,7 @@ import (
 	_ "github.com/lbryio/lbcd/database/ffldb"
 	"github.com/lbryio/lbcd/mempool"
 	"github.com/lbryio/lbcd/peer"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	"github.com/btcsuite/go-socks/socks"
-	flags "github.com/jessevdk/go-flags"
 )
 
 const (

database/cmd/dbtool/globalconfig.go

@@ -14,7 +14,7 @@ import (
 	"github.com/lbryio/lbcd/database"
 	_ "github.com/lbryio/lbcd/database/ffldb"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 var (

database/cmd/dbtool/insecureimport.go

@@ -15,7 +15,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // importCmd defines the configuration options for the insecureimport command.

database/cmd/dbtool/main.go

@@ -9,9 +9,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lbryio/lbcd/database"
 	"github.com/btcsuite/btclog"
 	flags "github.com/jessevdk/go-flags"
+	"github.com/lbryio/lbcd/database"
 )
 
 const (

database/ffldb/db.go

@@ -14,11 +14,6 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/lbryio/lbcd/chaincfg/chainhash"
-	"github.com/lbryio/lbcd/database"
-	"github.com/lbryio/lbcd/database/ffldb/treap"
-	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
 	"github.com/btcsuite/goleveldb/leveldb"
 	"github.com/btcsuite/goleveldb/leveldb/comparer"
 	ldberrors "github.com/btcsuite/goleveldb/leveldb/errors"
@@ -26,6 +21,11 @@ import (
 	"github.com/btcsuite/goleveldb/leveldb/iterator"
 	"github.com/btcsuite/goleveldb/leveldb/opt"
 	"github.com/btcsuite/goleveldb/leveldb/util"
+	"github.com/lbryio/lbcd/chaincfg/chainhash"
+	"github.com/lbryio/lbcd/database"
+	"github.com/lbryio/lbcd/database/ffldb/treap"
+	"github.com/lbryio/lbcd/wire"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

database/ffldb/dbcache.go

@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lbryio/lbcd/database/ffldb/treap"
 	"github.com/btcsuite/goleveldb/leveldb"
 	"github.com/btcsuite/goleveldb/leveldb/iterator"
 	"github.com/btcsuite/goleveldb/leveldb/util"
+	"github.com/lbryio/lbcd/database/ffldb/treap"
 )
 
 const (

database/ffldb/driver.go

@@ -7,9 +7,9 @@ package ffldb
 import (
 	"fmt"
 
+	"github.com/btcsuite/btclog"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btclog"
 )
 
 var log = btclog.Disabled

database/ffldb/interface_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 var (

database/ffldb/ldbtreapiter.go

@@ -5,9 +5,9 @@
 package ffldb
 
 import (
-	"github.com/lbryio/lbcd/database/ffldb/treap"
 	"github.com/btcsuite/goleveldb/leveldb/iterator"
 	"github.com/btcsuite/goleveldb/leveldb/util"
+	"github.com/lbryio/lbcd/database/ffldb/treap"
 )
 
 // ldbTreapIter wraps a treap iterator to provide the additional functionality

database/interface.go

@@ -9,7 +9,7 @@ package database
 
 import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // Cursor represents a cursor over key/value pairs and nested buckets of a

docs/json_rpc_api.md

@@ -1092,7 +1092,7 @@ import (
 	"path/filepath"
 
 	"github.com/lbryio/lbcd/rpcclient"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 func main() {
@@ -1156,7 +1156,7 @@ import (
 
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/rpcclient"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 func main() {
@@ -1248,7 +1248,7 @@ import (
 
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/rpcclient"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 func main() {

go.mod

@@ -3,9 +3,7 @@ module github.com/lbryio/lbcd
 go 1.16
 
 require (
-	github.com/btcsuite/btcd v0.22.0-beta // indirect
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
-	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
 	github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd
 	github.com/btcsuite/goleveldb v1.0.0
 	github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
@@ -18,11 +16,12 @@ require (
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/jrick/logrotate v1.0.0
 	github.com/kkdai/bstream v1.0.0 // indirect
+	github.com/lbryio/lbcutil v1.0.200
 	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil/v3 v3.21.7
 	github.com/spf13/cobra v1.1.3
 	github.com/stretchr/testify v1.7.0
 	github.com/vmihailenco/msgpack/v5 v5.3.2
-	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
 	golang.org/x/text v0.3.6
 )

go.sum

@@ -44,7 +44,6 @@ github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN
 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-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
-github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ=
 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
 github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
 github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
@@ -253,6 +252,12 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/lbryio/lbcd v0.22.100-beta/go.mod h1:u8SaFX4xdGMMR5xasBGfgApC8pvD4rnK2OujZnrq5gs=
+github.com/lbryio/lbcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
+github.com/lbryio/lbcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ=
+github.com/lbryio/lbcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
+github.com/lbryio/lbcutil v1.0.200 h1:MtNH3ZbpLoSM64Vplt+H7EavFxZ2YxhJJ94b4oyBMxc=
+github.com/lbryio/lbcutil v1.0.200/go.mod h1:gDHc/b+Rdz3J7+VB8e5/Bl9roVf8Q5/8FQCyuK9dXD0=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -397,6 +402,8 @@ golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -477,6 +484,7 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

integration/rpctest/blockgen.go

@@ -17,7 +17,7 @@ import (
 	"github.com/lbryio/lbcd/mining"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // solveBlock attempts to find a nonce which makes the passed block header hash

integration/rpctest/memwallet.go

@@ -17,8 +17,8 @@ import (
 	"github.com/lbryio/lbcd/rpcclient"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	"github.com/btcsuite/btcutil/hdkeychain"
+	"github.com/lbryio/lbcutil/hdkeychain"
 )
 
 var (

integration/rpctest/node.go

@@ -15,7 +15,7 @@ import (
 	"time"
 
 	rpc "github.com/lbryio/lbcd/rpcclient"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // nodeConfig contains all the args, and data required to launch a btcd process

integration/rpctest/rpc_harness.go

@@ -20,7 +20,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/rpcclient"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

mempool/estimatefee.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/mining"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // TODO incorporate Alex Morcos' modifications to Gavin's initial model

mempool/estimatefee_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/mining"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // newTestFeeEstimator creates a feeEstimator with some different parameters

mempool/mempool.go

@@ -20,7 +20,7 @@ import (
 	"github.com/lbryio/lbcd/mining"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

mempool/policy.go

@@ -11,7 +11,7 @@ import (
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

mining/cpuminer/cpuminer.go

@@ -17,7 +17,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/mining"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

mining/mining.go

@@ -15,7 +15,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

mining/mining_test.go

@@ -9,7 +9,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // TestTxFeePrioHeap ensures the priority queue for transaction fees and

mining/policy.go

@@ -7,7 +7,7 @@ package mining
 import (
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

mining/policy_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // newHashFromStr converts the passed big-endian hex string into a

netsync/blocklogger.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btclog"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // blockProgressLogger provides periodic logging for other services in order

netsync/interface.go

@@ -11,7 +11,7 @@ import (
 	"github.com/lbryio/lbcd/mempool"
 	"github.com/lbryio/lbcd/peer"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // PeerNotifier exposes methods to notify peers of status changes to

netsync/manager.go

@@ -19,7 +19,7 @@ import (
 	"github.com/lbryio/lbcd/mempool"
 	peerpkg "github.com/lbryio/lbcd/peer"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

peer/log.go

@@ -9,10 +9,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/btcsuite/btclog"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btclog"
 )
 
 const (

peer/peer.go

@@ -18,13 +18,13 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/go-socks/socks"
+	"github.com/davecgh/go-spew/spew"
+	"github.com/decred/dcrd/lru"
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/go-socks/socks"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/decred/dcrd/lru"
 )
 
 const (

resourceLogging.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/mem"
 	"github.com/shirou/gopsutil/v3/process"

rpcadapters.go

@@ -13,7 +13,7 @@ import (
 	"github.com/lbryio/lbcd/netsync"
 	"github.com/lbryio/lbcd/peer"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // rpcPeer provides a peer for use with the RPC server and implements the

rpcclient/example_test.go

@@ -6,6 +6,7 @@ package rpcclient
 
 import (
 	"fmt"
+
 	"github.com/lbryio/lbcd/btcjson"
 )
 

rpcclient/examples/btcdwebsockets/main.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/lbryio/lbcd/rpcclient"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 func main() {

rpcclient/examples/btcwalletwebsockets/main.go

@@ -10,9 +10,9 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/lbryio/lbcd/rpcclient"
-	"github.com/btcsuite/btcutil"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/lbryio/lbcd/rpcclient"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 func main() {

rpcclient/extensions.go

@@ -15,7 +15,7 @@ import (
 	"github.com/lbryio/lbcd/btcjson"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // FutureDebugLevelResult is a future promise to deliver the result of a

rpcclient/infrastructure.go

@@ -25,10 +25,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/lbryio/lbcd/btcjson"
-	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/btcsuite/go-socks/socks"
 	"github.com/btcsuite/websocket"
+	"github.com/lbryio/lbcd/btcjson"
+	"github.com/lbryio/lbcd/chaincfg"
 )
 
 var (

rpcclient/mining.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/lbryio/lbcd/btcjson"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // FutureGenerateResult is a future promise to deliver the result of a

rpcclient/notify.go

@@ -16,7 +16,7 @@ import (
 	"github.com/lbryio/lbcd/btcjson"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 var (

rpcclient/rawtransactions.go

@@ -12,7 +12,7 @@ import (
 	"github.com/lbryio/lbcd/btcjson"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

rpcclient/wallet.go

@@ -12,7 +12,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // *****************************

rpcserver.go

@@ -27,6 +27,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/btcsuite/websocket"
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/blockchain/indexers"
 	"github.com/lbryio/lbcd/btcec"
@@ -40,8 +41,7 @@ import (
 	"github.com/lbryio/lbcd/peer"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	"github.com/btcsuite/websocket"
 )
 
 // API version constants

rpcwebsocket.go

@@ -20,6 +20,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/btcsuite/websocket"
 	"github.com/lbryio/lbcd/blockchain"
 	"github.com/lbryio/lbcd/btcjson"
 	"github.com/lbryio/lbcd/chaincfg"
@@ -27,8 +28,7 @@ import (
 	"github.com/lbryio/lbcd/database"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	"github.com/btcsuite/websocket"
 	"golang.org/x/crypto/ripemd160"
 )
 

server.go

@@ -38,8 +38,8 @@ import (
 	"github.com/lbryio/lbcd/peer"
 	"github.com/lbryio/lbcd/txscript"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
-	"github.com/btcsuite/btcutil/bloom"
+	"github.com/lbryio/lbcutil/bloom"
 )
 
 const (

txscript/hashcache_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/lbryio/lbcd/wire"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/lbryio/lbcd/wire"
 )
 
 func init() {

txscript/pkscript.go

@@ -8,7 +8,7 @@ import (
 	"github.com/lbryio/lbcd/btcec"
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 	"golang.org/x/crypto/ripemd160"
 )
 

txscript/sign.go

@@ -11,7 +11,7 @@ import (
 	"github.com/lbryio/lbcd/btcec"
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 // RawTxInWitnessSignature returns the serialized ECDA signature for the input

txscript/sign_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 type addressToKey struct {

txscript/standard.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/lbryio/lbcd/chaincfg"
 	"github.com/lbryio/lbcd/wire"
-	"github.com/btcsuite/btcutil"
+	btcutil "github.com/lbryio/lbcutil"
 )
 
 const (

wire/invvect_test.go

@@ -9,8 +9,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/lbryio/lbcd/chaincfg/chainhash"
 )
 
 // TestInvVectStringer tests the stringized output for inventory vector types.

wire/msggetdata_test.go

@@ -10,8 +10,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/lbryio/lbcd/chaincfg/chainhash"
 )
 
 // TestGetData tests the MsgGetData API.

wire/msginv_test.go

@@ -10,8 +10,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/lbryio/lbcd/chaincfg/chainhash"
 )
 
 // TestInv tests the MsgInv API.

wire/msgnotfound_test.go

@@ -10,8 +10,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/lbryio/lbcd/chaincfg/chainhash"
 )
 
 // TestNotFound tests the MsgNotFound API.

wire/msgtx_test.go

@@ -11,8 +11,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/lbryio/lbcd/chaincfg/chainhash"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/lbryio/lbcd/chaincfg/chainhash"
 )
 
 // TestTx tests the MsgTx API.