harness: Update eth to work with geth 1.14 and up. (#3123)

* harness: Update eth to work with geth 1.14 and up. * harness/btc: Bind to address. * client: Update geth import to v1.14.13.
decred · Feb 17, 2025 · 9848bb0 · 9848bb0
1 parent 86bc20d
commit 9848bb0
Show file tree

Hide file tree

Showing 21 changed files with 172 additions and 574 deletions.
diff --git a/client/asset/eth/chaincfg.go b/client/asset/eth/chaincfg.go
@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"decred.org/dcrdex/dex"
-	dexeth "decred.org/dcrdex/dex/networks/eth"
 	"github.com/ethereum/go-ethereum/common"
 	ethcore "github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/eth/ethconfig"
@@ -65,7 +64,7 @@ func NetworkCompatibilityData(net dex.Network) (c CompatibilityData, err error)
 	addr := common.HexToAddress("18d65fb8d60c1199bb1ad381be47aa692b482605")
 	var (
 		tTxHashFile    = filepath.Join(tDir, "test_tx_hash.txt")
-		tBlockHashFile = filepath.Join(tDir, "test_block10_hash.txt")
+		tBlockHashFile = filepath.Join(tDir, "test_block1_hash.txt")
 		tContractFile  = filepath.Join(tDir, "test_usdc_contract_address.txt")
 	)
 	readIt := func(path string) string {
@@ -103,10 +102,8 @@ func ETHConfig(net dex.Network) (c ethconfig.Config, err error) {
 	case dex.Testnet:
 		c.Genesis = ethcore.DefaultSepoliaGenesisBlock()
 	case dex.Simnet:
-		c.Genesis, err = readSimnetGenesisFile()
-		if err != nil {
-			return c, fmt.Errorf("readSimnetGenesisFile error: %w", err)
-		}
+		// Args are gasLimit, faucet address.
+		c.Genesis = ethcore.DeveloperGenesisBlock(30000000, nil)
 	default:
 		return c, fmt.Errorf("unknown network %d", net)
 
@@ -123,19 +120,3 @@ func ChainConfig(net dex.Network) (c *params.ChainConfig, err error) {
 	}
 	return cfg.Genesis.Config, nil
 }
-
-// readSimnetGenesisFile reads the simnet genesis file.
-func readSimnetGenesisFile() (*ethcore.Genesis, error) {
-	dataDir, err := simnetDataDir()
-	if err != nil {
-		return nil, err
-	}
-
-	genesisFile := filepath.Join(dataDir, "genesis.json")
-	genesisCfg, err := dexeth.LoadGenesisFile(genesisFile)
-	if err != nil {
-		return nil, fmt.Errorf("error reading genesis file: %v", err)
-	}
-
-	return genesisCfg, nil
-}
diff --git a/client/asset/eth/eth_test.go b/client/asset/eth/eth_test.go
@@ -4927,11 +4927,11 @@ func testMaxSwapRedeemLots(t *testing.T, assetID uint32) {
 			t.Fatalf("expected 63 for max redemptions but got %d", info.MaxRedeemsInTx)
 		}
 	} else {
-		if info.MaxSwapsInTx != 20 {
-			t.Fatalf("expected 20 for max swaps but got %d", info.MaxSwapsInTx)
+		if info.MaxSwapsInTx != 24 {
+			t.Fatalf("expected 24 for max swaps but got %d", info.MaxSwapsInTx)
 		}
-		if info.MaxRedeemsInTx != 45 {
-			t.Fatalf("expected 45 for max redemptions but got %d", info.MaxRedeemsInTx)
+		if info.MaxRedeemsInTx != 55 {
+			t.Fatalf("expected 55 for max redemptions but got %d", info.MaxRedeemsInTx)
 		}
 	}
 }

diff --git a/client/asset/eth/nodeclient_harness_test.go b/client/asset/eth/nodeclient_harness_test.go
@@ -72,9 +72,7 @@ var (
 	testnetParticipantWalletDir string
 
 	alphaNodeDir               = filepath.Join(homeDir, "dextest", "eth", "alpha", "node")
-	alphaIPCFile               = filepath.Join(alphaNodeDir, "geth.ipc")
-	betaNodeDir                = filepath.Join(homeDir, "dextest", "eth", "beta", "node")
-	betaIPCFile                = filepath.Join(betaNodeDir, "geth.ipc")
+	alphaWSEndpoint            = "ws://127.0.0.1:38557"
 	ctx                        context.Context
 	tLogger                    = dex.StdOutLogger("ETHTEST", dex.LevelWarn)
 	simnetWalletSeed           = "0812f5244004217452059e2fd11603a511b5d0870ead753df76c966ce3c71531"
@@ -208,23 +206,23 @@ func prepareRPCClient(name, dataDir string, providers []string, net dex.Network)
 	return c, c.creds.acct, nil
 }
 
-func rpcEndpoints(net dex.Network) ([]string, []string) {
+func rpcEndpoints(net dex.Network) []string {
 	if net == dex.Testnet {
-		return rpcProviders, rpcProviders
+		return rpcProviders
 	}
-	return []string{alphaIPCFile}, []string{betaIPCFile}
+	return []string{alphaWSEndpoint}
 }
 
 func prepareTestRPCClients(initiatorDir, participantDir string, net dex.Network) (err error) {
-	initiatorEndpoints, participantEndpoints := rpcEndpoints(net)
+	endpoints := rpcEndpoints(net)
 
-	ethClient, simnetAcct, err = prepareRPCClient("initiator", initiatorDir, initiatorEndpoints, net)
+	ethClient, simnetAcct, err = prepareRPCClient("initiator", initiatorDir, endpoints, net)
 	if err != nil {
 		return err
 	}
 	fmt.Println("initiator address is", ethClient.address())
 
-	participantEthClient, participantAcct, err = prepareRPCClient("participant", participantDir, participantEndpoints, net)
+	participantEthClient, participantAcct, err = prepareRPCClient("participant", participantDir, endpoints, net)
 	if err != nil {
 		ethClient.shutdown()
 		return err
@@ -258,14 +256,14 @@ func runSimnet(m *testing.M) (int, error) {
 
 	ethSwapContractAddr = dexeth.ContractAddresses[contractVer][dex.Simnet]
 
-	initiatorProviders, participantProviders := rpcEndpoints(dex.Simnet)
+	providers := rpcEndpoints(dex.Simnet)
 
-	err = setupWallet(simnetWalletDir, simnetWalletSeed, "localhost:30355", initiatorProviders, dex.Simnet)
+	err = setupWallet(simnetWalletDir, simnetWalletSeed, "localhost:30355", providers, dex.Simnet)
 	if err != nil {
 		return 1, err
 	}
 
-	err = setupWallet(participantWalletDir, participantWalletSeed, "localhost:30356", participantProviders, dex.Simnet)
+	err = setupWallet(participantWalletDir, participantWalletSeed, "localhost:30356", providers, dex.Simnet)
 	if err != nil {
 		return 1, err
 	}
@@ -390,13 +388,13 @@ func runTestnet(m *testing.M) (int, error) {
 	ethSwapContractAddr = dexeth.ContractAddresses[contractVer][dex.Testnet]
 	fmt.Printf("ETH swap contract address is %v\n", ethSwapContractAddr)
 
-	initiatorRPC, participantRPC := rpcEndpoints(dex.Testnet)
+	rpc := rpcEndpoints(dex.Testnet)
 
-	err = setupWallet(testnetWalletDir, testnetWalletSeed, "localhost:30355", initiatorRPC, dex.Testnet)
+	err = setupWallet(testnetWalletDir, testnetWalletSeed, "localhost:30355", rpc, dex.Testnet)
 	if err != nil {
 		return 1, err
 	}
-	err = setupWallet(testnetParticipantWalletDir, testnetParticipantWalletSeed, "localhost:30356", participantRPC, dex.Testnet)
+	err = setupWallet(testnetParticipantWalletDir, testnetParticipantWalletSeed, "localhost:30356", rpc, dex.Testnet)
 	if err != nil {
 		return 1, err
 	}

diff --git a/client/cmd/bisonw-desktop/go.mod b/client/cmd/bisonw-desktop/go.mod
@@ -1,6 +1,6 @@
 module decred.org/dcrdex/client/cmd/bisonw-desktop
 
-go 1.21
+go 1.22
 
 replace decred.org/dcrdex => ../../..
 
@@ -14,9 +14,7 @@ require (
 
 require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/bits-and-blooms/bitset v1.10.0 // indirect
-	github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
-	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
+	github.com/bits-and-blooms/bitset v1.13.0 // indirect
 	github.com/consensys/bavard v0.1.13 // indirect
 	github.com/consensys/gnark-crypto v0.12.1 // indirect
 	github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
@@ -28,7 +26,7 @@ require (
 	github.com/decred/vspd/client/v4 v4.0.0 // indirect
 	github.com/decred/vspd/types/v3 v3.0.0 // indirect
 	github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
-	github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect
+	github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
 	github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect
 	github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect
 	github.com/ltcsuite/lnd/tlv v0.0.0-20240222214433-454d35886119 // indirect
@@ -38,7 +36,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
-	github.com/supranational/blst v0.3.11 // indirect
+	github.com/supranational/blst v0.3.13 // indirect
 	github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
@@ -48,12 +46,10 @@ require (
 	decred.org/cspp/v2 v2.3.0 // indirect
 	decred.org/dcrwallet/v4 v4.2.0 // indirect
 	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
-	github.com/DataDog/zstd v1.5.2 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
 	github.com/aead/siphash v1.0.1 // indirect
 	github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
 	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
@@ -71,10 +67,6 @@ require (
 	github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cockroachdb/errors v1.11.3 // indirect
-	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
-	github.com/cockroachdb/pebble v1.1.1 // indirect
-	github.com/cockroachdb/redact v1.1.5 // indirect
 	github.com/companyzero/sntrup4591761 v0.0.0-20220309191932-9e0f3af2f07a // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/blake2b v1.0.0 // indirect
@@ -111,18 +103,16 @@ require (
 	github.com/dgraph-io/badger v1.6.2 // indirect
 	github.com/dgraph-io/ristretto v0.0.2 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/ethereum/go-ethereum v1.14.8 // indirect
+	github.com/ethereum/go-ethereum v1.14.13 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gcash/bchd v0.19.0 // indirect
 	github.com/gcash/bchlog v0.0.0-20180913005452-b4f036f92fa6 // indirect
 	github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000 // indirect
 	github.com/gen2brain/beeep v0.0.0-20240112042604-c7bb2cd88fea
-	github.com/getsentry/sentry-go v0.27.0 // indirect
 	github.com/go-chi/chi/v5 v5.0.1 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/uuid v1.3.0 // indirect
@@ -137,10 +127,7 @@ require (
 	github.com/jrick/logrotate v1.0.0 // indirect
 	github.com/jrick/wsrpc/v2 v2.3.5 // indirect
 	github.com/kkdai/bstream v1.0.0 // indirect
-	github.com/klauspost/compress v1.16.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/lib/pq v1.10.4 // indirect
 	github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
 	github.com/lightninglabs/neutrino v0.16.1-0.20240814152458-81d6cd2d2da5 // indirect
@@ -160,12 +147,8 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect