Skip to content

Remove dcrd RPC MixPairRequests. #2640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jholdstock wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove dcrd RPC MixPairRequests. #2640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a49673
Bump module to major version 6.
jholdstock Jun 28, 2026
8897567
Remove dcrd RPC MixPairRequests.
jholdstock Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions chain/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"sync/atomic"
"time"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/rpc/client/dcrd"
"decred.org/dcrwallet/v5/validate"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v6/errors"
"decred.org/dcrwallet/v6/rpc/client/dcrd"
"decred.org/dcrwallet/v6/validate"
"decred.org/dcrwallet/v6/wallet"
"github.com/decred/dcrd/blockchain/stake/v5"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/crypto/blake256"
Expand Down
4 changes: 2 additions & 2 deletions cmd/movefunds/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"fmt"
"os"

"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/wallet/txauthor"
"decred.org/dcrwallet/v6/rpc/jsonrpc/types"
"decred.org/dcrwallet/v6/wallet/txauthor"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4"
Expand Down
6 changes: 3 additions & 3 deletions cmd/sweepaccount/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"os"
"path/filepath"

"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/wallet/txauthor"
"decred.org/dcrwallet/v5/wallet/txrules"
"decred.org/dcrwallet/v6/rpc/jsonrpc/types"
"decred.org/dcrwallet/v6/wallet/txauthor"
"decred.org/dcrwallet/v6/wallet/txrules"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4"
Expand Down
14 changes: 7 additions & 7 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"strings"

"decred.org/cspp/v2/solverrpc"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/internal/cfgutil"
"decred.org/dcrwallet/v5/internal/loggers"
"decred.org/dcrwallet/v5/internal/netparams"
"decred.org/dcrwallet/v5/version"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v5/wallet/txrules"
"decred.org/dcrwallet/v6/errors"
"decred.org/dcrwallet/v6/internal/cfgutil"
"decred.org/dcrwallet/v6/internal/loggers"
"decred.org/dcrwallet/v6/internal/netparams"
"decred.org/dcrwallet/v6/version"
"decred.org/dcrwallet/v6/wallet"
"decred.org/dcrwallet/v6/wallet/txrules"
"github.com/decred/dcrd/connmgr/v3"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/go-socks/socks"
Expand Down
22 changes: 11 additions & 11 deletions dcrwallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ import (
"runtime/pprof"
"time"

"decred.org/dcrwallet/v5/chain"
"decred.org/dcrwallet/v5/errors"
ldr "decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/internal/loggers"
"decred.org/dcrwallet/v5/internal/prompt"
"decred.org/dcrwallet/v5/internal/rpc/rpcserver"
"decred.org/dcrwallet/v5/p2p"
"decred.org/dcrwallet/v5/spv"
"decred.org/dcrwallet/v5/ticketbuyer"
"decred.org/dcrwallet/v5/version"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v6/chain"
"decred.org/dcrwallet/v6/errors"
ldr "decred.org/dcrwallet/v6/internal/loader"
"decred.org/dcrwallet/v6/internal/loggers"
"decred.org/dcrwallet/v6/internal/prompt"
"decred.org/dcrwallet/v6/internal/rpc/rpcserver"
"decred.org/dcrwallet/v6/p2p"
"decred.org/dcrwallet/v6/spv"
"decred.org/dcrwallet/v6/ticketbuyer"
"decred.org/dcrwallet/v6/version"
"decred.org/dcrwallet/v6/wallet"
"github.com/decred/dcrd/addrmgr/v3"
"github.com/decred/dcrd/wire"
)
Expand Down
2 changes: 1 addition & 1 deletion deployments/deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package deployments
import (
"context"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v6/errors"
"github.com/decred/dcrd/chaincfg/v3"
dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/wire"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module decred.org/dcrwallet/v5
module decred.org/dcrwallet/v6

go 1.24.0

Expand Down
2 changes: 1 addition & 1 deletion internal/cfgutil/address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package cfgutil

import (
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v6/errors"
"github.com/decred/dcrd/txscript/v4/stdaddr"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cfgutil/curve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"io"
"time"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v6/errors"
"github.com/decred/dcrd/certgen"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/loader/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"path/filepath"
"sync"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/wallet"
_ "decred.org/dcrwallet/v5/wallet/drivers/bdb" // driver loaded during init
"decred.org/dcrwallet/v6/errors"
"decred.org/dcrwallet/v6/wallet"
_ "decred.org/dcrwallet/v6/wallet/drivers/bdb" // driver loaded during init
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/prompt/prompt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"time"
"unicode"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/walletseed"
"decred.org/dcrwallet/v6/errors"
"decred.org/dcrwallet/v6/walletseed"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/hdkeychain/v3"
"golang.org/x/term"
Expand Down
2 changes: 1 addition & 1 deletion internal/rpc/jsonrpc/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package jsonrpc
import (
"fmt"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v6/errors"
"github.com/decred/dcrd/dcrjson/v4"
"github.com/jrick/wsrpc/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/rpc/jsonrpc/marshaling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"

"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v6/wallet"
)

type marshalJSONFunc func() ([]byte, error)
Expand Down
24 changes: 12 additions & 12 deletions internal/rpc/jsonrpc/methods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ import (
"sync"
"time"

"decred.org/dcrwallet/v5/chain"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/p2p"
"decred.org/dcrwallet/v5/rpc/client/dcrd"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v5/spv"
"decred.org/dcrwallet/v5/version"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v5/wallet/txauthor"
"decred.org/dcrwallet/v5/wallet/txrules"
"decred.org/dcrwallet/v5/wallet/txsizes"
"decred.org/dcrwallet/v5/wallet/udb"
"decred.org/dcrwallet/v6/chain"
"decred.org/dcrwallet/v6/errors"
"decred.org/dcrwallet/v6/p2p"
"decred.org/dcrwallet/v6/rpc/client/dcrd"
"decred.org/dcrwallet/v6/rpc/jsonrpc/types"
"decred.org/dcrwallet/v6/spv"
"decred.org/dcrwallet/v6/version"
"decred.org/dcrwallet/v6/wallet"
"decred.org/dcrwallet/v6/wallet/txauthor"
"decred.org/dcrwallet/v6/wallet/txrules"
"decred.org/dcrwallet/v6/wallet/txsizes"
"decred.org/dcrwallet/v6/wallet/udb"
"github.com/decred/dcrd/blockchain/stake/v5"
blockchain "github.com/decred/dcrd/blockchain/standalone/v2"
"github.com/decred/dcrd/chaincfg/chainhash"
Expand Down
4 changes: 2 additions & 2 deletions internal/rpc/jsonrpc/rpchelp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"strings"
"testing"

"decred.org/dcrwallet/v5/internal/rpchelp"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v6/internal/rpchelp"
"decred.org/dcrwallet/v6/rpc/jsonrpc/types"
"github.com/decred/dcrd/dcrjson/v4"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/rpc/jsonrpc/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"sync/atomic"
"time"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v6/errors"
"decred.org/dcrwallet/v6/internal/loader"
"decred.org/dcrwallet/v6/rpc/jsonrpc/types"
"github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrjson/v4"
"github.com/gorilla/websocket"
Expand Down
28 changes: 14 additions & 14 deletions internal/rpc/rpcserver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"decred.org/dcrwallet/v5/chain"
"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/internal/cfgutil"
"decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/internal/netparams"
"decred.org/dcrwallet/v5/p2p"
pb "decred.org/dcrwallet/v5/rpc/walletrpc"
"decred.org/dcrwallet/v5/spv"
"decred.org/dcrwallet/v5/ticketbuyer"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v5/wallet/txauthor"
"decred.org/dcrwallet/v5/wallet/txrules"
"decred.org/dcrwallet/v5/wallet/udb"
"decred.org/dcrwallet/v5/walletseed"
"decred.org/dcrwallet/v6/chain"
"decred.org/dcrwallet/v6/errors"
"decred.org/dcrwallet/v6/internal/cfgutil"
"decred.org/dcrwallet/v6/internal/loader"
"decred.org/dcrwallet/v6/internal/netparams"
"decred.org/dcrwallet/v6/p2p"
pb "decred.org/dcrwallet/v6/rpc/walletrpc"
"decred.org/dcrwallet/v6/spv"
"decred.org/dcrwallet/v6/ticketbuyer"
"decred.org/dcrwallet/v6/wallet"
"decred.org/dcrwallet/v6/wallet/txauthor"
"decred.org/dcrwallet/v6/wallet/txrules"
"decred.org/dcrwallet/v6/wallet/udb"
"decred.org/dcrwallet/v6/walletseed"
"github.com/decred/dcrd/addrmgr/v3"
"github.com/decred/dcrd/blockchain/stake/v5"
"github.com/decred/dcrd/chaincfg/chainhash"
Expand Down
4 changes: 2 additions & 2 deletions internal/rpchelp/genrpcserverhelp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"os"
"strings"

"decred.org/dcrwallet/v5/internal/rpchelp"
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v6/internal/rpchelp"
"decred.org/dcrwallet/v6/rpc/jsonrpc/types"
"github.com/decred/dcrd/dcrjson/v4"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/rpchelp/methods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
package rpchelp

import (
"decred.org/dcrwallet/v5/rpc/jsonrpc/types"
"decred.org/dcrwallet/v6/rpc/jsonrpc/types"
dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
)

Expand Down
2 changes: 1 addition & 1 deletion ipc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"io"
"os"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v6/errors"
)

// Messages sent over a pipe are encoded using a simple binary message format:
Expand Down
20 changes: 10 additions & 10 deletions log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ package main
import (
"os"

"decred.org/dcrwallet/v5/chain"
"decred.org/dcrwallet/v5/internal/loader"
"decred.org/dcrwallet/v5/internal/loggers"
"decred.org/dcrwallet/v5/internal/rpc/jsonrpc"
"decred.org/dcrwallet/v5/internal/rpc/rpcserver"
"decred.org/dcrwallet/v5/p2p"
"decred.org/dcrwallet/v5/spv"
"decred.org/dcrwallet/v5/ticketbuyer"
"decred.org/dcrwallet/v5/wallet"
"decred.org/dcrwallet/v5/wallet/udb"
"decred.org/dcrwallet/v6/chain"
"decred.org/dcrwallet/v6/internal/loader"
"decred.org/dcrwallet/v6/internal/loggers"
"decred.org/dcrwallet/v6/internal/rpc/jsonrpc"
"decred.org/dcrwallet/v6/internal/rpc/rpcserver"
"decred.org/dcrwallet/v6/p2p"
"decred.org/dcrwallet/v6/spv"
"decred.org/dcrwallet/v6/ticketbuyer"
"decred.org/dcrwallet/v6/wallet"
"decred.org/dcrwallet/v6/wallet/udb"
"github.com/decred/dcrd/addrmgr/v3"
"github.com/decred/dcrd/connmgr/v3"
"github.com/decred/dcrd/mixing/mixpool"
Expand Down
6 changes: 3 additions & 3 deletions p2p/peering.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"sync/atomic"
"time"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v5/lru"
"decred.org/dcrwallet/v5/version"
"decred.org/dcrwallet/v6/errors"
"decred.org/dcrwallet/v6/lru"
"decred.org/dcrwallet/v6/version"
"github.com/decred/dcrd/addrmgr/v3"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/chaincfg/v3"
Expand Down
2 changes: 1 addition & 1 deletion params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

package main

import "decred.org/dcrwallet/v5/internal/netparams"
import "decred.org/dcrwallet/v6/internal/netparams"

var activeNet = &netparams.MainNetParams
2 changes: 1 addition & 1 deletion pgpwordlist/pgpwordlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package pgpwordlist
import (
"strings"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v6/errors"
)

// ByteToMnemonic returns the PGP word list encoding of b when found at index.
Expand Down
2 changes: 1 addition & 1 deletion rpc/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package walletrpc;

option go_package = "decred.org/dcrwallet/v5/rpc/walletrpc";
option go_package = "decred.org/dcrwallet/v6/rpc/walletrpc";

service VersionService {
rpc Version (VersionRequest) returns (VersionResponse);
Expand Down
17 changes: 2 additions & 15 deletions rpc/client/dcrd/calls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2019 The Decred developers
// Copyright (c) 2019-2026 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.

Expand All @@ -14,7 +14,7 @@ import (
"slices"
"strings"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v6/errors"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/dcrd/gcs/v4"
Expand Down Expand Up @@ -304,19 +304,6 @@ func (r *RPC) MixMessage(ctx context.Context, hash *chainhash.Hash) (mixing.Mess
return msg, err
}

// MixPairRequests returns all mixing pair request messages currently held by
// the dcrd mixpool.
func (r *RPC) MixPairRequests(ctx context.Context) ([]*wire.MsgMixPairReq, error) {
const op errors.Op = "dcrd.MixPairRequests"

mixPRs := makeMessageArray[wire.MsgMixPairReq](wire.MixVersion)
err := r.Call(ctx, "getmixpairrequests", &mixPRs)
if err != nil {
return nil, errors.E(op, err)
}
return mixPRs.Messages, nil
}

// Blocks returns the blocks for each block hash.
func (r *RPC) Blocks(ctx context.Context, blockHashes []*chainhash.Hash) ([]*wire.MsgBlock, error) {
const op errors.Op = "dcrd.Blocks"
Expand Down
2 changes: 1 addition & 1 deletion rpc/client/dcrd/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"io"
"strings"

"decred.org/dcrwallet/v5/errors"
"decred.org/dcrwallet/v6/errors"
"github.com/decred/dcrd/chaincfg/chainhash"
"github.com/decred/dcrd/gcs/v4"
blockcf "github.com/decred/dcrd/gcs/v4/blockcf2"
Expand Down
Loading
Loading