diff --git a/api/apirouter.go b/api/apirouter.go index fccc82ede..cc3c4f82e 100644 --- a/api/apirouter.go +++ b/api/apirouter.go @@ -8,7 +8,7 @@ import ( "net/http" "strings" - m "github.com/decred/dcrdata/middleware" + m "github.com/decred/dcrdata/middleware/v2" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/rs/cors" diff --git a/api/apiroutes.go b/api/apiroutes.go index 0cbc76e56..4e5219b82 100644 --- a/api/apiroutes.go +++ b/api/apiroutes.go @@ -26,11 +26,11 @@ import ( "github.com/decred/dcrd/dcrjson/v2" "github.com/decred/dcrd/rpcclient/v2" "github.com/decred/dcrd/wire" - apitypes "github.com/decred/dcrdata/api/types" + apitypes "github.com/decred/dcrdata/api/types/v2" "github.com/decred/dcrdata/db/dbtypes" "github.com/decred/dcrdata/exchanges" "github.com/decred/dcrdata/gov/agendas" - m "github.com/decred/dcrdata/middleware" + m "github.com/decred/dcrdata/middleware/v2" "github.com/decred/dcrdata/txhelpers" "github.com/decred/dcrdata/v4/explorer" notify "github.com/decred/dcrdata/v4/notification" diff --git a/api/insight/apimiddleware.go b/api/insight/apimiddleware.go index 7e8345c91..5c753e9f1 100644 --- a/api/insight/apimiddleware.go +++ b/api/insight/apimiddleware.go @@ -13,8 +13,8 @@ import ( "strconv" "github.com/decred/dcrd/chaincfg/chainhash" - apitypes "github.com/decred/dcrdata/api/types" - m "github.com/decred/dcrdata/middleware" + apitypes "github.com/decred/dcrdata/api/types/v2" + m "github.com/decred/dcrdata/middleware/v2" "github.com/go-chi/chi" ) diff --git a/api/insight/apirouter.go b/api/insight/apirouter.go index 3c6945cab..f95c7569c 100644 --- a/api/insight/apirouter.go +++ b/api/insight/apirouter.go @@ -8,7 +8,7 @@ package insight import ( - m "github.com/decred/dcrdata/middleware" + m "github.com/decred/dcrdata/middleware/v2" "github.com/didip/tollbooth" "github.com/didip/tollbooth_chi" "github.com/go-chi/chi" diff --git a/api/insight/apiroutes.go b/api/insight/apiroutes.go index 336592d9b..b838efaf0 100644 --- a/api/insight/apiroutes.go +++ b/api/insight/apiroutes.go @@ -20,10 +20,10 @@ import ( "github.com/decred/dcrd/dcrjson/v2" "github.com/decred/dcrd/dcrutil" "github.com/decred/dcrd/rpcclient/v2" - apitypes "github.com/decred/dcrdata/api/types" + apitypes "github.com/decred/dcrdata/api/types/v2" "github.com/decred/dcrdata/db/dbtypes" - "github.com/decred/dcrdata/db/dcrpg" - m "github.com/decred/dcrdata/middleware" + "github.com/decred/dcrdata/db/dcrpg/v2" + m "github.com/decred/dcrdata/middleware/v2" "github.com/decred/dcrdata/rpcutils" ) diff --git a/api/insight/converter.go b/api/insight/converter.go index ee8441137..7a6b13df9 100644 --- a/api/insight/converter.go +++ b/api/insight/converter.go @@ -8,7 +8,7 @@ import ( "github.com/decred/dcrd/blockchain" "github.com/decred/dcrd/dcrjson/v2" "github.com/decred/dcrd/dcrutil" - apitypes "github.com/decred/dcrdata/api/types" + apitypes "github.com/decred/dcrdata/api/types/v2" ) // TxConverter converts dcrd-tx to insight tx diff --git a/cmd/rebuilddb/rebuilddb.go b/cmd/rebuilddb/rebuilddb.go index ff359726b..832c2f688 100644 --- a/cmd/rebuilddb/rebuilddb.go +++ b/cmd/rebuilddb/rebuilddb.go @@ -8,7 +8,7 @@ import ( "runtime/pprof" "github.com/decred/dcrd/rpcclient/v2" - "github.com/decred/dcrdata/db/dcrsqlite" + "github.com/decred/dcrdata/db/dcrsqlite/v2" "github.com/decred/dcrdata/rpcutils" "github.com/decred/dcrdata/stakedb" "github.com/decred/slog" diff --git a/cmd/rebuilddb2/rebuilddb2.go b/cmd/rebuilddb2/rebuilddb2.go index 3cbc2adba..dab285d6f 100644 --- a/cmd/rebuilddb2/rebuilddb2.go +++ b/cmd/rebuilddb2/rebuilddb2.go @@ -18,7 +18,7 @@ import ( "time" "github.com/decred/dcrd/rpcclient/v2" - "github.com/decred/dcrdata/db/dcrpg" + "github.com/decred/dcrdata/db/dcrpg/v2" "github.com/decred/dcrdata/rpcutils" "github.com/decred/dcrdata/stakedb" "github.com/decred/slog" diff --git a/cmd/scanblocks/scanblocks.go b/cmd/scanblocks/scanblocks.go index 26de32f10..d41c588b0 100644 --- a/cmd/scanblocks/scanblocks.go +++ b/cmd/scanblocks/scanblocks.go @@ -12,7 +12,7 @@ import ( "github.com/decred/dcrd/chaincfg" "github.com/decred/dcrd/dcrutil" "github.com/decred/dcrd/rpcclient/v2" - apitypes "github.com/decred/dcrdata/api/types" + apitypes "github.com/decred/dcrdata/api/types/v2" "github.com/decred/dcrdata/db/dbtypes" "github.com/decred/dcrdata/rpcutils" "github.com/decred/dcrdata/txhelpers" diff --git a/explorer/explorer.go b/explorer/explorer.go index 146a6cd6d..b80959dc8 100644 --- a/explorer/explorer.go +++ b/explorer/explorer.go @@ -29,7 +29,7 @@ import ( "github.com/decred/dcrdata/explorer/types" "github.com/decred/dcrdata/gov/agendas" pitypes "github.com/decred/dcrdata/gov/politeia/types" - "github.com/decred/dcrdata/mempool" + "github.com/decred/dcrdata/mempool/v2" pstypes "github.com/decred/dcrdata/pubsub/types" "github.com/decred/dcrdata/txhelpers" "github.com/go-chi/chi" diff --git a/explorer/explorerroutes_test.go b/explorer/explorerroutes_test.go index b983a0c5b..9835690ec 100644 --- a/explorer/explorerroutes_test.go +++ b/explorer/explorerroutes_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/decred/dcrd/chaincfg" - "github.com/decred/dcrdata/db/dcrpg" - "github.com/decred/dcrdata/db/dcrsqlite" + "github.com/decred/dcrdata/db/dcrpg/v2" + "github.com/decred/dcrdata/db/dcrsqlite/v2" "github.com/decred/dcrdata/explorer/types" ) diff --git a/explorer/websockethandlers.go b/explorer/websockethandlers.go index 2aeb6ef4e..93d5d0db0 100644 --- a/explorer/websockethandlers.go +++ b/explorer/websockethandlers.go @@ -13,7 +13,7 @@ import ( "strings" "time" - apitypes "github.com/decred/dcrdata/api/types" + apitypes "github.com/decred/dcrdata/api/types/v2" "github.com/decred/dcrdata/db/dbtypes" "github.com/decred/dcrdata/explorer/types" pstypes "github.com/decred/dcrdata/pubsub/types" diff --git a/go.mod b/go.mod index 390dc1dae..1f9c5ce71 100644 --- a/go.mod +++ b/go.mod @@ -12,23 +12,23 @@ require ( github.com/decred/dcrd/rpcclient/v2 v2.0.0 github.com/decred/dcrd/txscript v1.0.3-0.20190402182842-879eebce3333 github.com/decred/dcrd/wire v1.2.0 - github.com/decred/dcrdata/api/types v1.0.7-0.20190418034050-08c2119ba59f - github.com/decred/dcrdata/blockdata v1.0.2-0.20190418034050-08c2119ba59f - github.com/decred/dcrdata/db/dbtypes v1.0.2-0.20190418034050-08c2119ba59f - github.com/decred/dcrdata/db/dcrpg v1.0.1-0.20190418034050-08c2119ba59f - github.com/decred/dcrdata/db/dcrsqlite v1.0.1-0.20190418034050-08c2119ba59f + github.com/decred/dcrdata/api/types/v2 v2.0.1 + github.com/decred/dcrdata/blockdata v1.0.2 + github.com/decred/dcrdata/db/dbtypes v1.1.0 + github.com/decred/dcrdata/db/dcrpg/v2 v2.0.0 + github.com/decred/dcrdata/db/dcrsqlite/v2 v2.0.0 github.com/decred/dcrdata/exchanges v1.0.0 - github.com/decred/dcrdata/explorer/types v1.0.0 - github.com/decred/dcrdata/gov/agendas v1.0.1-0.20190418034050-08c2119ba59f - github.com/decred/dcrdata/gov/politeia v1.0.1-0.20190418034050-08c2119ba59f - github.com/decred/dcrdata/mempool v1.0.1-0.20190418034050-08c2119ba59f - github.com/decred/dcrdata/middleware v1.0.2-0.20190418034050-08c2119ba59f - github.com/decred/dcrdata/pubsub v1.0.0 - github.com/decred/dcrdata/pubsub/types v1.0.0 - github.com/decred/dcrdata/rpcutils v1.0.2-0.20190418034050-08c2119ba59f + github.com/decred/dcrdata/explorer/types v1.0.1 + github.com/decred/dcrdata/gov/agendas v1.1.0 + github.com/decred/dcrdata/gov/politeia v1.1.0 + github.com/decred/dcrdata/mempool/v2 v2.0.0 + github.com/decred/dcrdata/middleware/v2 v2.0.1 + github.com/decred/dcrdata/pubsub v1.0.1 + github.com/decred/dcrdata/pubsub/types v1.0.1 + github.com/decred/dcrdata/rpcutils v1.1.0 github.com/decred/dcrdata/semver v1.0.0 - github.com/decred/dcrdata/stakedb v1.0.1 - github.com/decred/dcrdata/txhelpers v1.0.2-0.20190418034050-08c2119ba59f + github.com/decred/dcrdata/stakedb v1.0.2 + github.com/decred/dcrdata/txhelpers v1.1.0 github.com/decred/dcrwallet/wallet v1.2.0 github.com/decred/slog v1.0.0 github.com/didip/tollbooth v4.0.1-0.20180415195142-b10a036da5f0+incompatible @@ -39,7 +39,7 @@ require ( github.com/googollee/go-socket.io v0.0.0-20181214084611-0ad7206c347a github.com/jessevdk/go-flags v1.4.0 github.com/jrick/logrotate v1.0.0 - github.com/lib/pq v1.0.0 + github.com/lib/pq v1.1.0 github.com/rs/cors v1.6.0 github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 github.com/sirupsen/logrus v1.2.0 diff --git a/go.sum b/go.sum index 58a4296f9..ff1273a6d 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOv github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/zstd v1.3.4 h1:LAGHkXuvC6yky+C2CUG2tD7w8QlrUwpue8XwIh0X4AY= github.com/DataDog/zstd v1.3.4/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.3.5 h1:DtpNbljikUepEPD16hD4LvIcmhnhdLTiW/5pHgbmp14= -github.com/DataDog/zstd v1.3.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/DataDog/zstd v1.4.0 h1:vhoV+DUHnRZdKW1i5UMjAk2G4JY8wN4ayRfYDNdEhwo= +github.com/DataDog/zstd v1.4.0/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Sereal/Sereal v0.0.0-20180727013122-68c42fd7bfdf/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM= github.com/Sereal/Sereal v0.0.0-20181211220259-509a78ddbda3 h1:Xu7z47ZiE/J+sKXHZMGxEor/oY2q6dq51fkO0JqdSwY= github.com/Sereal/Sereal v0.0.0-20181211220259-509a78ddbda3/go.mod h1:D0JMgToj/WdxCgd30Kc1UcA9E+WdZoJqeVOuYW7iTBM= @@ -156,60 +156,44 @@ github.com/decred/dcrd/wire v1.1.0 h1:G+3CugtxNbToUN8RKWqm74yLfzJJ2BKMOr2RgWc4Ty github.com/decred/dcrd/wire v1.1.0/go.mod h1:/JKOsLInOJu6InN+/zH5AyCq3YDIOW/EqcffvU8fJHM= github.com/decred/dcrd/wire v1.2.0 h1:HqJVB7vcklIguzFWgRXw/WYCQ9cD3bUC5TKj53i1Hng= github.com/decred/dcrd/wire v1.2.0/go.mod h1:/JKOsLInOJu6InN+/zH5AyCq3YDIOW/EqcffvU8fJHM= -github.com/decred/dcrdata/api/types v1.0.6 h1:ipZ7bN/9RE1rOKa2IYXe7yVoxs6e6Bfs8bCNzsJzMOY= -github.com/decred/dcrdata/api/types v1.0.6/go.mod h1:BuRGiCMg2EhpvAWp8ezLZ+mbLC8fcfKMX/q3PYfUgHk= -github.com/decred/dcrdata/api/types v1.0.7-0.20190418034050-08c2119ba59f h1:LqNjyz7HTJG+xk2ha0kQf3uIIEpq+iCFo+xmWoJI0eU= -github.com/decred/dcrdata/api/types v1.0.7-0.20190418034050-08c2119ba59f/go.mod h1:9GtTpFxeQTPsGcn6jXyBg5oZW1azUdzSDwkrd37XGPo= -github.com/decred/dcrdata/blockdata v1.0.1 h1:tWaEaYpYEXuT39k/U7e2PAiV3eHuofq6SIxa2yW3TeQ= -github.com/decred/dcrdata/blockdata v1.0.1/go.mod h1:7gRh/YmQa6v5Uf/EXpNjtbYveCFoIA5sF6l+GVcNkJA= -github.com/decred/dcrdata/blockdata v1.0.2-0.20190418034050-08c2119ba59f h1:QOoLEpSaio2jWOx7drjeD4FaaCg5KwLRVT/wwQsBJM0= -github.com/decred/dcrdata/blockdata v1.0.2-0.20190418034050-08c2119ba59f/go.mod h1:NPFNgsakqkJ/zVemyA6ZeEmFljJb/CO3vUHaVoRtdIU= -github.com/decred/dcrdata/db/cache v1.0.1 h1:sqE2RXy6jNhhWdRHASJZyHsaipYRpDlGxEHN8OtLe6U= -github.com/decred/dcrdata/db/cache v1.0.1/go.mod h1:WPkmV72Cal2OOjt4bG35XrjzSqspxMqvWAGpwUUw1B4= -github.com/decred/dcrdata/db/dbtypes v1.0.1/go.mod h1:d9qVcMl+l5rOEY7zJB5nqQ0WDEHof9vWlW/9hpK0xpc= -github.com/decred/dcrdata/db/dbtypes v1.0.2-0.20190402170540-10fdc522fdb0/go.mod h1:LudmFCLYI971HqEmz6TGEZBlXZtai6AOsynv5L8GRWw= -github.com/decred/dcrdata/db/dbtypes v1.0.2-0.20190404134533-26b1a4335e4a h1:WT4avqaPywnwXJL0YCjnEMXNy6RQgYNVUdMHNW5w3vI= -github.com/decred/dcrdata/db/dbtypes v1.0.2-0.20190404134533-26b1a4335e4a/go.mod h1:LudmFCLYI971HqEmz6TGEZBlXZtai6AOsynv5L8GRWw= -github.com/decred/dcrdata/db/dbtypes v1.0.2-0.20190418034050-08c2119ba59f h1:VtUaJhPLTJROMOilTKcL5LfvAMvR2L8brOvWJavEDNU= -github.com/decred/dcrdata/db/dbtypes v1.0.2-0.20190418034050-08c2119ba59f/go.mod h1:xykPVCnXKsi+zq9a4EQcvt7btytS4lAKlWO56pAiuwc= -github.com/decred/dcrdata/db/dcrpg v1.0.0 h1:ebRfU8carJYn6X7fLH/tlm+iRILt/lY9vA+oVB92QP8= -github.com/decred/dcrdata/db/dcrpg v1.0.0/go.mod h1:b1YmLNZH2p7evVJU6hapsW5Mup5Xtvx3OK48jQa6PYE= -github.com/decred/dcrdata/db/dcrpg v1.0.1-0.20190418034050-08c2119ba59f h1:JDAaHN3w84KUHzVs02TL/Xo1iGlH0PaIOI5d3jU8xbw= -github.com/decred/dcrdata/db/dcrpg v1.0.1-0.20190418034050-08c2119ba59f/go.mod h1:JsXvz1wzcq8reVbFrPK7gb6f2sQKil0slNbuR688rh8= -github.com/decred/dcrdata/db/dcrsqlite v1.0.1-0.20190418034050-08c2119ba59f h1:vjsbBPnRBwCD0tYZvxBryGGWmja4r+B+UwthC8/8HkI= -github.com/decred/dcrdata/db/dcrsqlite v1.0.1-0.20190418034050-08c2119ba59f/go.mod h1:Tu1KBlu0SLyYc/8ErFRAa0T73tAnf6d+0ehKizjVfUQ= +github.com/decred/dcrdata/api/types/v2 v2.0.1 h1:R/uLwRtp60QeI9JBaxJwcElGKKLs8O5YmUvy0oZZOW8= +github.com/decred/dcrdata/api/types/v2 v2.0.1/go.mod h1:XnaoT+i2SMmwRkf5ZG08a8nC3fvGD93RDoszdh51uSI= +github.com/decred/dcrdata/blockdata v1.0.2 h1:x+J9wxOmnXw3J6Z3wadTN8Ql+q+N2cm5nWFWhBmqU+o= +github.com/decred/dcrdata/blockdata v1.0.2/go.mod h1:KiPv1HAPyQnhYGLrK+KjXALlIWrNIGyBgkbVus0lVV0= +github.com/decred/dcrdata/db/cache v1.0.2 h1:MPINn5a7WCLIg05meAKoeM6nIZasKoyNqZwwQtUduy8= +github.com/decred/dcrdata/db/cache v1.0.2/go.mod h1:9GfbIUOpGIiX4v+GIxRhuN2CjHun566hDsmLTi6vgS0= +github.com/decred/dcrdata/db/dbtypes v1.1.0 h1:bGIuax6ZDETi1d82d5toVd8S4Gbgs3kH3uJ7wg98aIE= +github.com/decred/dcrdata/db/dbtypes v1.1.0/go.mod h1:OFEzyr6E2qCBqeuJihQ25Tum6oI3NN+qe3DKZ01aPUs= +github.com/decred/dcrdata/db/dcrpg/v2 v2.0.0 h1:941aqoii5GWEKSrF0ZeNIWAgAz01BV/TEpRIfQOIwzA= +github.com/decred/dcrdata/db/dcrpg/v2 v2.0.0/go.mod h1:RhRACDEPoAbCNrRLy0VwUTlxqyVLQNrCgnjvgh54G/4= +github.com/decred/dcrdata/db/dcrsqlite/v2 v2.0.0 h1:sPSQMiCtunxvHlEowD3ZYnj4Xvdz9TGE4jAhw5txfoc= +github.com/decred/dcrdata/db/dcrsqlite/v2 v2.0.0/go.mod h1:vWqRnd29L7ZVKjwN9Gt/MTlpD3F4HVM2xWxH6aiZ7H8= github.com/decred/dcrdata/dcrrates v1.0.0 h1:yxl2gfthS6brVefg6w5X8iv6ukglL+ITtR22Un+Y0No= github.com/decred/dcrdata/dcrrates v1.0.0/go.mod h1:CTqBa1Q10FaBQK05P2aP72Ru9mD1lLmt+urcs4K9RZo= github.com/decred/dcrdata/exchanges v1.0.0 h1:+Wlq8gIsjwbzzNTyMcmm0lf/joP1fYPr8EfT6ean5Zg= github.com/decred/dcrdata/exchanges v1.0.0/go.mod h1:b34x8boSFo0z0pndmkKS13dEFiRRMzSYU8AHns7W/JM= -github.com/decred/dcrdata/explorer/types v1.0.0 h1:Z88QUlAMUbgiJlwhsfEQwp/aSvfSQYb9N+iTVD1ClM4= -github.com/decred/dcrdata/explorer/types v1.0.0/go.mod h1:3yYHDjvuaJJwajgfoTOdfXDO5v5HeMG/8Z3PH894bPM= -github.com/decred/dcrdata/gov/agendas v1.0.1-0.20190418034050-08c2119ba59f h1:ZIElDJtV6ZTtET/I080pilPk+iYm6ri8VTlbVkhykrI= -github.com/decred/dcrdata/gov/agendas v1.0.1-0.20190418034050-08c2119ba59f/go.mod h1:l/L5qcAEMZW2b+guuTlB6GvSuwV1fbao42mDSTt1lEs= -github.com/decred/dcrdata/gov/politeia v1.0.1-0.20190418034050-08c2119ba59f h1:StWCrZu3smJnFCbUZeJ0YomnATmFy/QDoeVsF3pKRb4= -github.com/decred/dcrdata/gov/politeia v1.0.1-0.20190418034050-08c2119ba59f/go.mod h1:HSS/RH6nU6GD4FbnQRjYYmZawxVZVqY0gWMEKbaGjJo= -github.com/decred/dcrdata/mempool v1.0.0 h1:M1e8wdVDajNSwP4NltcfxmeKpwNDdM9wf4GlhuLtEmQ= -github.com/decred/dcrdata/mempool v1.0.0/go.mod h1:U/dLvJy1YpHYCfYj2TI43U7g00WCiTNe9HQcJv4EV4A= -github.com/decred/dcrdata/mempool v1.0.1-0.20190418034050-08c2119ba59f h1:BALdmJgByLToZMfSq9oK2fRKcO5fZFGXe89jOjA78cc= -github.com/decred/dcrdata/mempool v1.0.1-0.20190418034050-08c2119ba59f/go.mod h1:Ps69yxEVYwLvmkyO8tHcZ8W6GMVmQedIU1TFS/qvPnw= -github.com/decred/dcrdata/middleware v1.0.2-0.20190418034050-08c2119ba59f h1:WZW1qNR/kq0Z36hlQDO9arQnS2Pws3NdcEO/71RQq1w= -github.com/decred/dcrdata/middleware v1.0.2-0.20190418034050-08c2119ba59f/go.mod h1:spEpUzASuvUd/XtRGDLUT/hbPbW2A6sQ+JbptuZv02I= -github.com/decred/dcrdata/pubsub v1.0.0 h1:pgsf2yuEPjFxKKoZR2j7LhGqWWVbYZ6PLex0fIDwhHs= -github.com/decred/dcrdata/pubsub v1.0.0/go.mod h1:nI81RHhdS0R/ubifyljQKReyoXPUpJvMxGkYobO5JNg= -github.com/decred/dcrdata/pubsub/types v1.0.0 h1:XJCaCiCAAHjiMgG0hrWswR0JmFkTJ83uuzLj1CuGqWM= -github.com/decred/dcrdata/pubsub/types v1.0.0/go.mod h1:mjQ/8R2c33hYqJVUM2FCMcdaOmotT9hR8QxQ9JN8GlY= -github.com/decred/dcrdata/rpcutils v1.0.1 h1:6QRdrsD71sfhQbDp6wMt3tgsck+0MW0N7bB4ZnWL7mA= -github.com/decred/dcrdata/rpcutils v1.0.1/go.mod h1:ZQ3lZzgIiyE75+4CL3d8rDGJZLxd+ftbgWX1jAPSco8= -github.com/decred/dcrdata/rpcutils v1.0.2-0.20190418034050-08c2119ba59f h1:s2R/vz72VezMBCRyFOR0B5Z+BCKaV8XYZn1xrTuXIlY= -github.com/decred/dcrdata/rpcutils v1.0.2-0.20190418034050-08c2119ba59f/go.mod h1:lZi3WQg2Y+rUAF288DOGse3H8eEtq9jItAES7biuZG0= +github.com/decred/dcrdata/explorer/types v1.0.1 h1:GAMnVy1KDwq7GqC1AYKaR+Msl70Tv0GYy5TH6bMJpEM= +github.com/decred/dcrdata/explorer/types v1.0.1/go.mod h1:QPKurkX8v7UshmXgZS3VOzuIrU4hoCBac8Mt4YxgYYs= +github.com/decred/dcrdata/gov/agendas v1.1.0 h1:XOnA7JgvVtnfq0PTSGn2XkWmjGa6ZWn4PLl8Qi8gUXg= +github.com/decred/dcrdata/gov/agendas v1.1.0/go.mod h1:wXOs/PT0LzusDzdxRXWaKwE3EIHz9uUUt/0mfC/V6CA= +github.com/decred/dcrdata/gov/politeia v1.1.0 h1:Dhc97ojB4eCafc99A/DsHMdaSY3NR/mGLNAwoWTl7RM= +github.com/decred/dcrdata/gov/politeia v1.1.0/go.mod h1:ckcQHZS6Vd1dD5tImwMzBTJa/Hw6GLTNU9km0uw7gH4= +github.com/decred/dcrdata/mempool/v2 v2.0.0 h1:GZHL8UgsCWiamfCSUQ4DY/aB6m4OXYbylMc0WxOQjc0= +github.com/decred/dcrdata/mempool/v2 v2.0.0/go.mod h1:FIRHQCgF92I/picVJ4lccrLn/c6IsmHx5hZot1Tok3k= +github.com/decred/dcrdata/middleware/v2 v2.0.1 h1:2bwFvRuBzEvSqeILo3T+UzXCfEeqL1oc61qWrVLPUo8= +github.com/decred/dcrdata/middleware/v2 v2.0.1/go.mod h1:q9RysoAyYOM56eDARVXzWDcmOdQutmJ0Tc27L0bhWKU= +github.com/decred/dcrdata/pubsub v1.0.1 h1:UnBe8V+Sn6yg9P7g18AF/487h9RLCM4N4HgV8JfOa3U= +github.com/decred/dcrdata/pubsub v1.0.1/go.mod h1:88pj3GWYyV/q6EPxIgc52+Yx1KDHxH1uytL9juBCIlk= +github.com/decred/dcrdata/pubsub/types v1.0.1 h1:NNSLj8veK/hC83pe2dwJ11YDXLhu7VJZY8z55tKWTXQ= +github.com/decred/dcrdata/pubsub/types v1.0.1/go.mod h1:zb1NxpNtfgWUayN3wV3AeB1z1ku5r64slNPLaM0QHUk= +github.com/decred/dcrdata/rpcutils v1.1.0 h1:3ejpYPrNPDn9B9304TKGQUAlJzvR/KyEA+X4PpwMpes= +github.com/decred/dcrdata/rpcutils v1.1.0/go.mod h1:kylUqD9Yj4dJnRfVSQc7rd0KpyyrlO7DPOJFyCXxn9E= github.com/decred/dcrdata/semver v1.0.0 h1:DBqYU/x+4LqHq/3r4xKdF6xG5ewktG2KDC+g/p3f8mc= github.com/decred/dcrdata/semver v1.0.0/go.mod h1:z+nQqiAd9fYkHhBLbejysZ2FPHtgkrErWDgMf+JlZWE= -github.com/decred/dcrdata/stakedb v1.0.1 h1:ncEsHgYrlGQAkza/RIGJQUuNsmFn4jdLlOt0w/Z7D0c= -github.com/decred/dcrdata/stakedb v1.0.1/go.mod h1:zEJ8qEtmxJLRK3IAfbpleAW2qvpWuldeBrLpz/amQjE= -github.com/decred/dcrdata/txhelpers v1.0.1 h1:KIIxb23/QI0nLFV4DV+cNaBf7hJKv1AYxy8h3ebTnmI= -github.com/decred/dcrdata/txhelpers v1.0.1/go.mod h1:oZOlm7v82oD5SIy1wlOBG0OT92CMfmKg05wk+2qaSaM= -github.com/decred/dcrdata/txhelpers v1.0.2-0.20190418034050-08c2119ba59f h1:39VmGsuQ78EXuxtGTpUt8RGw1P/wLLLUWTIDCOxOhAI= -github.com/decred/dcrdata/txhelpers v1.0.2-0.20190418034050-08c2119ba59f/go.mod h1:IyxuqUxIPrHnOmRy9DCl90oqw7FxYHde/fkIkF21B7w= +github.com/decred/dcrdata/stakedb v1.0.2 h1:+ze45n4Jf4vBONwEIrDdhR96GsvExOa5BCedMoSrh6s= +github.com/decred/dcrdata/stakedb v1.0.2/go.mod h1:ZkMg6ItBmXZP5oYWPGsTeznuHpp6TSWYuRnM6me5ZEQ= +github.com/decred/dcrdata/txhelpers v1.1.0 h1:xKK+1/OASkSxMe/KDLaLJeJjJdopgC+FV8+EFPpJAGk= +github.com/decred/dcrdata/txhelpers v1.1.0/go.mod h1:IyxuqUxIPrHnOmRy9DCl90oqw7FxYHde/fkIkF21B7w= github.com/decred/dcrdata/v3 v3.1.2/go.mod h1:yzBJXhNSOHsWgLNp9m0rGUY3ajn6HADvre0bL3ApNdE= github.com/decred/dcrtime v0.0.0-20180808181920-4c91c4cbed09/go.mod h1:ix2x3x3d4LivVPyh1l+ZVNjxuycrXyGZolnuVqVfywY= github.com/decred/dcrwallet v1.2.3-0.20190128160919-849f7c01c12d h1:29CvbLfATHA5XDxr6w4Z3hYx/tqM+tgnj63LJhUVCCU= @@ -254,8 +238,8 @@ github.com/dgraph-io/badger v1.5.5-0.20190214192501-3196cc1d7a5f h1:zpnMq37RjYYJ github.com/dgraph-io/badger v1.5.5-0.20190214192501-3196cc1d7a5f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ= github.com/dgryski/go-farm v0.0.0-20180109070241-2de33835d102 h1:afESQBXJEnj3fu+34X//E8Wg3nEbMJxJkwSc0tPePK0= github.com/dgryski/go-farm v0.0.0-20180109070241-2de33835d102/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-farm v0.0.0-20190323231341-8198c7b169ec h1:sElGDs3V8VdCxH5tWi0ycWJzteOPLJ3HtItSSKI95PY= -github.com/dgryski/go-farm v0.0.0-20190323231341-8198c7b169ec/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-farm v0.0.0-20190416075124-e1214b5e05dc h1:VxEJYcOh1LMAdhIiHkofa6UC0PZvCmielUgJXgAAWFU= +github.com/dgryski/go-farm v0.0.0-20190416075124-e1214b5e05dc/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/didip/tollbooth v4.0.0+incompatible/go.mod h1:A9b0665CE6l1KmzpDws2++elm/CsuWBMa5Jv4WY0PEY= github.com/didip/tollbooth v4.0.1-0.20180415195142-b10a036da5f0+incompatible h1:XPOvHQZ3qQ54NtienofDf4clvH/6Kf9FbX3MqkdDsOQ= github.com/didip/tollbooth v4.0.1-0.20180415195142-b10a036da5f0+incompatible/go.mod h1:A9b0665CE6l1KmzpDws2++elm/CsuWBMa5Jv4WY0PEY= @@ -343,6 +327,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v0.0.0-20180523175426-90697d60dd84/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0 h1:/5u4a+KGJptBRqGzPvYQL9p0d/tPR4S31+Tnzj9lEO4= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= @@ -471,6 +457,8 @@ golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqY golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/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 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 h1:+DCIGbF/swA92ohVg0//6X2IVY3KZs6p9mix0ziNYJM= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52 h1:JG/0uqcGdTNgq7FdU+61l5Pdmb8putNZlXb65bJBROs= diff --git a/log.go b/log.go index 85cb611eb..591a3c710 100644 --- a/log.go +++ b/log.go @@ -11,13 +11,13 @@ import ( "github.com/decred/dcrd/rpcclient/v2" "github.com/decred/dcrdata/blockdata" - "github.com/decred/dcrdata/db/dcrpg" - "github.com/decred/dcrdata/db/dcrsqlite" + "github.com/decred/dcrdata/db/dcrpg/v2" + "github.com/decred/dcrdata/db/dcrsqlite/v2" "github.com/decred/dcrdata/exchanges" "github.com/decred/dcrdata/gov/agendas" "github.com/decred/dcrdata/gov/politeia" - "github.com/decred/dcrdata/mempool" - "github.com/decred/dcrdata/middleware" + "github.com/decred/dcrdata/mempool/v2" + "github.com/decred/dcrdata/middleware/v2" "github.com/decred/dcrdata/pubsub" "github.com/decred/dcrdata/rpcutils" "github.com/decred/dcrdata/stakedb" diff --git a/main.go b/main.go index 50d7185da..fc7973be0 100644 --- a/main.go +++ b/main.go @@ -26,14 +26,14 @@ import ( "github.com/decred/dcrd/rpcclient/v2" "github.com/decred/dcrdata/blockdata" "github.com/decred/dcrdata/db/dbtypes" - "github.com/decred/dcrdata/db/dcrpg" - "github.com/decred/dcrdata/db/dcrsqlite" + "github.com/decred/dcrdata/db/dcrpg/v2" + "github.com/decred/dcrdata/db/dcrsqlite/v2" "github.com/decred/dcrdata/exchanges" exptypes "github.com/decred/dcrdata/explorer/types" "github.com/decred/dcrdata/gov/agendas" "github.com/decred/dcrdata/gov/politeia" - "github.com/decred/dcrdata/mempool" - m "github.com/decred/dcrdata/middleware" + "github.com/decred/dcrdata/mempool/v2" + m "github.com/decred/dcrdata/middleware/v2" "github.com/decred/dcrdata/pubsub" pstypes "github.com/decred/dcrdata/pubsub/types" "github.com/decred/dcrdata/rpcutils"