diff --git a/cmd/ingest/main.go b/cmd/ingest/main.go index c7aca21..af41611 100644 --- a/cmd/ingest/main.go +++ b/cmd/ingest/main.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/adityapk00/btcd/rpcclient" + "github.com/btcsuite/btcd/rpcclient" "github.com/golang/protobuf/proto" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/common/common.go b/common/common.go index a3aea98..a59efb4 100644 --- a/common/common.go +++ b/common/common.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/adityapk00/btcd/rpcclient" + "github.com/btcsuite/btcd/rpcclient" "github.com/pkg/errors" ) diff --git a/frontend/rpc_client.go b/frontend/rpc_client.go index c75b0be..bd03ff6 100644 --- a/frontend/rpc_client.go +++ b/frontend/rpc_client.go @@ -3,7 +3,7 @@ package frontend import ( "net" - "github.com/adityapk00/btcd/rpcclient" + "github.com/btcsuite/btcd/rpcclient" "github.com/pkg/errors" ini "gopkg.in/ini.v1" ) diff --git a/frontend/service.go b/frontend/service.go index 58a31f0..cbf2226 100644 --- a/frontend/service.go +++ b/frontend/service.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/adityapk00/btcd/rpcclient" + "github.com/btcsuite/btcd/rpcclient" "github.com/golang/protobuf/proto" "github.com/sirupsen/logrus" @@ -144,37 +144,6 @@ func (s *SqlStreamer) GetAddressTxids(addressBlockFilter *walletrpc.TransparentA return nil } -func (s *SqlStreamer) GetUtxos(address *walletrpc.TransparentAddress, resp walletrpc.CompactTxStreamer_GetUtxosServer) error { - utxos, _ := s.client.GetAddressUtxos(address.Address) - - for _, utxo := range utxos { - txid, _ := hex.DecodeString(utxo.TxID) - // Txid is read as a string, which is in big-endian order. But when converting - // to bytes, it should be little-endian - for left, right := 0, len(txid)-1; left < right; left, right = left+1, right-1 { - txid[left], txid[right] = txid[right], txid[left] - } - - script, _ := hex.DecodeString(utxo.ScriptPubKey) - - respUtxo := &walletrpc.Utxo{ - Address: address, - Txid: txid, - OutputIndex: uint64(utxo.OutputIndex), - Script: script, - Value: utxo.Amount, - Height: uint64(utxo.Height), - } - - err := resp.Send(respUtxo) - if err != nil { - return err - } - } - - return nil -} - func (s *SqlStreamer) GetBlockRange(span *walletrpc.BlockRange, resp walletrpc.CompactTxStreamer_GetBlockRangeServer) error { blockChan := make(chan []byte) errChan := make(chan error) diff --git a/go.mod b/go.mod index 398a123..f142125 100644 --- a/go.mod +++ b/go.mod @@ -2,41 +2,41 @@ module github.com/adityapk00/lightwalletd go 1.12 -replace github.com/adityapk00/btcd => ../btcd - require ( - cloud.google.com/go v0.45.1 // indirect + cloud.google.com/go v0.46.3 // indirect github.com/adityapk00/btcd v0.0.0-20190911041810-371b8c79601d github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3 + github.com/creack/pty v1.1.9 // indirect github.com/golang/protobuf v1.3.2 github.com/google/go-cmp v0.3.1 // indirect github.com/google/pprof v0.0.0-20190908185732-236ed259b199 // indirect - github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 // indirect + github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f // indirect github.com/hashicorp/golang-lru v0.5.3 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/kr/pty v1.1.8 // indirect github.com/mattn/go-sqlite3 v1.11.0 + github.com/pebbe/zmq4 v1.0.0 // indirect github.com/pkg/errors v0.8.1 - github.com/rogpeppe/go-internal v1.3.2 // indirect + github.com/rogpeppe/go-internal v1.4.0 // indirect github.com/sirupsen/logrus v1.4.2 github.com/smartystreets/assertions v1.0.1 // indirect github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.4.0 // indirect - github.com/zcash-hackworks/lightwalletd v0.0.0-20190906012100-a91acdbdecfb // indirect + github.com/zcash-hackworks/lightwalletd v0.0.0-20190925163758-a4578219497f // indirect go.opencensus.io v0.22.1 // indirect - golang.org/x/exp v0.0.0-20190912063710-ac5d2bfcbfe0 // indirect + golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 // indirect + golang.org/x/exp v0.0.0-20190919035709-81c71964d733 // indirect golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a // indirect - golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac // indirect - golang.org/x/mobile v0.0.0-20190910184405-b558ed863381 // indirect - golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2 + golang.org/x/mobile v0.0.0-20190923204409-d3ece3b6da5f // indirect + golang.org/x/net v0.0.0-20190923162816-aa69164e4478 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect - golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8 // indirect - golang.org/x/tools v0.0.0-20190912152909-b0a6c2aa3ffa // indirect + golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe // indirect + golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect + golang.org/x/tools v0.0.0-20190925164712-ae58c0ff6b32 // indirect google.golang.org/api v0.10.0 // indirect - google.golang.org/appengine v1.6.2 // indirect - google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51 // indirect + google.golang.org/appengine v1.6.3 // indirect + google.golang.org/genproto v0.0.0-20190916214212-f660b8655731 // indirect google.golang.org/grpc v1.23.1 - gopkg.in/ini.v1 v1.46.0 - honnef.co/go/tools v0.0.1-2019.2.3 // indirect + gopkg.in/ini.v1 v1.48.0 ) diff --git a/go.sum b/go.sum index c13e952..7de4836 100644 --- a/go.sum +++ b/go.sum @@ -4,11 +4,16 @@ cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSR cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/adityapk00/btcd v0.0.0-20190905214036-a1731ecea3cf/go.mod h1:+z+SWIdD4r5ldolQ/bPmYYDD/Hvic1j/K+Ysx6GgrJM= +github.com/adityapk00/btcd v0.0.0-20190911041810-371b8c79601d h1:h0i2M7yU+NB4oQQZJyhMdjgP/uE+0aCnxyuoxGDqJv4= +github.com/adityapk00/btcd v0.0.0-20190911041810-371b8c79601d/go.mod h1:DIHxnQgTkbOnYsj0GTcETsdozUSDkwTPfKMSX0+yBFw= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d h1:xG8Pj6Y6J760xwETNmMzmlt38QSwz0BLp1cZ09g27uw= github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BRcvO8T0UEPu53cnw4IbV63x1bEjildYhO0= @@ -31,11 +36,13 @@ github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtE github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -65,6 +72,7 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -75,6 +83,7 @@ github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlT github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= @@ -106,6 +115,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= @@ -113,9 +123,11 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY= github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= +github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8= github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -127,6 +139,7 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/zcash-hackworks/lightwalletd v0.0.0-20190906012100-a91acdbdecfb h1:0vTMQHSoogL5ZI3Z3MUjpeEMx5RzHzUHScTAA3KiSks= github.com/zcash-hackworks/lightwalletd v0.0.0-20190906012100-a91acdbdecfb/go.mod h1:2114E67+iUQVth+Gi4K2pxJw9KWyIBODRYoDn5mFxlY= +github.com/zcash-hackworks/lightwalletd v0.0.0-20190925163758-a4578219497f/go.mod h1:hSyp0zSIqYe3SdSRkKchLeccOW7vgOgZy1/Igldmr8o= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= @@ -140,12 +153,15 @@ golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsu golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392 h1:ACG4HJsFiNMf47Y4PeRoebLNy/2lXT9EtprMuTFWt1M= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= 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= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20190912063710-ac5d2bfcbfe0/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20190919035709-81c71964d733/go.mod h1:lopKMxgphN5jWNwrkPRQU99WV/Hs5LrdgRBxZ5ELgOQ= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20190902063713-cb417be4ba39/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -160,6 +176,7 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mobile v0.0.0-20190830201351-c6da95954960/go.mod h1:mJOp/i0LXPxJZ9weeIadcPqKVfS05Ai7m6/t9z1Hs/Y= golang.org/x/mobile v0.0.0-20190910184405-b558ed863381/go.mod h1:p895TfNkDgPEmEQrNiOtIl3j98d/tGU95djDj7NfyjQ= +golang.org/x/mobile v0.0.0-20190923204409-d3ece3b6da5f/go.mod h1:p895TfNkDgPEmEQrNiOtIl3j98d/tGU95djDj7NfyjQ= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -182,6 +199,8 @@ golang.org/x/net v0.0.0-20190909003024-a7b16738d86b h1:XfVGCX+0T4WOStkaOsJRllbsi golang.org/x/net v0.0.0-20190909003024-a7b16738d86b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2 h1:4dVFTC832rPn4pomLSz1vA+are2+dU19w1H8OngV7nc= golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -212,6 +231,9 @@ golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b h1:3S2h5FadpNr0zUUCVZjlKIEYF golang.org/x/sys v0.0.0-20190910064555-bbd175535a8b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8 h1:41hwlulw1prEMBxLQSlMSux1zxJf07B3WPsdjJlKZxE= golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -219,6 +241,7 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -237,7 +260,9 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190905173453-6b3d1c9ba8bf/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190909214602-067311248421/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911022129-16c5e0f7d110/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190912152909-b0a6c2aa3ffa/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190925164712-ae58c0ff6b32/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -249,6 +274,7 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.3/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -261,6 +287,8 @@ google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514 h1:oFSK4421fpCKRrp google.golang.org/genproto v0.0.0-20190905072037-92dd089d5514/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51 h1:Ex1mq5jaJof+kRnYi3SlYJ8KKa9Ao3NHyIT5XJ1gF6U= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20190916214212-f660b8655731 h1:Phvl0+G5t5k/EUFUi0wPdUUeTL2HydMQUXHnunWgSb0= +google.golang.org/genproto v0.0.0-20190916214212-f660b8655731/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/grpc v1.17.0 h1:TRJYBgMclJvGYn2rIMjj+h9KtMt5r1Ij7ODVRIZkwhk= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -279,6 +307,8 @@ gopkg.in/ini.v1 v1.41.0 h1:Ka3ViY6gNYSKiVy71zXBEqKplnV35ImDLVG+8uoIklE= gopkg.in/ini.v1 v1.41.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.46.0 h1:VeDZbLYGaupuvIrsYCEOe/L/2Pcs5n7hdO1ZTjporag= gopkg.in/ini.v1 v1.46.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.48.0 h1:URjZc+8ugRY5mL5uUeQH/a63JcHwdX9xZaWvmNWD7z8= +gopkg.in/ini.v1 v1.48.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/walletrpc/service.pb.go b/walletrpc/service.pb.go index 18ff694..b11d485 100644 --- a/walletrpc/service.pb.go +++ b/walletrpc/service.pb.go @@ -496,85 +496,6 @@ func (m *TransparentAddressBlockFilter) GetRange() *BlockRange { return nil } -type Utxo struct { - Address *TransparentAddress `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Txid []byte `protobuf:"bytes,2,opt,name=txid,proto3" json:"txid,omitempty"` - OutputIndex uint64 `protobuf:"varint,3,opt,name=outputIndex,proto3" json:"outputIndex,omitempty"` - Script []byte `protobuf:"bytes,4,opt,name=script,proto3" json:"script,omitempty"` - Value uint64 `protobuf:"varint,5,opt,name=value,proto3" json:"value,omitempty"` - Height uint64 `protobuf:"varint,6,opt,name=height,proto3" json:"height,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *Utxo) Reset() { *m = Utxo{} } -func (m *Utxo) String() string { return proto.CompactTextString(m) } -func (*Utxo) ProtoMessage() {} -func (*Utxo) Descriptor() ([]byte, []int) { - return fileDescriptor_a0b84a42fa06f626, []int{10} -} - -func (m *Utxo) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_Utxo.Unmarshal(m, b) -} -func (m *Utxo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_Utxo.Marshal(b, m, deterministic) -} -func (m *Utxo) XXX_Merge(src proto.Message) { - xxx_messageInfo_Utxo.Merge(m, src) -} -func (m *Utxo) XXX_Size() int { - return xxx_messageInfo_Utxo.Size(m) -} -func (m *Utxo) XXX_DiscardUnknown() { - xxx_messageInfo_Utxo.DiscardUnknown(m) -} - -var xxx_messageInfo_Utxo proto.InternalMessageInfo - -func (m *Utxo) GetAddress() *TransparentAddress { - if m != nil { - return m.Address - } - return nil -} - -func (m *Utxo) GetTxid() []byte { - if m != nil { - return m.Txid - } - return nil -} - -func (m *Utxo) GetOutputIndex() uint64 { - if m != nil { - return m.OutputIndex - } - return 0 -} - -func (m *Utxo) GetScript() []byte { - if m != nil { - return m.Script - } - return nil -} - -func (m *Utxo) GetValue() uint64 { - if m != nil { - return m.Value - } - return 0 -} - -func (m *Utxo) GetHeight() uint64 { - if m != nil { - return m.Height - } - return 0 -} - func init() { proto.RegisterType((*BlockID)(nil), "cash.z.wallet.sdk.rpc.BlockID") proto.RegisterType((*BlockRange)(nil), "cash.z.wallet.sdk.rpc.BlockRange") @@ -586,57 +507,51 @@ func init() { proto.RegisterType((*LightdInfo)(nil), "cash.z.wallet.sdk.rpc.LightdInfo") proto.RegisterType((*TransparentAddress)(nil), "cash.z.wallet.sdk.rpc.TransparentAddress") proto.RegisterType((*TransparentAddressBlockFilter)(nil), "cash.z.wallet.sdk.rpc.TransparentAddressBlockFilter") - proto.RegisterType((*Utxo)(nil), "cash.z.wallet.sdk.rpc.Utxo") } func init() { proto.RegisterFile("service.proto", fileDescriptor_a0b84a42fa06f626) } var fileDescriptor_a0b84a42fa06f626 = []byte{ - // 700 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x55, 0xcf, 0x6e, 0x13, 0x3f, - 0x10, 0x6e, 0xda, 0xa4, 0x6d, 0x26, 0x69, 0xab, 0x9f, 0xf5, 0x2b, 0x44, 0xa1, 0x40, 0x31, 0x42, - 0x82, 0xcb, 0xaa, 0x2a, 0x45, 0x70, 0xe0, 0xd2, 0x86, 0x7f, 0x95, 0x0a, 0x02, 0x27, 0x70, 0x28, - 0x87, 0xca, 0xdd, 0x75, 0x93, 0xa5, 0xc9, 0x7a, 0x65, 0x3b, 0x69, 0xe0, 0xd1, 0x78, 0x01, 0xde, - 0x88, 0x33, 0xf6, 0x78, 0xd3, 0x6c, 0x54, 0x96, 0xe4, 0xb6, 0x63, 0xcf, 0x7c, 0x33, 0xf3, 0xcd, - 0xe7, 0x59, 0xd8, 0xd0, 0x42, 0x8d, 0xe2, 0x50, 0x04, 0xa9, 0x92, 0x46, 0x92, 0xed, 0x90, 0xeb, - 0x5e, 0xf0, 0x23, 0xb8, 0xe2, 0xfd, 0xbe, 0x30, 0x81, 0x8e, 0x2e, 0x03, 0x95, 0x86, 0xcd, 0xed, - 0x50, 0x0e, 0x52, 0x1e, 0x9a, 0xb3, 0x0b, 0xa9, 0x06, 0xdc, 0x68, 0xef, 0x4d, 0x9f, 0xc1, 0xda, - 0x51, 0x5f, 0x86, 0x97, 0xc7, 0xaf, 0xc8, 0x2d, 0x58, 0xed, 0x89, 0xb8, 0xdb, 0x33, 0x8d, 0xd2, - 0x6e, 0xe9, 0x71, 0x99, 0x65, 0x16, 0x21, 0x50, 0xee, 0x59, 0xc8, 0xc6, 0xb2, 0x3d, 0xad, 0x33, - 0xfc, 0xa6, 0x06, 0x00, 0xc3, 0x18, 0x4f, 0xba, 0x82, 0x1c, 0x40, 0x45, 0x1b, 0xae, 0x7c, 0x60, - 0x6d, 0xff, 0x5e, 0xf0, 0xd7, 0x12, 0x82, 0x2c, 0x11, 0xf3, 0xce, 0x64, 0x0f, 0x56, 0x44, 0x12, - 0x21, 0xec, 0xfc, 0x18, 0xe7, 0x4a, 0xbf, 0xc1, 0x7a, 0x67, 0xfc, 0x26, 0xee, 0x1b, 0xa1, 0x5c, - 0xce, 0x73, 0x77, 0xb7, 0x68, 0x4e, 0x74, 0x26, 0xff, 0x43, 0x25, 0x4e, 0x22, 0x31, 0xc6, 0xac, - 0x65, 0xe6, 0x8d, 0xeb, 0x0e, 0x57, 0x72, 0x1d, 0xbe, 0x84, 0x4d, 0xc6, 0xaf, 0x3a, 0x8a, 0x27, - 0xda, 0xb2, 0x16, 0xcb, 0xc4, 0x79, 0x45, 0xdc, 0x70, 0x4c, 0x68, 0xbd, 0xdc, 0x77, 0x8e, 0xb3, - 0xe5, 0x3c, 0x67, 0xf4, 0x23, 0xd4, 0xdb, 0xb6, 0x62, 0x26, 0x74, 0x2a, 0x13, 0x2d, 0xc8, 0x0e, - 0x54, 0x85, 0x52, 0x52, 0xb5, 0x64, 0x24, 0x10, 0xa0, 0xc2, 0xa6, 0x07, 0x84, 0x42, 0x1d, 0x8d, - 0xf7, 0x42, 0x6b, 0xde, 0x15, 0x88, 0x55, 0x65, 0x33, 0x67, 0xb4, 0x06, 0xd5, 0x56, 0x8f, 0xc7, - 0x49, 0x3b, 0x15, 0x21, 0x5d, 0x83, 0xca, 0xeb, 0x41, 0x6a, 0xbe, 0xd3, 0x9f, 0x25, 0x80, 0x13, - 0x97, 0x31, 0x3a, 0x4e, 0x2e, 0x24, 0x69, 0xc0, 0xda, 0x48, 0x28, 0x6d, 0xab, 0xc5, 0x24, 0x55, - 0x36, 0x31, 0x5d, 0xa1, 0x23, 0x5b, 0x90, 0x54, 0x19, 0x78, 0x66, 0xb9, 0xd4, 0x86, 0x47, 0x91, - 0x6a, 0x0f, 0xd3, 0x54, 0xda, 0x09, 0x3a, 0x0a, 0xd6, 0xd9, 0xcc, 0x99, 0x2b, 0x3e, 0x74, 0xa9, - 0x3f, 0xf0, 0x81, 0x68, 0x94, 0x31, 0x7c, 0x7a, 0x40, 0x5e, 0xc0, 0x6d, 0xcd, 0xd3, 0x7e, 0x9c, - 0x74, 0x0f, 0x2d, 0x4f, 0x23, 0xee, 0xb8, 0x7a, 0xe7, 0x39, 0xa9, 0x20, 0x27, 0x45, 0xd7, 0x34, - 0x00, 0x82, 0xfc, 0xa6, 0x5c, 0x89, 0xc4, 0x1c, 0xda, 0x8c, 0xb6, 0x57, 0xd7, 0x03, 0xf7, 0x9f, - 0x93, 0x1e, 0x32, 0x93, 0x2a, 0xb8, 0x7b, 0xd3, 0x1f, 0x07, 0x9c, 0x69, 0xa2, 0x30, 0x94, 0x3c, - 0x87, 0x8a, 0x72, 0x52, 0xcd, 0xd4, 0xf6, 0xe0, 0x5f, 0x6a, 0x41, 0x4d, 0x33, 0xef, 0x4f, 0x7f, - 0x95, 0xa0, 0xfc, 0xd9, 0x8c, 0x25, 0x69, 0xcd, 0x62, 0xd7, 0xf6, 0x9f, 0x14, 0x60, 0xdc, 0x2c, - 0x71, 0x5a, 0x86, 0x95, 0x90, 0x19, 0xc7, 0xd1, 0xe4, 0x29, 0xb9, 0x6f, 0xb2, 0x0b, 0x35, 0x39, - 0x34, 0xe9, 0xd0, 0x1c, 0xa3, 0x30, 0x57, 0x90, 0xb3, 0xfc, 0x91, 0x9b, 0x9d, 0x0e, 0x55, 0x9c, - 0x1a, 0x24, 0xbf, 0xce, 0x32, 0xcb, 0x89, 0x79, 0xc4, 0xfb, 0x43, 0x91, 0xf1, 0xec, 0x8d, 0x9c, - 0x24, 0x57, 0xf3, 0x92, 0xdc, 0xff, 0x5d, 0x81, 0xff, 0x5a, 0x7e, 0x07, 0x74, 0xc6, 0x6d, 0xa3, - 0x84, 0x1d, 0x9e, 0x22, 0x1d, 0xd8, 0x7c, 0x2b, 0xcc, 0x09, 0x37, 0x42, 0x1b, 0xec, 0x9e, 0xec, - 0x16, 0xf4, 0x75, 0xad, 0xbe, 0xe6, 0x9c, 0xb7, 0x46, 0x97, 0xc8, 0x27, 0x58, 0xb7, 0xa8, 0x1e, - 0x6f, 0x8e, 0x77, 0xf3, 0x61, 0x51, 0x3e, 0x5f, 0x2b, 0xba, 0x59, 0xc8, 0xaf, 0xb0, 0x31, 0x81, - 0xf4, 0x4b, 0x67, 0xfe, 0x0c, 0x17, 0x84, 0xde, 0x2b, 0x91, 0x53, 0x64, 0x21, 0xff, 0xd8, 0xef, - 0x17, 0x4d, 0x37, 0xdb, 0x3f, 0xcd, 0x47, 0x05, 0x0e, 0xb3, 0x4b, 0xc3, 0x16, 0x7e, 0x06, 0x5b, - 0x6e, 0x15, 0xe4, 0xc1, 0x17, 0x8b, 0x2d, 0x2c, 0x3f, 0xbf, 0x59, 0x6c, 0x82, 0x2f, 0x48, 0xb6, - 0x13, 0xa9, 0x26, 0x8b, 0x8b, 0xb2, 0x79, 0xa7, 0xc0, 0xd5, 0x01, 0x21, 0x29, 0x0a, 0xb6, 0x2c, - 0x6e, 0xe6, 0xde, 0xb1, 0x52, 0xd5, 0xe4, 0x60, 0x61, 0xf8, 0xdc, 0xb3, 0x5c, 0x98, 0x2a, 0x9b, - 0x93, 0xe1, 0x94, 0x73, 0x1b, 0x6d, 0xa7, 0x20, 0x16, 0xd7, 0x5f, 0xb3, 0x48, 0x03, 0x53, 0x00, - 0xba, 0x74, 0x54, 0x3b, 0xad, 0xfa, 0x6b, 0x7b, 0x73, 0xbe, 0x8a, 0xbf, 0xbd, 0xa7, 0x7f, 0x02, - 0x00, 0x00, 0xff, 0xff, 0xb2, 0x4f, 0xf9, 0x1a, 0x35, 0x07, 0x00, 0x00, + // 609 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x41, 0x6f, 0x13, 0x3d, + 0x10, 0xcd, 0xb6, 0xd9, 0xb6, 0x99, 0xa6, 0xad, 0x3e, 0xeb, 0x2b, 0x44, 0x51, 0x81, 0x62, 0x84, + 0xd4, 0xd3, 0xaa, 0x2a, 0x45, 0x70, 0xe0, 0xd2, 0x06, 0x08, 0x95, 0x0a, 0x02, 0x27, 0xa7, 0x72, + 0xa8, 0xdc, 0xf5, 0x34, 0xbb, 0x34, 0xb1, 0x57, 0xb6, 0x49, 0x03, 0x3f, 0x86, 0x1f, 0xc2, 0xaf, + 0x43, 0xf6, 0x6e, 0x9a, 0x8d, 0x60, 0x9b, 0xdc, 0x76, 0xec, 0x37, 0xef, 0xcd, 0x8c, 0xe7, 0x2d, + 0x6c, 0x19, 0xd4, 0xe3, 0x34, 0xc6, 0x28, 0xd3, 0xca, 0x2a, 0xb2, 0x1b, 0x73, 0x93, 0x44, 0x3f, + 0xa3, 0x5b, 0x3e, 0x1c, 0xa2, 0x8d, 0x8c, 0xb8, 0x89, 0x74, 0x16, 0xb7, 0x77, 0x63, 0x35, 0xca, + 0x78, 0x6c, 0x2f, 0xaf, 0x95, 0x1e, 0x71, 0x6b, 0x72, 0x34, 0x7d, 0x09, 0xeb, 0xa7, 0x43, 0x15, + 0xdf, 0x9c, 0xbd, 0x25, 0x0f, 0x60, 0x2d, 0xc1, 0x74, 0x90, 0xd8, 0x56, 0xb0, 0x1f, 0x1c, 0xd4, + 0x59, 0x11, 0x11, 0x02, 0xf5, 0x84, 0x9b, 0xa4, 0xb5, 0xb2, 0x1f, 0x1c, 0x34, 0x99, 0xff, 0xa6, + 0x16, 0xc0, 0xa7, 0x31, 0x2e, 0x07, 0x48, 0x8e, 0x21, 0x34, 0x96, 0xeb, 0x3c, 0x71, 0xf3, 0xe8, + 0x71, 0xf4, 0xcf, 0x12, 0xa2, 0x42, 0x88, 0xe5, 0x60, 0x72, 0x08, 0xab, 0x28, 0x85, 0xa7, 0x5d, + 0x9c, 0xe3, 0xa0, 0xf4, 0x1b, 0x6c, 0xf4, 0x27, 0xef, 0xd3, 0xa1, 0x45, 0xed, 0x34, 0xaf, 0xdc, + 0xdd, 0xb2, 0x9a, 0x1e, 0x4c, 0xfe, 0x87, 0x30, 0x95, 0x02, 0x27, 0x5e, 0xb5, 0xce, 0xf2, 0xe0, + 0xae, 0xc3, 0xd5, 0x52, 0x87, 0x6f, 0x60, 0x9b, 0xf1, 0xdb, 0xbe, 0xe6, 0xd2, 0xf0, 0xd8, 0xa6, + 0x4a, 0x3a, 0x94, 0xe0, 0x96, 0x7b, 0xc1, 0x26, 0xf3, 0xdf, 0xa5, 0x99, 0xad, 0x94, 0x67, 0x46, + 0x3f, 0x43, 0xb3, 0x87, 0x52, 0x30, 0x34, 0x99, 0x92, 0x06, 0xc9, 0x1e, 0x34, 0x50, 0x6b, 0xa5, + 0x3b, 0x4a, 0xa0, 0x27, 0x08, 0xd9, 0xec, 0x80, 0x50, 0x68, 0xfa, 0xe0, 0x23, 0x1a, 0xc3, 0x07, + 0xe8, 0xb9, 0x1a, 0x6c, 0xee, 0x8c, 0x6e, 0x42, 0xa3, 0x93, 0xf0, 0x54, 0xf6, 0x32, 0x8c, 0xe9, + 0x3a, 0x84, 0xef, 0x46, 0x99, 0xfd, 0x41, 0x7f, 0x07, 0x00, 0xe7, 0x4e, 0x51, 0x9c, 0xc9, 0x6b, + 0x45, 0x5a, 0xb0, 0x3e, 0x46, 0x6d, 0x52, 0x25, 0xbd, 0x48, 0x83, 0x4d, 0x43, 0x57, 0xe8, 0x18, + 0xa5, 0x50, 0xba, 0x20, 0x2f, 0x22, 0x27, 0x6d, 0xb9, 0x10, 0xba, 0xf7, 0x3d, 0xcb, 0x94, 0xb6, + 0x7e, 0x04, 0x1b, 0x6c, 0xee, 0xcc, 0x15, 0x1f, 0x3b, 0xe9, 0x4f, 0x7c, 0x84, 0xad, 0xba, 0x4f, + 0x9f, 0x1d, 0x90, 0xd7, 0xf0, 0xd0, 0xf0, 0x6c, 0x98, 0xca, 0xc1, 0x49, 0x6c, 0xd3, 0x31, 0x77, + 0xb3, 0xfa, 0x90, 0xcf, 0x24, 0xf4, 0x33, 0xa9, 0xba, 0xa6, 0x11, 0x10, 0x3f, 0xdf, 0x8c, 0x6b, + 0x94, 0xf6, 0x44, 0x08, 0x8d, 0xc6, 0xb8, 0x1e, 0x78, 0xfe, 0x39, 0xed, 0xa1, 0x08, 0xa9, 0x86, + 0x47, 0x7f, 0xe3, 0xfd, 0x03, 0x17, 0x3b, 0x51, 0x99, 0x4a, 0x5e, 0x41, 0xa8, 0xdd, 0xaa, 0x16, + 0xdb, 0xf6, 0xf4, 0xbe, 0x6d, 0xf1, 0x3b, 0xcd, 0x72, 0xfc, 0xd1, 0xaf, 0x10, 0xfe, 0xeb, 0xe4, + 0xce, 0xe9, 0x4f, 0x7a, 0x56, 0x23, 0x1f, 0xa1, 0x26, 0x7d, 0xd8, 0xee, 0xa2, 0x3d, 0xe7, 0x16, + 0x8d, 0xf5, 0x39, 0x64, 0xbf, 0x82, 0xf1, 0xee, 0xcd, 0xda, 0x0b, 0x36, 0x94, 0xd6, 0xc8, 0x17, + 0xd8, 0xe8, 0x62, 0xc1, 0xb7, 0x00, 0xdd, 0x7e, 0x56, 0xa5, 0x97, 0xd7, 0xea, 0x61, 0xb4, 0x46, + 0xbe, 0xc2, 0xd6, 0x94, 0x32, 0xb7, 0xea, 0xe2, 0xce, 0x97, 0xa4, 0x3e, 0x0c, 0xc8, 0x85, 0x9f, + 0x42, 0xd9, 0x22, 0x4f, 0x2a, 0x52, 0xa7, 0xae, 0x6d, 0x3f, 0xaf, 0x00, 0xcc, 0x5b, 0x8d, 0xd6, + 0xc8, 0x25, 0xec, 0x38, 0x03, 0x95, 0xc9, 0x97, 0xcb, 0xad, 0x2c, 0xbf, 0xec, 0x47, 0x5a, 0x23, + 0x1a, 0x76, 0xba, 0x38, 0x5d, 0xa2, 0xfe, 0x24, 0x15, 0x86, 0x1c, 0x57, 0x55, 0x7f, 0xdf, 0xd2, + 0x2d, 0xdd, 0xd2, 0x61, 0x40, 0x98, 0x7f, 0x8d, 0x92, 0x5f, 0xf7, 0x2a, 0x72, 0xbd, 0xb9, 0xdb, + 0x55, 0x6f, 0x35, 0x23, 0xa0, 0xb5, 0xd3, 0xcd, 0x8b, 0x46, 0x7e, 0xad, 0xb3, 0xf8, 0x6a, 0xcd, + 0xff, 0xd4, 0x5f, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0x53, 0xcd, 0xf6, 0x94, 0x13, 0x06, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -659,7 +574,6 @@ type CompactTxStreamerClient interface { GetTransaction(ctx context.Context, in *TxFilter, opts ...grpc.CallOption) (*RawTransaction, error) SendTransaction(ctx context.Context, in *RawTransaction, opts ...grpc.CallOption) (*SendResponse, error) // t-Address support - GetUtxos(ctx context.Context, in *TransparentAddress, opts ...grpc.CallOption) (CompactTxStreamer_GetUtxosClient, error) GetAddressTxids(ctx context.Context, in *TransparentAddressBlockFilter, opts ...grpc.CallOption) (CompactTxStreamer_GetAddressTxidsClient, error) // Misc GetLightdInfo(ctx context.Context, in *Empty, opts ...grpc.CallOption) (*LightdInfo, error) @@ -741,40 +655,8 @@ func (c *compactTxStreamerClient) SendTransaction(ctx context.Context, in *RawTr return out, nil } -func (c *compactTxStreamerClient) GetUtxos(ctx context.Context, in *TransparentAddress, opts ...grpc.CallOption) (CompactTxStreamer_GetUtxosClient, error) { - stream, err := c.cc.NewStream(ctx, &_CompactTxStreamer_serviceDesc.Streams[1], "/cash.z.wallet.sdk.rpc.CompactTxStreamer/GetUtxos", opts...) - if err != nil { - return nil, err - } - x := &compactTxStreamerGetUtxosClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type CompactTxStreamer_GetUtxosClient interface { - Recv() (*Utxo, error) - grpc.ClientStream -} - -type compactTxStreamerGetUtxosClient struct { - grpc.ClientStream -} - -func (x *compactTxStreamerGetUtxosClient) Recv() (*Utxo, error) { - m := new(Utxo) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - func (c *compactTxStreamerClient) GetAddressTxids(ctx context.Context, in *TransparentAddressBlockFilter, opts ...grpc.CallOption) (CompactTxStreamer_GetAddressTxidsClient, error) { - stream, err := c.cc.NewStream(ctx, &_CompactTxStreamer_serviceDesc.Streams[2], "/cash.z.wallet.sdk.rpc.CompactTxStreamer/GetAddressTxids", opts...) + stream, err := c.cc.NewStream(ctx, &_CompactTxStreamer_serviceDesc.Streams[1], "/cash.z.wallet.sdk.rpc.CompactTxStreamer/GetAddressTxids", opts...) if err != nil { return nil, err } @@ -824,7 +706,6 @@ type CompactTxStreamerServer interface { GetTransaction(context.Context, *TxFilter) (*RawTransaction, error) SendTransaction(context.Context, *RawTransaction) (*SendResponse, error) // t-Address support - GetUtxos(*TransparentAddress, CompactTxStreamer_GetUtxosServer) error GetAddressTxids(*TransparentAddressBlockFilter, CompactTxStreamer_GetAddressTxidsServer) error // Misc GetLightdInfo(context.Context, *Empty) (*LightdInfo, error) @@ -849,9 +730,6 @@ func (*UnimplementedCompactTxStreamerServer) GetTransaction(ctx context.Context, func (*UnimplementedCompactTxStreamerServer) SendTransaction(ctx context.Context, req *RawTransaction) (*SendResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SendTransaction not implemented") } -func (*UnimplementedCompactTxStreamerServer) GetUtxos(req *TransparentAddress, srv CompactTxStreamer_GetUtxosServer) error { - return status.Errorf(codes.Unimplemented, "method GetUtxos not implemented") -} func (*UnimplementedCompactTxStreamerServer) GetAddressTxids(req *TransparentAddressBlockFilter, srv CompactTxStreamer_GetAddressTxidsServer) error { return status.Errorf(codes.Unimplemented, "method GetAddressTxids not implemented") } @@ -956,27 +834,6 @@ func _CompactTxStreamer_SendTransaction_Handler(srv interface{}, ctx context.Con return interceptor(ctx, in, info, handler) } -func _CompactTxStreamer_GetUtxos_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(TransparentAddress) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(CompactTxStreamerServer).GetUtxos(m, &compactTxStreamerGetUtxosServer{stream}) -} - -type CompactTxStreamer_GetUtxosServer interface { - Send(*Utxo) error - grpc.ServerStream -} - -type compactTxStreamerGetUtxosServer struct { - grpc.ServerStream -} - -func (x *compactTxStreamerGetUtxosServer) Send(m *Utxo) error { - return x.ServerStream.SendMsg(m) -} - func _CompactTxStreamer_GetAddressTxids_Handler(srv interface{}, stream grpc.ServerStream) error { m := new(TransparentAddressBlockFilter) if err := stream.RecvMsg(m); err != nil { @@ -1047,11 +904,6 @@ var _CompactTxStreamer_serviceDesc = grpc.ServiceDesc{ Handler: _CompactTxStreamer_GetBlockRange_Handler, ServerStreams: true, }, - { - StreamName: "GetUtxos", - Handler: _CompactTxStreamer_GetUtxos_Handler, - ServerStreams: true, - }, { StreamName: "GetAddressTxids", Handler: _CompactTxStreamer_GetAddressTxids_Handler, diff --git a/walletrpc/service.proto b/walletrpc/service.proto index 21c77e3..554c423 100644 --- a/walletrpc/service.proto +++ b/walletrpc/service.proto @@ -61,15 +61,6 @@ message TransparentAddressBlockFilter { BlockRange range = 2; } -message Utxo { - TransparentAddress address = 1; - bytes txid = 2; - uint64 outputIndex = 3; - bytes script = 4; - uint64 value = 5; - uint64 height = 6; -} - service CompactTxStreamer { // Compact Blocks rpc GetLatestBlock(ChainSpec) returns (BlockID) {} @@ -81,7 +72,6 @@ service CompactTxStreamer { rpc SendTransaction(RawTransaction) returns (SendResponse) {} // t-Address support - rpc GetUtxos(TransparentAddress) returns (stream Utxo) {} rpc GetAddressTxids(TransparentAddressBlockFilter) returns (stream RawTransaction) {} // Misc