diff --git a/go.mod b/go.mod index 74127bc4a..95ecbc7b5 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/decred/dcrd/chaincfg/v3 v3.2.1 github.com/decred/dcrd/connmgr/v3 v3.1.2 github.com/decred/dcrd/crypto/blake256 v1.0.1 - github.com/decred/dcrd/crypto/rand v0.0.0-20240614031620-f7dd7c89f0a6 + github.com/decred/dcrd/crypto/rand v1.0.0 github.com/decred/dcrd/crypto/ripemd160 v1.0.2 github.com/decred/dcrd/dcrec v1.0.1 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 @@ -21,7 +21,7 @@ require ( github.com/decred/dcrd/dcrutil/v4 v4.0.2 github.com/decred/dcrd/gcs/v4 v4.1.0 github.com/decred/dcrd/hdkeychain/v3 v3.1.2 - github.com/decred/dcrd/mixing v0.3.0 + github.com/decred/dcrd/mixing v0.4.0 github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.3.0 github.com/decred/dcrd/rpcclient/v8 v8.0.1 github.com/decred/dcrd/txscript/v4 v4.1.1 @@ -49,6 +49,7 @@ require ( github.com/companyzero/sntrup4591761 v0.0.0-20220309191932-9e0f3af2f07a // indirect github.com/dchest/siphash v1.2.3 // indirect github.com/decred/base58 v1.0.5 // indirect + github.com/decred/dcrd/container/lru v1.0.0 // indirect github.com/decred/dcrd/database/v3 v3.0.2 // indirect github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 // indirect github.com/golang/protobuf v1.5.2 // indirect diff --git a/go.sum b/go.sum index db60dfd70..31acc70f8 100644 --- a/go.sum +++ b/go.sum @@ -39,10 +39,12 @@ github.com/decred/dcrd/chaincfg/v3 v3.2.1 h1:x9zKJaU24WAKbxAR1UyFKHlM3oJgP0H9Lod github.com/decred/dcrd/chaincfg/v3 v3.2.1/go.mod h1:SDCWDtY7BLj0leXc9FuoA1YjSVKyCIBVAyxwZn6+sXc= github.com/decred/dcrd/connmgr/v3 v3.1.2 h1:+xNopie2L3YYwwkz51k0h/pASATOBzHtl2O8eodGg04= github.com/decred/dcrd/connmgr/v3 v3.1.2/go.mod h1:tdbErFiNOuy/sHrX2mwaOk+r1HLs3EBz2EGxsocMPe4= +github.com/decred/dcrd/container/lru v1.0.0 h1:7foQymtbu18aQWYiY9RnNIeE+kvpiN+fiBQ3+viyJjI= +github.com/decred/dcrd/container/lru v1.0.0/go.mod h1:vlPwj0l+IzAHhQSsbgQnJgO5Cte78+yI065V+Mc5PRQ= github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= -github.com/decred/dcrd/crypto/rand v0.0.0-20240614031620-f7dd7c89f0a6 h1:n70K8plsbppuliD8X/oVjjfdRYK9tlCcJNo7G4IUz+M= -github.com/decred/dcrd/crypto/rand v0.0.0-20240614031620-f7dd7c89f0a6/go.mod h1:coa7BbxSTiKH6esi257plGfMFYuGL4MTbQlLYnOdzpE= +github.com/decred/dcrd/crypto/rand v1.0.0 h1:Ah9Asl36OZt09sGSMbJZuL1HfwGdlC38q/ZUeLDVKRg= +github.com/decred/dcrd/crypto/rand v1.0.0/go.mod h1:coa7BbxSTiKH6esi257plGfMFYuGL4MTbQlLYnOdzpE= github.com/decred/dcrd/crypto/ripemd160 v1.0.2 h1:TvGTmUBHDU75OHro9ojPLK+Yv7gDl2hnUvRocRCjsys= github.com/decred/dcrd/crypto/ripemd160 v1.0.2/go.mod h1:uGfjDyePSpa75cSQLzNdVmWlbQMBuiJkvXw/MNKRY4M= github.com/decred/dcrd/database/v3 v3.0.2 h1:rgP7XNZemTs8ZC7bnTKO8JO79Woj5nq+yQYmB9ry7yM= @@ -61,8 +63,8 @@ github.com/decred/dcrd/gcs/v4 v4.1.0 h1:tpW7JW53yJZlgNwl/n2NL1b8NxHaIPRUyNuLMkB/ github.com/decred/dcrd/gcs/v4 v4.1.0/go.mod h1:nPTbGM/I3Ihe5KFvUmxZEqQP/jDZQjQ63+WEi/f4lqU= github.com/decred/dcrd/hdkeychain/v3 v3.1.2 h1:x25WuuE7zM/20EynuVMyOhL0K8BwGBBsexGq8xTiHFA= github.com/decred/dcrd/hdkeychain/v3 v3.1.2/go.mod h1:FnNJmZ7jqUDeAo6/c/xkQi5cuxh3EWtJeMmW6/Z8lcc= -github.com/decred/dcrd/mixing v0.3.0 h1:eUHpTdwTqXUllnn1ZYLfxucW/2UOkMmx4CyztipTJ9g= -github.com/decred/dcrd/mixing v0.3.0/go.mod h1:W3K7yJKmoI03G2U5Yw+HSRNe6lLBegi63ZR6fFLnM9c= +github.com/decred/dcrd/mixing v0.4.0 h1:XblHAND4Vt5owVUvjPorDg30eWT53DpCZs6VF7U1t6U= +github.com/decred/dcrd/mixing v0.4.0/go.mod h1:ySvVwTZyVz5YvevA6YjPrB6pJEwTm7IkHohTfaiHh2c= github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.3.0 h1:l0DnCcILTNrpy8APF3FLN312ChpkQaAuW30aC/RgBaw= github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.3.0/go.mod h1:j+kkRPXPJB5S9VFOsx8SQLcU7PTFkPKRc1aCHN4ENzA= github.com/decred/dcrd/rpcclient/v8 v8.0.1 h1:hd81e4w1KSqvPcozJlnz6XJfWKDNuahgooH/N5E8vOU= diff --git a/wallet/createtx.go b/wallet/createtx.go index ccdd09a17..d9246167a 100644 --- a/wallet/createtx.go +++ b/wallet/createtx.go @@ -1117,7 +1117,7 @@ func (w *Wallet) mixedSplit(ctx context.Context, req *PurchaseTicketsRequest, ne } } - err = w.mixClient.Dicemix(ctx, rand.Reader(), cj) + err = w.mixClient.Dicemix(ctx, cj) if err != nil { return } diff --git a/wallet/mixing.go b/wallet/mixing.go index 3001b141b..ac635bcb6 100644 --- a/wallet/mixing.go +++ b/wallet/mixing.go @@ -14,7 +14,6 @@ import ( "decred.org/dcrwallet/v4/wallet/walletdb" "github.com/decred/dcrd/chaincfg/chainhash" "github.com/decred/dcrd/chaincfg/v3" - "github.com/decred/dcrd/crypto/rand" "github.com/decred/dcrd/dcrec" "github.com/decred/dcrd/dcrec/secp256k1/v4" "github.com/decred/dcrd/dcrutil/v4" @@ -427,7 +426,7 @@ SplitPoints: return errors.E(op, err) } - err = w.mixClient.Dicemix(ctx, rand.Reader(), cj) + err = w.mixClient.Dicemix(ctx, cj) if err != nil { return errors.E(op, err) }