HACK: Wire per-swap BTC/XMR adapters into startAdaptorMatches.

Core.New builds the AdaptorSwapManager with Send:NoopSender and no
BTC or XMR asset adapters, with a comment saying they'd be installed
later by per-asset wiring - but no wiring code ever landed. Every
orchestrator started from a match therefore got AssetBTC=nil and
panicked on the first FundBroadcastTaproot call:

    panic: runtime error: invalid memory address or nil pointer
    ...(*Orchestrator).handleKeysReceived orchestrator.go:620

Work around it with two per-swap builders invoked inline before
StartSwap:

- client/core/adaptorswap_bridge.go: buildAdaptorBTCAdapter reads
  DCRDEX_ADAPTOR_BTC_{RPC,USER,PASS} env vars, constructs a
  btcd/rpcclient.Client against the simnet bitcoind RPC, and wraps
  it in BTCRPCAdapter with a poll-for-confirm waitConfirm. Returns
  nil if env vars unset.

- client/core/adaptorswap_xmr_bridge.go (xmr tag): buildAdaptorXMR
  Adapter looks up the connected xmr.ExchangeWallet from Core's
  wallets map and wraps it in XMRWalletAdapter.

- client/core/adaptorswap_xmr_bridge_noxmr.go (!xmr tag): stub that
  returns nil so non-xmr builds still compile.

- startAdaptorMatches: sets cfg.AssetBTC / cfg.AssetXMR from the
  builders before calling StartSwap. With these wired, the initiator
  can fund + broadcast the lockTx and both sides can exercise the
  XMR wallet adapter.

Still needed for production (README TODO #5): expose the BTC wallet's
rpcclient.Client on bisonw's BTC asset wallet so env-var side-channels
are not required. Drop the env lookup and source the client from the
connected wallet.

Author: JoeGruffins

client/core/adaptorswap_bridge.go

@@ -18,6 +18,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"os"
 	"sync"
 	"time"
 
@@ -401,6 +402,34 @@ func (c *Core) startAdaptorMatches(tracker *trackedTrade, msgMatches []*msgjson.
 		} else {
 			ownBTCAddr = c.adaptorOwnDepositAddr(pairBTC)
 		}
+		xmrWallet, _ := c.wallet(pairXMR)
+		// HACK (adaptor swaps): per-swap BTC/XMR adapters. Prefer
+		// adapters pre-installed on the manager (tests inject mocks
+		// that way); fall back to env-var BTC RPC + connected XMR
+		// wallet otherwise. Until per-wallet adapter plumbing lands
+		// (README TODO #5), this is how the orchestrator gets working
+		// asset access. Fail fast here instead of letting the
+		// orchestrator panic later on a typed-nil interface.
+		var btcAdapter adaptorswap.BTCAssetAdapter = c.adaptorMgr.btc
+		if btcAdapter == nil {
+			if a := buildAdaptorBTCAdapter(c.log); a != nil {
+				btcAdapter = a
+			}
+		}
+		if btcAdapter == nil {
+			c.log.Errorf("adaptor match %s: BTC adapter unavailable; "+
+				"set DCRDEX_ADAPTOR_BTC_{RPC,USER,PASS}", matchID)
+			continue
+		}
+		xmrAdapter := c.adaptorMgr.xmr
+		if xmrAdapter == nil {
+			xmrAdapter = buildAdaptorXMRAdapter(c.ctx, xmrWallet)
+		}
+		if xmrAdapter == nil {
+			c.log.Errorf("adaptor match %s: XMR adapter unavailable; "+
+				"connect the XMR wallet (build with -tags xmr)", matchID)
+			continue
+		}
 		cfg := &adaptorswap.Config{
 			SwapID:           swapID,
 			OrderID:          oid,
@@ -414,6 +443,8 @@ func (c *Core) startAdaptorMatches(tracker *trackedTrade, msgMatches []*msgjson.
 			XmrNetTag:        xmrNetTagForNet(c.net),
 			OwnXMRSweepDest:  ownXMRDest,
 			OwnBTCPayoutAddr: ownBTCAddr,
+			AssetBTC:         btcAdapter,
+			AssetXMR:         xmrAdapter,
 			// DecodeBTCAddr lets the initiator translate the
 			// participant's BTCPayoutAddr (received in AdaptorSetupPart)
 			// into a pkScript without the orchestrator needing to
@@ -618,6 +649,67 @@ func (b *BTCRPCAdapter) CurrentHeight() (int64, error) {
 	return b.client.GetBlockCount()
 }
 
+// HACK (adaptor swaps): buildAdaptorBTCAdapter reads simnet BTC RPC
+// credentials from the environment and returns a BTCRPCAdapter. The
+// adaptor orchestrator needs an *rpcclient.Client that can FundRaw /
+// SignRaw / SendRaw, and bisonw's BTC wallet does not expose its own
+// client. Side-channel the connection via env vars until per-wallet
+// adapter plumbing lands (README TODO #5). Returns nil if unset.
+//
+// Env vars:
+//
+//	DCRDEX_ADAPTOR_BTC_RPC  host:port, e.g. 127.0.0.1:20556
+//	DCRDEX_ADAPTOR_BTC_USER rpc user
+//	DCRDEX_ADAPTOR_BTC_PASS rpc password
+func buildAdaptorBTCAdapter(log dex.Logger) *BTCRPCAdapter {
+	host := os.Getenv("DCRDEX_ADAPTOR_BTC_RPC")
+	user := os.Getenv("DCRDEX_ADAPTOR_BTC_USER")
+	pass := os.Getenv("DCRDEX_ADAPTOR_BTC_PASS")
+	if host == "" || user == "" || pass == "" {
+		return nil
+	}
+	cl, err := rpcclient.New(&rpcclient.ConnConfig{
+		Host:         host,
+		User:         user,
+		Pass:         pass,
+		HTTPPostMode: true,
+		DisableTLS:   true,
+	}, nil)
+	if err != nil {
+		log.Errorf("adaptor btc rpc setup: %v", err)
+		return nil
+	}
+	waitConfirm := func(ctx context.Context, txid *chainhash.Hash) (int64, error) {
+		tick := time.NewTicker(3 * time.Second)
+		defer tick.Stop()
+		for {
+			select {
+			case <-ctx.Done():
+				return 0, ctx.Err()
+			case <-tick.C:
+			}
+			res, err := cl.GetRawTransactionVerbose(txid)
+			if err != nil {
+				continue
+			}
+			if res.Confirmations < 1 || res.BlockHash == "" {
+				continue
+			}
+			bh, err := chainhash.NewHashFromStr(res.BlockHash)
+			if err != nil {
+				return 0, err
+			}
+			hdr, err := cl.GetBlockHeaderVerbose(bh)
+			if err != nil {
+				return 0, err
+			}
+			return int64(hdr.Height), nil
+		}
+	}
+	log.Infof("adaptor btc rpc adapter: host=%s", host)
+	return NewBTCRPCAdapter(cl, waitConfirm)
+}
+
 // ----- Message router (no-op default) -----
 
 // NoopSender is a message sender that drops outgoing messages. Used

client/core/adaptorswap_xmr_bridge.go

@@ -59,3 +59,18 @@ func (a *XMRWalletAdapter) SweepSharedAddress(swapID, addr, spendKeyHex, viewKey
 
 	return a.w.SweepSharedAddress(a.ctx, swapID, addr, spendKeyHex, viewKeyHex, restoreHeight, dest)
 }
+
+// buildAdaptorXMRAdapter wraps a connected XMR wallet for use by the
+// adaptor-swap orchestrator. Returns nil if the wallet is not the
+// expected *xmr.ExchangeWallet type (e.g. not connected). The xmr
+// build tag is required; see the !xmr stub in the companion file.
+func buildAdaptorXMRAdapter(ctx context.Context, w *xcWallet) adaptorswap.XMRAssetAdapter {
+	if w == nil {
+		return nil
+	}
+	ew, ok := w.Wallet.(*xmr.ExchangeWallet)
+	if !ok {
+		return nil
+	}
+	return NewXMRWalletAdapter(ctx, ew)
+}

client/core/adaptorswap_xmr_bridge_noxmr.go

@@ -0,0 +1,17 @@
+//go:build !xmr
+
+// Non-xmr build: the xmr package is not compiled in, so the XMR
+// asset adapter cannot be constructed. Returns nil; the adaptor
+// orchestrator will fail cleanly on the first XMR call.
+
+package core
+
+import (
+	"context"
+
+	"decred.org/dcrdex/client/core/adaptorswap"
+)
+
+func buildAdaptorXMRAdapter(ctx context.Context, w *xcWallet) adaptorswap.XMRAssetAdapter {
+	return nil
+}