claim/decode.go

@@ -5,8 +5,8 @@ import (
 
 	types "github.com/lbryio/types/v2/go"
 
-	"google.golang.org/protobuf/encoding/protojson"
-	"google.golang.org/protobuf/proto"
+	"github.com/golang/protobuf/jsonpb"
+	"github.com/golang/protobuf/proto"
 )
 
 func ToJSON(value []byte) (string, error) {
@@ -17,8 +17,8 @@ func ToJSON(value []byte) (string, error) {
 	}
 
 	b := bytes.NewBuffer(nil)
-	m := protojson.MarshalOptions{Indent: "  "}
-	b, err = m.Marshal(c)
+	m := jsonpb.Marshaler{Indent: "  "}
+	err = m.Marshal(b, c)
 
 	return b.String(), err
 }

extras/crypto/crypto.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 
-	"github.com/lbryio/lbcutil/base58"
+	"github.com/btcsuite/btcutil/base58"
 	"golang.org/x/crypto/sha3"
 )
 

extras/jsonrpc/daemon_types.go

@@ -3,7 +3,7 @@ package jsonrpc
 import (
 	"encoding/hex"
 	"encoding/json"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"reflect"
@@ -386,7 +386,7 @@ func (c *Claim) GetStreamSizeByMagic() (streamSize uint64, e error) {
 	}
 	defer resp.Body.Close()
 
-	body, err := io.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return 0, errors.Err(err)
 	}
@@ -409,7 +409,7 @@ func (c *Claim) GetStreamSizeByMagic() (streamSize uint64, e error) {
 	}
 	defer resp2.Body.Close()
 
-	body2, err := io.ReadAll(resp2.Body)
+	body2, err := ioutil.ReadAll(resp2.Body)
 	if err != nil {
 		return 0, errors.Err(err)
 	}
@@ -442,7 +442,7 @@ const (
 
 type SpecialContentType string
 
-// IsContentSpecial returns true if the claim is of a special content type
+//IsContentSpecial returns true if the claim is of a special content type
 func (c *Claim) IsContentSpecial(specialTags ...SpecialContentType) bool {
 	for _, t := range c.Value.GetTags() {
 		for _, ct := range specialTags {
@@ -599,7 +599,7 @@ type transactionListBlob struct {
 	Nout         int    `json:"nout"`
 }
 
-// TODO: this repeats all the fields from transactionListBlob which doesn't make sense
+//TODO: this repeats all the fields from transactionListBlob which doesn't make sense
 // but if i extend the type with transactionListBlob it doesn't fill the fields. does our unmarshaller crap out on these?
 type supportBlob struct {
 	Address      string `json:"address"`

extras/lbryinc/client.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"time"
@@ -197,7 +197,7 @@ func (c Client) doCall(url string, payload string) ([]byte, error) {
 		return body, fmt.Errorf("server returned non-OK status: %v", r.StatusCode)
 	}
 	defer r.Body.Close()
-	return io.ReadAll(r.Body)
+	return ioutil.ReadAll(r.Body)
 }
 
 // CallResource calls a remote internal-apis server resource, returning a response,

go.mod

@@ -1,8 +1,12 @@
-go 1.20
+go 1.18
 
 module github.com/lbryio/lbry.go/v2
 
+replace github.com/btcsuite/btcd => github.com/lbryio/lbrycrd.go v0.0.0-20200203050410-e1076f12bf19
+
 require (
+	github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32
+	github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d
 	github.com/davecgh/go-spew v1.1.1
 	github.com/fatih/structs v1.1.0
 	github.com/go-errors/errors v1.4.2
@@ -10,8 +14,6 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/rpc v1.2.0
-	github.com/lbryio/lbcd v0.22.119
-	github.com/lbryio/lbcutil v1.0.202
 	github.com/lbryio/ozzo-validation v3.0.3-0.20170512160344-202201e212ec+incompatible
 	github.com/lbryio/types v0.0.0-20220224142228-73610f6654a6
 	github.com/lyoshenka/bencode v0.0.0-20180323155644-b7abd7672df5
@@ -42,11 +44,12 @@ require (
 	github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/onsi/gomega v1.7.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/sys v0.6.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -3,14 +3,16 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 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 h1:yJzD/yFppdVCf6ApMkVy8cUxV0XrxdP9rVf6D87/Mng=
+github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 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=
+github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
+github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
-github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
-github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ=
+github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -24,13 +26,11 @@ github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho=
 github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
@@ -42,20 +42,16 @@ github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36j
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
-github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA=
+github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lbryio/lbcd v0.22.119 h1:eWUUYDO0ilQzaHQIyAZywshTGmVIvK9WMl2fGMQ990I=
-github.com/lbryio/lbcd v0.22.119/go.mod h1:YZ2Vi4khEheO7hllkWhDdScXmHhXCBzK4xIQcVDcozs=
-github.com/lbryio/lbcutil v1.0.202 h1:L0aRMs2bdCUAicD8Xe4NmUEvevDDea3qkIpCSACnftI=
-github.com/lbryio/lbcutil v1.0.202/go.mod h1:LGPtVBBzh4cFXfLFb8ginlFcbA2QwumLNFd0yk/as2o=
+github.com/lbryio/lbrycrd.go v0.0.0-20200203050410-e1076f12bf19 h1:/zWD8dVIl7bV1TdJWqPqy9tpqixzX2Qxgit48h3hQcY=
+github.com/lbryio/lbrycrd.go v0.0.0-20200203050410-e1076f12bf19/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/lbryio/ozzo-validation v3.0.3-0.20170512160344-202201e212ec+incompatible h1:OH/jgRO/2lQ73n7PgtK/CvLZ0dwAVr5G5s635+YfUA4=
 github.com/lbryio/ozzo-validation v3.0.3-0.20170512160344-202201e212ec+incompatible/go.mod h1:fbG/dzobG8r95KzMwckXiLMHfFjZaBRQqC9hPs2XAQ4=
 github.com/lbryio/types v0.0.0-20220224142228-73610f6654a6 h1:IhL9D2QfDWhLNDQpZ3Uiiw0gZEUYeLBS6uDqOd59G5o=
@@ -65,13 +61,16 @@ github.com/lyoshenka/bencode v0.0.0-20180323155644-b7abd7672df5/go.mod h1:H0aPCW
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
+github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/sebdah/goldie v1.0.0 h1:9GNhIat69MSlz/ndaBg48vl9dF5fI+NBB6kfOxgfkMc=
 github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
 github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
@@ -84,8 +83,6 @@ github.com/slack-go/slack v0.12.1 h1:X97b9g2hnITDtNsNe5GkGx6O2/Sz/uC20ejRZN6QxOw
 github.com/slack-go/slack v0.12.1/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
-github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -97,12 +94,11 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/vmihailenco/msgpack/v5 v5.3.2/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
-github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/ybbus/jsonrpc/v2 v2.1.7 h1:QjoXuZhkXZ3oLBkrONBe2avzFkYeYLorpeA+d8175XQ=
 github.com/ybbus/jsonrpc/v2 v2.1.7/go.mod h1:rIuG1+ORoiqocf9xs/v+ecaAVeo3zcZHQgInyKFMeg0=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
@@ -136,8 +132,6 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

lbrycrd/address.go

@@ -5,10 +5,9 @@ import (
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 
-	"github.com/lbryio/lbcd/chaincfg"
-	btcutil "github.com/lbryio/lbcutil"
-	"github.com/lbryio/lbcutil/base58"
-
+	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcutil/base58"
 	"golang.org/x/crypto/ripemd160"
 )
 

lbrycrd/channel.go

@@ -1,7 +1,7 @@
 package lbrycrd
 
 import (
-	"github.com/lbryio/lbcd/btcec"
+	"github.com/btcsuite/btcd/btcec"
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 	"github.com/lbryio/lbry.go/v2/schema/keys"
 	c "github.com/lbryio/lbry.go/v2/schema/stake"

lbrycrd/claim.go

@@ -7,8 +7,8 @@ import (
 	c "github.com/lbryio/lbry.go/v2/schema/stake"
 	pb "github.com/lbryio/types/v2/go"
 
-	"github.com/lbryio/lbcd/btcec"
-	"github.com/lbryio/lbcd/wire"
+	"github.com/btcsuite/btcd/btcec"
+	"github.com/btcsuite/btcd/wire"
 )
 
 func NewImageStreamClaim() (*c.StakeHelper, error) {

lbrycrd/client.go

@@ -6,17 +6,17 @@ import (
 	"os"
 	"strconv"
 
-	btcutil "github.com/lbryio/lbcutil"
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 	c "github.com/lbryio/lbry.go/v2/schema/stake"
 
+	"github.com/btcsuite/btcd/btcec"
+	"github.com/btcsuite/btcd/btcjson"
+	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
+	"github.com/btcsuite/btcd/rpcclient"
+	"github.com/btcsuite/btcd/wire"
+	"github.com/btcsuite/btcutil"
 	"github.com/go-ini/ini"
-	"github.com/lbryio/lbcd/btcec"
-	"github.com/lbryio/lbcd/btcjson"
-	"github.com/lbryio/lbcd/chaincfg"
-	"github.com/lbryio/lbcd/chaincfg/chainhash"
-	"github.com/lbryio/lbcd/rpcclient"
-	"github.com/lbryio/lbcd/wire"
 )
 
 const DefaultPort = 9245
@@ -117,7 +117,7 @@ func New(lbrycrdURL string, chainParams *chaincfg.Params) (*Client, error) {
 		Host:         u.Host,
 		User:         u.User.Username(),
 		Pass:         password,
-		Params:       chain.Name,
+		Params:       chain,
 		HTTPPostMode: true, // Bitcoin core only supports HTTP POST mode
 		DisableTLS:   true, // Bitcoin core does not provide TLS by default
 	}
@@ -158,7 +158,7 @@ func (c *Client) SimpleSend(toAddress string, amount float64) (*chainhash.Hash,
 		return nil, errors.Err(err)
 	}
 
-	hash, err := c.Client.SendToAddress(decodedAddress, lbcAmount, nil)
+	hash, err := c.Client.SendToAddress(decodedAddress, lbcAmount)
 	if err != nil {
 		if err.Error() == "-6: Insufficient funds" {
 			err = errors.Err(errInsufficientFunds)
@@ -211,7 +211,7 @@ func getLbrycrdURLFromConfFile() (string, error) {
 }
 
 func (c *Client) CreateBaseRawTx(inputs []btcjson.TransactionInput, change float64) (*wire.MsgTx, error) {
-	addresses := make(map[btcutil.Address]interface{})
+	addresses := make(map[btcutil.Address]btcutil.Amount)
 	changeAddress, err := c.GetNewAddress("")
 	if err != nil {
 		return nil, errors.Err(err)

lbrycrd/finder.go

@@ -3,7 +3,7 @@ package lbrycrd
 import (
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 
-	"github.com/lbryio/lbcd/btcjson"
+	"github.com/btcsuite/btcd/btcjson"
 )
 
 type outputFinder struct {

lbrycrd/script.go

@@ -3,10 +3,10 @@ package lbrycrd
 import (
 	"encoding/hex"
 
-	btcutil "github.com/lbryio/lbcutil"
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 
-	"github.com/lbryio/lbcd/txscript"
+	"github.com/btcsuite/btcd/txscript"
+	"github.com/btcsuite/btcutil"
 )
 
 func getClaimSupportPayoutScript(name, claimid string, address btcutil.Address) ([]byte, error) {
@@ -23,12 +23,12 @@ func getClaimSupportPayoutScript(name, claimid string, address btcutil.Address)
 	}
 
 	return txscript.NewScriptBuilder().
-		AddOp(txscript.OP_SUPPORTCLAIM). //OP_SUPPORT_CLAIM
-		AddData([]byte(name)).           //<name>
-		AddData(rev(bytes)).             //<claimid>
-		AddOp(txscript.OP_2DROP).        //OP_2DROP
-		AddOp(txscript.OP_DROP).         //OP_DROP
-		AddOps(pkscript).                //OP_DUP OP_HASH160 <address> OP_EQUALVERIFY OP_CHECKSIG
+		AddOp(txscript.OP_NOP7).  //OP_SUPPORT_CLAIM
+		AddData([]byte(name)).    //<name>
+		AddData(rev(bytes)).      //<claimid>
+		AddOp(txscript.OP_2DROP). //OP_2DROP
+		AddOp(txscript.OP_DROP).  //OP_DROP
+		AddOps(pkscript).         //OP_DUP OP_HASH160 <address> OP_EQUALVERIFY OP_CHECKSIG
 		Script()
 
 }
@@ -42,12 +42,12 @@ func getClaimNamePayoutScript(name string, value []byte, address btcutil.Address
 	}
 
 	return txscript.NewScriptBuilder().
-		AddOp(txscript.OP_CLAIMNAME). //OP_CLAIMNAME
-		AddData([]byte(name)).        //<name>
-		AddData(value).               //<value>
-		AddOp(txscript.OP_2DROP).     //OP_2DROP
-		AddOp(txscript.OP_DROP).      //OP_DROP
-		AddOps(pkscript).             //OP_DUP OP_HASH160 <address> OP_EQUALVERIFY OP_CHECKSIG
+		AddOp(txscript.OP_NOP6).  //OP_CLAIMNAME
+		AddData([]byte(name)).    //<name>
+		AddData(value).           //<value>
+		AddOp(txscript.OP_2DROP). //OP_2DROP
+		AddOp(txscript.OP_DROP).  //OP_DROP
+		AddOps(pkscript).         //OP_DUP OP_HASH160 <address> OP_EQUALVERIFY OP_CHECKSIG
 		Script()
 }
 
@@ -65,12 +65,12 @@ func getUpdateClaimPayoutScript(name, claimid string, value []byte, address btcu
 	}
 
 	return txscript.NewScriptBuilder().
-		AddOp(txscript.OP_UPDATECLAIM). //OP_UPDATE_CLAIM
-		AddData([]byte(name)).          //<name>
-		AddData(rev(bytes)).            //<claimid>
-		AddData(value).                 //<value>
-		AddOp(txscript.OP_2DROP).       //OP_2DROP
-		AddOp(txscript.OP_DROP).        //OP_DROP
-		AddOps(pkscript).               //OP_DUP OP_HASH160 <address> OP_EQUALVERIFY OP_CHECKSIG
+		AddOp(txscript.OP_NOP8).  //OP_UPDATE_CLAIM
+		AddData([]byte(name)).    //<name>
+		AddData(rev(bytes)).      //<claimid>
+		AddData(value).           //<value>
+		AddOp(txscript.OP_2DROP). //OP_2DROP
+		AddOp(txscript.OP_DROP).  //OP_DROP
+		AddOps(pkscript).         //OP_DUP OP_HASH160 <address> OP_EQUALVERIFY OP_CHECKSIG
 		Script()
 }

schema/keys/keys.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/lbryio/lbry.go/v2/extras/errors"
 
-	"github.com/lbryio/lbcd/btcec"
+	"github.com/btcsuite/btcd/btcec"
 )
 
 type publicKeyInfo struct {
@@ -42,7 +42,7 @@ func PublicKeyToDER(publicKey *btcec.PublicKey) ([]byte, error) {
 
 }
 
-// This type provides compatibility with the btcec package
+//This type provides compatibility with the btcec package
 type ecPrivateKey struct {
 	Version       int
 	PrivateKey    []byte
@@ -84,7 +84,7 @@ func GetPrivateKeyFromBytes(privKeyBytes []byte) (*btcec.PrivateKey, *btcec.Publ
 	return priv, publ, nil
 }
 
-// Returns a btec.Private key object if provided a correct secp256k1 encoded pem.
+//Returns a btec.Private key object if provided a correct secp256k1 encoded pem.
 func ExtractKeyFromPem(pm string) (*btcec.PrivateKey, *btcec.PublicKey) {
 	byta := []byte(pm)
 	blck, _ := pem.Decode(byta)

schema/keys/keys_test.go

@@ -6,7 +6,7 @@ import (
 	"encoding/pem"
 	"testing"
 
-	"github.com/lbryio/lbcd/btcec"
+	"github.com/btcsuite/btcd/btcec"
 	"gotest.tools/assert"
 )
 

schema/stake/decode_test.go

@@ -8,7 +8,7 @@ import (
 
 	pb "github.com/lbryio/types/v2/go"
 
-	"github.com/lbryio/lbcd/btcec"
+	"github.com/btcsuite/btcd/btcec"
 )
 
 type rawClaim struct {

schema/stake/migration.go

@@ -7,7 +7,7 @@ import (
 	v1pb "github.com/lbryio/types/v1/go"
 	pb "github.com/lbryio/types/v2/go"
 
-	"github.com/lbryio/lbcutil/base58"
+	"github.com/btcsuite/btcutil/base58"
 )
 
 const lbrySDHash = "lbry_sd_hash"

schema/stake/migration_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/lbryio/lbry.go/v2/schema/address"
 
-	"github.com/lbryio/lbcutil/base58"
+	"github.com/btcsuite/btcutil/base58"
 	"gotest.tools/assert"
 )
 

schema/stake/pretty.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"google.golang.org/protobuf/encoding/protojson"
+	"github.com/golang/protobuf/jsonpb"
 )
 
 func marshalToString(c *StakeHelper) (string, error) {
-	m_pb := &protojson.Marshal()
+	m_pb := &jsonpb.Marshaler{}
 	if c.IsSupport() {
 		return m_pb.MarshalToString(c.Support)
 	}

schema/stake/serialization.go

@@ -7,7 +7,7 @@ import (
 	legacy "github.com/lbryio/types/v1/go"
 	pb "github.com/lbryio/types/v2/go"
 
-	"google.golang.org/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 func (c *StakeHelper) serialized() ([]byte, error) {

schema/stake/sign.go

@@ -8,7 +8,7 @@ import (
 	"github.com/lbryio/lbry.go/v2/schema/address"
 	"github.com/lbryio/lbry.go/v2/schema/keys"
 
-	"github.com/lbryio/lbcd/btcec"
+	"github.com/btcsuite/btcd/btcec"
 )
 
 func Sign(privKey btcec.PrivateKey, channel StakeHelper, claim StakeHelper, k string) (*keys.Signature, error) {

schema/stake/sign_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/lbryio/lbry.go/v2/schema/keys"
 
-	"github.com/lbryio/lbcd/btcec"
+	"github.com/btcsuite/btcd/btcec"
 	"gotest.tools/assert"
 )
 

schema/stake/stake.go

@@ -10,8 +10,8 @@ import (
 	legacy_pb "github.com/lbryio/types/v1/go"
 	pb "github.com/lbryio/types/v2/go"
 
-	"github.com/lbryio/lbcd/btcec"
-	"google.golang.org/protobuf/proto"
+	"github.com/btcsuite/btcd/btcec"
+	"github.com/golang/protobuf/proto"
 )
 
 type version byte

stream/blob_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"encoding/hex"
-	"os"
+	"io/ioutil"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -139,7 +139,7 @@ func TestBlob_Plaintext(t *testing.T) {
 }
 
 func testdata(t *testing.T, filename string) []byte {
-	data, err := os.ReadFile(filepath.Join("testdata", filename))
+	data, err := ioutil.ReadFile(filepath.Join("testdata", filename))
 	if err != nil {
 		t.Fatal(err)
 	}