From 4858af2682cc1c626d6b546725a94711ca1d7c1b Mon Sep 17 00:00:00 2001 From: Jamie Holdstock Date: Mon, 26 Apr 2021 15:12:23 +0100 Subject: [PATCH] Upgrade deps (#239) * Update to latest deps. Includes using the dcrd stdaddr package instead of dcrutil. * Use stdaddr.Hash160 --- config.go | 4 +-- go.mod | 19 +++++------ go.sum | 70 ++++++++++++++++++++++++-------------- rpc/dcrd.go | 2 +- rpc/dcrwallet.go | 4 +-- webapi/addressgenerator.go | 7 ++-- webapi/getfeeaddress.go | 4 +-- webapi/helpers.go | 4 +-- webapi/middleware.go | 4 +-- webapi/payfee.go | 18 +++++----- 10 files changed, 77 insertions(+), 59 deletions(-) diff --git a/config.go b/config.go index d811535..30c8e3d 100644 --- a/config.go +++ b/config.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "decred.org/dcrwallet/wallet/txrules" - "github.com/decred/dcrd/dcrutil/v3" + "decred.org/dcrwallet/v2/wallet/txrules" + "github.com/decred/dcrd/dcrutil/v4" "github.com/decred/dcrd/hdkeychain/v3" "github.com/decred/vspd/database" "github.com/decred/vspd/version" diff --git a/go.mod b/go.mod index e6b33a1..5ee0d1b 100644 --- a/go.mod +++ b/go.mod @@ -3,21 +3,20 @@ module github.com/decred/vspd go 1.13 require ( - decred.org/dcrwallet v1.6.1 - github.com/decred/dcrd/blockchain/stake/v3 v3.0.0 - github.com/decred/dcrd/blockchain/v3 v3.0.3 + decred.org/dcrwallet/v2 v2.0.0-20210415173800-2c9ede7f8daa + github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210415225937-dd2a786ee1d1 + github.com/decred/dcrd/blockchain/v4 v4.0.0-20210415225937-dd2a786ee1d1 github.com/decred/dcrd/chaincfg/chainhash v1.0.2 github.com/decred/dcrd/chaincfg/v3 v3.0.0 - github.com/decred/dcrd/dcrec v1.0.0 - github.com/decred/dcrd/dcrutil/v3 v3.0.0 + github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210415225937-dd2a786ee1d1 github.com/decred/dcrd/hdkeychain/v3 v3.0.0 - github.com/decred/dcrd/rpc/jsonrpc/types/v2 v2.3.0 - github.com/decred/dcrd/txscript/v3 v3.0.0 + github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210415225937-dd2a786ee1d1 + github.com/decred/dcrd/txscript/v4 v4.0.0-20210415225937-dd2a786ee1d1 github.com/decred/dcrd/wire v1.4.0 - github.com/decred/slog v1.1.0 - github.com/gin-gonic/gin v1.6.3 + github.com/decred/slog v1.2.0 + github.com/gin-gonic/gin v1.7.1 github.com/gorilla/sessions v1.2.1 - github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7 + github.com/jessevdk/go-flags v1.5.0 github.com/jrick/bitset v1.0.0 github.com/jrick/logrotate v1.0.0 github.com/jrick/wsrpc/v2 v2.3.4 diff --git a/go.sum b/go.sum index 295f43c..4967357 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= decred.org/cspp v0.3.0/go.mod h1:UygjYilC94dER3BEU65Zzyoqy9ngJfWCD2rdJqvUs2A= -decred.org/dcrwallet v1.6.1 h1:eoGaQMUa5olB/sYPqkqZovqYGkKexQWwZMmJReZ6Hz0= -decred.org/dcrwallet v1.6.1/go.mod h1:deeiKo2RpnmPpGfmNR2fFupdq5D+fFubA8js29YjDDc= +decred.org/dcrwallet/v2 v2.0.0-20210415173800-2c9ede7f8daa h1:cafi5DQOEU3frG3wAvlbkUhFB7+gMKLRQ5VICSuity4= +decred.org/dcrwallet/v2 v2.0.0-20210415173800-2c9ede7f8daa/go.mod h1:WflBF81Mt/FIcEEuSBx0uc5ng2rNDb+CKM8qHISYhNQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI= github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= @@ -11,18 +11,21 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX 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/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= +github.com/dchest/siphash v1.2.2 h1:9DFz8tQwl9pTVt5iok/9zKyzA1Q6bRGiF3HPiEEVr9I= +github.com/dchest/siphash v1.2.2/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= github.com/decred/base58 v1.0.3 h1:KGZuh8d1WEMIrK0leQRM47W85KqCAdl2N+uagbctdDI= github.com/decred/base58 v1.0.3/go.mod h1:pXP9cXCfM2sFLb2viz2FNIdeMWmZDBKG3ZBYbiSM78E= -github.com/decred/dcrd/addrmgr v1.2.0/go.mod h1:QlZF9vkzwYh0qs25C76SAFZBRscjETga/K28GEE6qIc= -github.com/decred/dcrd/blockchain/stake/v3 v3.0.0 h1:vr0o0ICjuEzg1End6YtBfwgDuPkg+FYIwGVEz18kFg0= -github.com/decred/dcrd/blockchain/stake/v3 v3.0.0/go.mod h1:5GIUwsrHQCJauacgCegIR6t92SaeVi28Qls/BLN9vOw= +github.com/decred/dcrd/addrmgr/v2 v2.0.0-20210412162101-76f80ba180f0/go.mod h1:VKxDZPQTcFkUhJjEsr+dcnExKlp8qdS4sUR5XUsonwg= +github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210129192908-660d0518b4cf/go.mod h1:zALtZt59lCrhoj6dVMptHHAMw1hq0Zz9s2ZULWjhtZs= +github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210409183916-7f402345f0a6/go.mod h1:YtLRoqodBkyTSLNhr4bvLlkn/C24gIzwTG16gtvxVQo= +github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210415225937-dd2a786ee1d1 h1:eeABJefj/D0yieWA3JxlVmOYG36VS3ffc+F2mY8uwFo= +github.com/decred/dcrd/blockchain/stake/v4 v4.0.0-20210415225937-dd2a786ee1d1/go.mod h1:l0WWtO2D4lhDJDWjFPFClNDBJ5gp6CI5dfk9QsWS59Q= github.com/decred/dcrd/blockchain/standalone/v2 v2.0.0 h1:9gUuH0u/IZNPWBK9K3CxgAWPG7nTqVSsZefpGY4Okns= github.com/decred/dcrd/blockchain/standalone/v2 v2.0.0/go.mod h1:t2qaZ3hNnxHZ5kzVJDgW5sp47/8T5hYJt7SR+/JtRhI= -github.com/decred/dcrd/blockchain/v3 v3.0.2/go.mod h1:LD5VA95qdb+DlRiPI8VLBimDqvlDCAJsidZ5oD6nc/U= -github.com/decred/dcrd/blockchain/v3 v3.0.3 h1:VdvCpKtnVfGyqakOd8tMOU/qJT3mpgBgS9oJkOxUq+8= -github.com/decred/dcrd/blockchain/v3 v3.0.3/go.mod h1:LD5VA95qdb+DlRiPI8VLBimDqvlDCAJsidZ5oD6nc/U= +github.com/decred/dcrd/blockchain/v4 v4.0.0-20210129200153-14fd1a785bf2/go.mod h1:AwWyfS769nQVXTbfwrSVsAMAwkpoU1N//6XYkYwXJUU= +github.com/decred/dcrd/blockchain/v4 v4.0.0-20210415225937-dd2a786ee1d1 h1:2RWfcA6r3UaQhUXgCIdI/1gY57k+ASNgWAM9xq0u2MY= +github.com/decred/dcrd/blockchain/v4 v4.0.0-20210415225937-dd2a786ee1d1/go.mod h1:GGaVepArYhrgWUI41Z0T9FmFqbvbhDyS0qsTsjfzct0= github.com/decred/dcrd/certgen v1.1.1/go.mod h1:ivkPLChfjdAgFh7ZQOtl6kJRqVkfrCq67dlq3AbZBQE= github.com/decred/dcrd/chaincfg/chainhash v1.0.2 h1:rt5Vlq/jM3ZawwiacWjPa+smINyLRN07EO0cNBV6DGU= github.com/decred/dcrd/chaincfg/chainhash v1.0.2/go.mod h1:BpbrGgrPTr3YJYRN3Bm+D9NuaFd+zGyNeIKgrhCXK60= @@ -33,32 +36,44 @@ github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= github.com/decred/dcrd/crypto/ripemd160 v1.0.1 h1:TjRL4LfftzTjXzaufov96iDAkbY2R3aTvH2YMYa1IOc= github.com/decred/dcrd/crypto/ripemd160 v1.0.1/go.mod h1:F0H8cjIuWTRoixr/LM3REB8obcWkmYx0gbxpQWR8RPg= -github.com/decred/dcrd/database/v2 v2.0.2 h1:t1ch4sk2qIhxGcAmWQJkFwsbqKITEcVa8E+BFpxOf7s= -github.com/decred/dcrd/database/v2 v2.0.2/go.mod h1:S78KbTCCJWUTJDVTByiQuB+HmL0DM2vIMsa2WsrF9KM= +github.com/decred/dcrd/database/v2 v2.0.3-0.20210129190127-4ebd135a82f1 h1:+oUVvEK/+TQeJqJs0bbnVcs2IvFkL4Z8nIKupeFDV3A= +github.com/decred/dcrd/database/v2 v2.0.3-0.20210129190127-4ebd135a82f1/go.mod h1:C5nb1qImTy2sxAfV1KJFW6KHae+NbD6lSMJl58KY7XM= github.com/decred/dcrd/dcrec v1.0.0 h1:W+z6Es+Rai3MXYVoPAxYr5U1DGis0Co33scJ6uH2J6o= github.com/decred/dcrd/dcrec v1.0.0/go.mod h1:HIaqbEJQ+PDzQcORxnqen5/V1FR3B4VpIfmePklt8Q8= github.com/decred/dcrd/dcrec/edwards/v2 v2.0.1 h1:V6eqU1crZzuoFT4KG2LhaU5xDSdkHuvLQsj25wd7Wb4= github.com/decred/dcrd/dcrec/edwards/v2 v2.0.1/go.mod h1:d0H8xGMWbiIQP7gN3v2rByWUcuZPm9YsgmnfoxgbINc= github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0 h1:sgNeV1VRMDzs6rzyPpxyM0jp317hnwiq58Filgag2xw= github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0/go.mod h1:J70FGZSbzsjecRTiTzER+3f1KZLNaXkuv+yeFTKoxM8= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210127014238-b33b46cf1a24 h1:L718+uXQkWq02GqdBdEAUIbBPh/Il/kudTsOEf0pItQ= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210127014238-b33b46cf1a24/go.mod h1:UkVqoxmJlLgUvBjJD+GdJz6mgdSdf3UjX83xfwUAYDk= github.com/decred/dcrd/dcrjson/v3 v3.1.0 h1:Y2VjCXCNWbNIa52wMKEuNiU+9rUgnjYb5c1JQW6PuzM= github.com/decred/dcrd/dcrjson/v3 v3.1.0/go.mod h1:fnTHev/ABGp8IxFudDhjGi9ghLiXRff1qZz/wvq12Mg= github.com/decred/dcrd/dcrutil/v3 v3.0.0 h1:n6uQaTQynIhCY89XsoDk2WQqcUcnbD+zUM9rnZcIOZo= github.com/decred/dcrd/dcrutil/v3 v3.0.0/go.mod h1:iVsjcqVzLmYFGCZLet2H7Nq+7imV9tYcuY+0lC2mNsY= -github.com/decred/dcrd/gcs/v2 v2.1.0 h1:foECqwfE3UJztU4CYtqUYqvR254x1Z9clXVfNdOjBQ8= -github.com/decred/dcrd/gcs/v2 v2.1.0/go.mod h1:MbnJOINFcp42NMRAQ+CjX/xGz+53AwNgMzKZhwBibdM= +github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210129181600-6ae0142d3b28/go.mod h1:xe59jKcMx5G/dbRmsZ8+FzY+WQDE/7YBP3k3uzJTtmI= +github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210415225937-dd2a786ee1d1 h1:8L4/j31nRsQWiP0H85WAjjGDN2pZ7EeySwLFAiXfxIU= +github.com/decred/dcrd/dcrutil/v4 v4.0.0-20210415225937-dd2a786ee1d1/go.mod h1:16XDlrGxq3sQd9YwzydmZUA/ojnP0MTJiYRt/7cpjrE= +github.com/decred/dcrd/gcs/v3 v3.0.0-20210129195202-a4265d63b619 h1:YEx0oEkwh9uBPVzzZTkemyKieBpQwmHSI+BdW0VHoAA= +github.com/decred/dcrd/gcs/v3 v3.0.0-20210129195202-a4265d63b619/go.mod h1:aGuAajYbDJB2oal17G371wiosGgVCc5d5FlT2EwZtoE= github.com/decred/dcrd/hdkeychain/v3 v3.0.0 h1:hOPb4c8+K6bE3a/qFtzt2Z2yzK4SpmXmxvCTFp8vMxI= github.com/decred/dcrd/hdkeychain/v3 v3.0.0/go.mod h1:Vz7PJSlLzhqmOR2lmjGD9JqAZgmUnM8P6r8hg7U4Zho= -github.com/decred/dcrd/rpc/jsonrpc/types/v2 v2.3.0 h1:KZ2zihwY5Mx6EeYwEA3bL3k+qDXdCraQL+iDIG1BP5k= -github.com/decred/dcrd/rpc/jsonrpc/types/v2 v2.3.0/go.mod h1:krn89ZOgSa8yc7sA4WpDK95p61NnjNWFkNlMnGrKbMc= -github.com/decred/dcrd/txscript/v3 v3.0.0 h1:74NmirXAIskbGP0g9OWtrmN7OxDbWJ9G73a5uoxTkcM= -github.com/decred/dcrd/txscript/v3 v3.0.0/go.mod h1:pdvnlD4KGdDoc09cvWRJ8EoRQUaiUz41uDevOWuEfII= +github.com/decred/dcrd/lru v1.1.0 h1:QwT6v8LFKOL3xQ3qtucgRk4pdiawrxIfCbUXWpm+JL4= +github.com/decred/dcrd/lru v1.1.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= +github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210129200153-14fd1a785bf2/go.mod h1:9izQEJ5wU0ZwYHESMaaOIvE6H6y3IvDsQL3ByYGn9oc= +github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210415225937-dd2a786ee1d1 h1:bYSr1NwHXlMhi0+km+GIMXTcnK3YoGmVBf0z/nMXqsU= +github.com/decred/dcrd/rpc/jsonrpc/types/v3 v3.0.0-20210415225937-dd2a786ee1d1/go.mod h1:9izQEJ5wU0ZwYHESMaaOIvE6H6y3IvDsQL3ByYGn9oc= +github.com/decred/dcrd/txscript/v4 v4.0.0-20210129190127-4ebd135a82f1/go.mod h1:EnS4vtxTESoI59geLo9M8AUOvIprJy+O4gSVsQp6/h4= +github.com/decred/dcrd/txscript/v4 v4.0.0-20210330065944-a2366e6e0b3b/go.mod h1:G6b6ERb4KkSqMOCcfSS6m5QV2dgXKVohRpK0HEECw5Q= +github.com/decred/dcrd/txscript/v4 v4.0.0-20210415215133-96b98390a9a9/go.mod h1:LBGwMZRfpS50huRsc0Bihy7w2Sl9vK3TNqv8nhCRj0U= +github.com/decred/dcrd/txscript/v4 v4.0.0-20210415225937-dd2a786ee1d1 h1:9jxVTjg7wRsd2K/7cWRevrExGbXblRGj69bzTyv5qEo= +github.com/decred/dcrd/txscript/v4 v4.0.0-20210415225937-dd2a786ee1d1/go.mod h1:LBGwMZRfpS50huRsc0Bihy7w2Sl9vK3TNqv8nhCRj0U= github.com/decred/dcrd/wire v1.3.0/go.mod h1:fnKGlUY2IBuqnpxx5dYRU5Oiq392OBqAuVjRVSkIoXM= github.com/decred/dcrd/wire v1.4.0 h1:KmSo6eTQIvhXS0fLBQ/l7hG7QLcSJQKSwSyzSqJYDk0= github.com/decred/dcrd/wire v1.4.0/go.mod h1:WxC/0K+cCAnBh+SKsRjIX9YPgvrjhmE+6pZlel1G7Ro= github.com/decred/go-socks v1.1.0/go.mod h1:sDhHqkZH0X4JjSa02oYOGhcGHYp12FsY1jQ/meV8md0= -github.com/decred/slog v1.1.0 h1:uz5ZFfmaexj1rEDgZvzQ7wjGkoSPjw2LCh8K+K1VrW4= github.com/decred/slog v1.1.0/go.mod h1:kVXlGnt6DHy2fV5OjSeuvCJ0OmlmTF6LFpEPMu/fOY0= +github.com/decred/slog v1.2.0 h1:soHAxV52B54Di3WtKLfPum9OFfWqwtf/ygf9njdfnPM= +github.com/decred/slog v1.2.0/go.mod h1:kVXlGnt6DHy2fV5OjSeuvCJ0OmlmTF6LFpEPMu/fOY0= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= @@ -67,16 +82,16 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= -github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/gin-gonic/gin v1.7.1 h1:qC89GU3p8TvKWMAVhEpmpB2CIb1hnqt2UdKZaP93mS8= +github.com/gin-gonic/gin v1.7.1/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= -github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -106,8 +121,9 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U 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/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7 h1:Ug59miTxVKVg5Oi2S5uHlKOIV5jBx4Hb2u0jIxxDaSs= github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc= +github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jrick/bitset v1.0.0 h1:Ws0PXV3PwXqWK2n7Vz6idCdrV/9OrBXgHEJi27ZB9Dw= github.com/jrick/bitset v1.0.0/go.mod h1:ZOYB5Uvkla7wIEY4FEssPVi3IQXa02arznRaYaAEPe4= github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI= @@ -152,7 +168,8 @@ go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -178,13 +195,16 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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-20200814200057-3d37ad5750ed h1:J22ig1FUekjjkmZUM7pTKixYm8DvrYsvrBZdunYeIuQ= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 h1:EZ2mChiOa8udjfp6rRmswTbtZN/QzUQp4ptM4rnjHvc= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= diff --git a/rpc/dcrd.go b/rpc/dcrd.go index e95a046..7e5b13f 100644 --- a/rpc/dcrd.go +++ b/rpc/dcrd.go @@ -14,7 +14,7 @@ import ( "strings" "github.com/decred/dcrd/chaincfg/v3" - dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v2" + dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v3" "github.com/decred/dcrd/wire" "github.com/jrick/bitset" "github.com/jrick/wsrpc/v2" diff --git a/rpc/dcrwallet.go b/rpc/dcrwallet.go index 3dc6606..b44a9dc 100644 --- a/rpc/dcrwallet.go +++ b/rpc/dcrwallet.go @@ -8,9 +8,9 @@ import ( "context" "fmt" - wallettypes "decred.org/dcrwallet/rpc/jsonrpc/types" + wallettypes "decred.org/dcrwallet/v2/rpc/jsonrpc/types" "github.com/decred/dcrd/chaincfg/v3" - dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v2" + dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v3" "github.com/decred/dcrd/wire" ) diff --git a/webapi/addressgenerator.go b/webapi/addressgenerator.go index edb997b..12c09f0 100644 --- a/webapi/addressgenerator.go +++ b/webapi/addressgenerator.go @@ -8,9 +8,8 @@ import ( "errors" "github.com/decred/dcrd/chaincfg/v3" - "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrutil/v3" "github.com/decred/dcrd/hdkeychain/v3" + "github.com/decred/dcrd/txscript/v4/stdaddr" ) type addressGenerator struct { @@ -73,8 +72,8 @@ func (m *addressGenerator) NextAddress() (string, uint32, error) { } // Convert to a standard pay-to-pubkey-hash address. - pkHash := dcrutil.Hash160(key.SerializedPubKey()) - addr, err := dcrutil.NewAddressPubKeyHash(pkHash, m.netParams, dcrec.STEcdsaSecp256k1) + pkHash := stdaddr.Hash160(key.SerializedPubKey()) + addr, err := stdaddr.NewAddressPubKeyHashEcdsaSecp256k1V0(pkHash, m.netParams) if err != nil { return "", 0, err } diff --git a/webapi/getfeeaddress.go b/webapi/getfeeaddress.go index 66e4195..7f496ed 100644 --- a/webapi/getfeeaddress.go +++ b/webapi/getfeeaddress.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "decred.org/dcrwallet/wallet/txrules" - "github.com/decred/dcrd/dcrutil/v3" + "decred.org/dcrwallet/v2/wallet/txrules" + "github.com/decred/dcrd/dcrutil/v4" "github.com/decred/vspd/database" "github.com/decred/vspd/rpc" "github.com/gin-gonic/gin" diff --git a/webapi/helpers.go b/webapi/helpers.go index 3f1c682..796a222 100644 --- a/webapi/helpers.go +++ b/webapi/helpers.go @@ -9,9 +9,9 @@ import ( "errors" "fmt" - "github.com/decred/dcrd/blockchain/stake/v3" + "github.com/decred/dcrd/blockchain/stake/v4" "github.com/decred/dcrd/chaincfg/v3" - "github.com/decred/dcrd/dcrutil/v3" + "github.com/decred/dcrd/dcrutil/v4" "github.com/decred/dcrd/wire" "github.com/gin-gonic/gin" ) diff --git a/webapi/middleware.go b/webapi/middleware.go index f3abf24..f5b93f8 100644 --- a/webapi/middleware.go +++ b/webapi/middleware.go @@ -11,7 +11,7 @@ import ( "net/http" "strings" - "github.com/decred/dcrd/blockchain/stake/v3" + "github.com/decred/dcrd/blockchain/stake/v4" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/vspd/rpc" "github.com/gin-gonic/gin" @@ -331,7 +331,7 @@ func vspAuth() gin.HandlerFunc { return } - commitmentAddress = addr.Address() + commitmentAddress = addr.String() } // Validate request signature to ensure ticket ownership. diff --git a/webapi/payfee.go b/webapi/payfee.go index 5ecf0ec..f2fe5de 100644 --- a/webapi/payfee.go +++ b/webapi/payfee.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/decred/dcrd/blockchain/v3" - "github.com/decred/dcrd/dcrec" - "github.com/decred/dcrd/dcrutil/v3" - "github.com/decred/dcrd/txscript/v3" + "github.com/decred/dcrd/blockchain/v4" + "github.com/decred/dcrd/dcrutil/v4" + "github.com/decred/dcrd/txscript/v4" + "github.com/decred/dcrd/txscript/v4/stdaddr" "github.com/decred/vspd/database" "github.com/decred/vspd/rpc" "github.com/gin-gonic/gin" @@ -120,7 +120,7 @@ func payFee(c *gin.Context) { return } - err = blockchain.CheckTransactionSanity(feeTx, cfg.NetParams, isTreasuryEnabled) + err = blockchain.CheckTransactionSanity(feeTx, cfg.NetParams) if err != nil { log.Warnf("%s: Fee tx failed sanity check (clientIP=%s, ticketHash=%s): %v", funcName, c.ClientIP(), ticket.Hash, err) @@ -150,7 +150,7 @@ findAddress: return } for _, addr := range addresses { - if addr.Address() == ticket.FeeAddress { + if addr.String() == ticket.FeeAddress { feePaid = dcrutil.Amount(txOut.Value) break findAddress } @@ -164,8 +164,8 @@ findAddress: return } - wifAddr, err := dcrutil.NewAddressPubKeyHash(dcrutil.Hash160(votingWIF.PubKey()), cfg.NetParams, - dcrec.STEcdsaSecp256k1) + pkHash := stdaddr.Hash160(votingWIF.PubKey()) + wifAddr, err := stdaddr.NewAddressPubKeyHashEcdsaSecp256k1V0(pkHash, cfg.NetParams) if err != nil { log.Errorf("%s: Failed to get voting address from WIF (ticketHash=%s, clientIP=%s): %v", funcName, ticket.Hash, c.ClientIP(), err) @@ -196,7 +196,7 @@ findAddress: } // Ensure provided private key will allow us to vote this ticket. - if votingAddr[0].Address() != wifAddr.Address() { + if votingAddr[0].String() != wifAddr.String() { log.Warnf("%s: Voting address does not match provided private key: (ticketHash=%s, votingAddr=%+v, wifAddr=%+v)", funcName, ticket.Hash, votingAddr[0], wifAddr) sendErrorWithMsg("voting address does not match provided private key",