Skip to content

Commit 9848bb0

Browse files
JoeGruffinsJoeGruffins
authored
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.
1 parent 86bc20d commit 9848bb0

21 files changed

Lines changed: 172 additions & 574 deletions

File tree

‎client/asset/eth/chaincfg.go‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"strings"
1212

1313
"decred.org/dcrdex/dex"
14-
dexeth "decred.org/dcrdex/dex/networks/eth"
1514
"github.com/ethereum/go-ethereum/common"
1615
ethcore "github.com/ethereum/go-ethereum/core"
1716
"github.com/ethereum/go-ethereum/eth/ethconfig"
@@ -65,7 +64,7 @@ func NetworkCompatibilityData(net dex.Network) (c CompatibilityData, err error)
6564
addr := common.HexToAddress("18d65fb8d60c1199bb1ad381be47aa692b482605")
6665
var (
6766
tTxHashFile = filepath.Join(tDir, "test_tx_hash.txt")
68-
tBlockHashFile = filepath.Join(tDir, "test_block10_hash.txt")
67+
tBlockHashFile = filepath.Join(tDir, "test_block1_hash.txt")
6968
tContractFile = filepath.Join(tDir, "test_usdc_contract_address.txt")
7069
)
7170
readIt := func(path string) string {
@@ -103,10 +102,8 @@ func ETHConfig(net dex.Network) (c ethconfig.Config, err error) {
103102
case dex.Testnet:
104103
c.Genesis = ethcore.DefaultSepoliaGenesisBlock()
105104
case dex.Simnet:
106-
c.Genesis, err = readSimnetGenesisFile()
107-
if err != nil {
108-
return c, fmt.Errorf("readSimnetGenesisFile error: %w", err)
109-
}
105+
// Args are gasLimit, faucet address.
106+
c.Genesis = ethcore.DeveloperGenesisBlock(30000000, nil)
110107
default:
111108
return c, fmt.Errorf("unknown network %d", net)
112109

@@ -123,19 +120,3 @@ func ChainConfig(net dex.Network) (c *params.ChainConfig, err error) {
123120
}
124121
return cfg.Genesis.Config, nil
125122
}
126-
127-
// readSimnetGenesisFile reads the simnet genesis file.
128-
func readSimnetGenesisFile() (*ethcore.Genesis, error) {
129-
dataDir, err := simnetDataDir()
130-
if err != nil {
131-
return nil, err
132-
}
133-
134-
genesisFile := filepath.Join(dataDir, "genesis.json")
135-
genesisCfg, err := dexeth.LoadGenesisFile(genesisFile)
136-
if err != nil {
137-
return nil, fmt.Errorf("error reading genesis file: %v", err)
138-
}
139-
140-
return genesisCfg, nil
141-
}

‎client/asset/eth/eth_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4927,11 +4927,11 @@ func testMaxSwapRedeemLots(t *testing.T, assetID uint32) {
49274927
t.Fatalf("expected 63 for max redemptions but got %d", info.MaxRedeemsInTx)
49284928
}
49294929
} else {
4930-
if info.MaxSwapsInTx != 20 {
4931-
t.Fatalf("expected 20 for max swaps but got %d", info.MaxSwapsInTx)
4930+
if info.MaxSwapsInTx != 24 {
4931+
t.Fatalf("expected 24 for max swaps but got %d", info.MaxSwapsInTx)
49324932
}
4933-
if info.MaxRedeemsInTx != 45 {
4934-
t.Fatalf("expected 45 for max redemptions but got %d", info.MaxRedeemsInTx)
4933+
if info.MaxRedeemsInTx != 55 {
4934+
t.Fatalf("expected 55 for max redemptions but got %d", info.MaxRedeemsInTx)
49354935
}
49364936
}
49374937
}

‎client/asset/eth/nodeclient_harness_test.go‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ var (
7272
testnetParticipantWalletDir string
7373

7474
alphaNodeDir = filepath.Join(homeDir, "dextest", "eth", "alpha", "node")
75-
alphaIPCFile = filepath.Join(alphaNodeDir, "geth.ipc")
76-
betaNodeDir = filepath.Join(homeDir, "dextest", "eth", "beta", "node")
77-
betaIPCFile = filepath.Join(betaNodeDir, "geth.ipc")
75+
alphaWSEndpoint = "ws://127.0.0.1:38557"
7876
ctx context.Context
7977
tLogger = dex.StdOutLogger("ETHTEST", dex.LevelWarn)
8078
simnetWalletSeed = "0812f5244004217452059e2fd11603a511b5d0870ead753df76c966ce3c71531"
@@ -208,23 +206,23 @@ func prepareRPCClient(name, dataDir string, providers []string, net dex.Network)
208206
return c, c.creds.acct, nil
209207
}
210208

211-
func rpcEndpoints(net dex.Network) ([]string, []string) {
209+
func rpcEndpoints(net dex.Network) []string {
212210
if net == dex.Testnet {
213-
return rpcProviders, rpcProviders
211+
return rpcProviders
214212
}
215-
return []string{alphaIPCFile}, []string{betaIPCFile}
213+
return []string{alphaWSEndpoint}
216214
}
217215

218216
func prepareTestRPCClients(initiatorDir, participantDir string, net dex.Network) (err error) {
219-
initiatorEndpoints, participantEndpoints := rpcEndpoints(net)
217+
endpoints := rpcEndpoints(net)
220218

221-
ethClient, simnetAcct, err = prepareRPCClient("initiator", initiatorDir, initiatorEndpoints, net)
219+
ethClient, simnetAcct, err = prepareRPCClient("initiator", initiatorDir, endpoints, net)
222220
if err != nil {
223221
return err
224222
}
225223
fmt.Println("initiator address is", ethClient.address())
226224

227-
participantEthClient, participantAcct, err = prepareRPCClient("participant", participantDir, participantEndpoints, net)
225+
participantEthClient, participantAcct, err = prepareRPCClient("participant", participantDir, endpoints, net)
228226
if err != nil {
229227
ethClient.shutdown()
230228
return err
@@ -258,14 +256,14 @@ func runSimnet(m *testing.M) (int, error) {
258256

259257
ethSwapContractAddr = dexeth.ContractAddresses[contractVer][dex.Simnet]
260258

261-
initiatorProviders, participantProviders := rpcEndpoints(dex.Simnet)
259+
providers := rpcEndpoints(dex.Simnet)
262260

263-
err = setupWallet(simnetWalletDir, simnetWalletSeed, "localhost:30355", initiatorProviders, dex.Simnet)
261+
err = setupWallet(simnetWalletDir, simnetWalletSeed, "localhost:30355", providers, dex.Simnet)
264262
if err != nil {
265263
return 1, err
266264
}
267265

268-
err = setupWallet(participantWalletDir, participantWalletSeed, "localhost:30356", participantProviders, dex.Simnet)
266+
err = setupWallet(participantWalletDir, participantWalletSeed, "localhost:30356", providers, dex.Simnet)
269267
if err != nil {
270268
return 1, err
271269
}
@@ -390,13 +388,13 @@ func runTestnet(m *testing.M) (int, error) {
390388
ethSwapContractAddr = dexeth.ContractAddresses[contractVer][dex.Testnet]
391389
fmt.Printf("ETH swap contract address is %v\n", ethSwapContractAddr)
392390

393-
initiatorRPC, participantRPC := rpcEndpoints(dex.Testnet)
391+
rpc := rpcEndpoints(dex.Testnet)
394392

395-
err = setupWallet(testnetWalletDir, testnetWalletSeed, "localhost:30355", initiatorRPC, dex.Testnet)
393+
err = setupWallet(testnetWalletDir, testnetWalletSeed, "localhost:30355", rpc, dex.Testnet)
396394
if err != nil {
397395
return 1, err
398396
}
399-
err = setupWallet(testnetParticipantWalletDir, testnetParticipantWalletSeed, "localhost:30356", participantRPC, dex.Testnet)
397+
err = setupWallet(testnetParticipantWalletDir, testnetParticipantWalletSeed, "localhost:30356", rpc, dex.Testnet)
400398
if err != nil {
401399
return 1, err
402400
}

‎client/cmd/bisonw-desktop/go.mod‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module decred.org/dcrdex/client/cmd/bisonw-desktop
22

3-
go 1.21
3+
go 1.22
44

55
replace decred.org/dcrdex => ../../..
66

@@ -14,9 +14,7 @@ require (
1414

1515
require (
1616
github.com/Microsoft/go-winio v0.6.2 // indirect
17-
github.com/bits-and-blooms/bitset v1.10.0 // indirect
18-
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
19-
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
17+
github.com/bits-and-blooms/bitset v1.13.0 // indirect
2018
github.com/consensys/bavard v0.1.13 // indirect
2119
github.com/consensys/gnark-crypto v0.12.1 // indirect
2220
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
@@ -28,7 +26,7 @@ require (
2826
github.com/decred/vspd/client/v4 v4.0.0 // indirect
2927
github.com/decred/vspd/types/v3 v3.0.0 // indirect
3028
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
31-
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect
29+
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
3230
github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect
3331
github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect
3432
github.com/ltcsuite/lnd/tlv v0.0.0-20240222214433-454d35886119 // indirect
@@ -38,7 +36,7 @@ require (
3836
github.com/pmezard/go-difflib v1.0.0 // indirect
3937
github.com/stretchr/objx v0.5.2 // indirect
4038
github.com/stretchr/testify v1.9.0 // indirect
41-
github.com/supranational/blst v0.3.11 // indirect
39+
github.com/supranational/blst v0.3.13 // indirect
4240
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
4341
gopkg.in/yaml.v3 v3.0.1 // indirect
4442
rsc.io/tmplfunc v0.0.3 // indirect
@@ -48,12 +46,10 @@ require (
4846
decred.org/cspp/v2 v2.3.0 // indirect
4947
decred.org/dcrwallet/v4 v4.2.0 // indirect
5048
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
51-
github.com/DataDog/zstd v1.5.2 // indirect
5249
github.com/StackExchange/wmi v1.2.1 // indirect
5350
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
5451
github.com/aead/siphash v1.0.1 // indirect
5552
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
56-
github.com/beorn7/perks v1.0.1 // indirect
5753
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026 // indirect
5854
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
5955
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
@@ -71,10 +67,6 @@ require (
7167
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
7268
github.com/cespare/xxhash v1.1.0 // indirect
7369
github.com/cespare/xxhash/v2 v2.3.0 // indirect
74-
github.com/cockroachdb/errors v1.11.3 // indirect
75-
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
76-
github.com/cockroachdb/pebble v1.1.1 // indirect
77-
github.com/cockroachdb/redact v1.1.5 // indirect
7870
github.com/companyzero/sntrup4591761 v0.0.0-20220309191932-9e0f3af2f07a // indirect
7971
github.com/davecgh/go-spew v1.1.1 // indirect
8072
github.com/dchest/blake2b v1.0.0 // indirect
@@ -111,18 +103,16 @@ require (
111103
github.com/dgraph-io/badger v1.6.2 // indirect
112104
github.com/dgraph-io/ristretto v0.0.2 // indirect
113105
github.com/dustin/go-humanize v1.0.1 // indirect
114-
github.com/ethereum/go-ethereum v1.14.8 // indirect
106+
github.com/ethereum/go-ethereum v1.14.13 // indirect
115107
github.com/fsnotify/fsnotify v1.6.0 // indirect
116108
github.com/gcash/bchd v0.19.0 // indirect
117109
github.com/gcash/bchlog v0.0.0-20180913005452-b4f036f92fa6 // indirect
118110
github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000 // indirect
119111
github.com/gen2brain/beeep v0.0.0-20240112042604-c7bb2cd88fea
120-
github.com/getsentry/sentry-go v0.27.0 // indirect
121112
github.com/go-chi/chi/v5 v5.0.1 // indirect
122113
github.com/go-ole/go-ole v1.3.0 // indirect
123114
github.com/godbus/dbus/v5 v5.1.0 // indirect
124115
github.com/gofrs/flock v0.8.1 // indirect
125-
github.com/gogo/protobuf v1.3.2 // indirect
126116
github.com/golang/protobuf v1.5.4 // indirect
127117
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
128118
github.com/google/uuid v1.3.0 // indirect
@@ -137,10 +127,7 @@ require (
137127
github.com/jrick/logrotate v1.0.0 // indirect
138128
github.com/jrick/wsrpc/v2 v2.3.5 // indirect
139129
github.com/kkdai/bstream v1.0.0 // indirect
140-
github.com/klauspost/compress v1.16.0 // indirect
141130
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
142-
github.com/kr/pretty v0.3.1 // indirect
143-
github.com/kr/text v0.2.0 // indirect
144131
github.com/lib/pq v1.10.4 // indirect
145132
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
146133
github.com/lightninglabs/neutrino v0.16.1-0.20240814152458-81d6cd2d2da5 // indirect
@@ -160,12 +147,8 @@ require (
160147
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
161148
github.com/olekukonko/tablewriter v0.0.5 // indirect
162149
github.com/pkg/errors v0.9.1 // indirect
163-
github.com/prometheus/client_golang v1.14.0 // indirect
164150
github.com/prometheus/client_model v0.3.0 // indirect
165-
github.com/prometheus/common v0.39.0 // indirect
166-
github.com/prometheus/procfs v0.9.0 // indirect
167151
github.com/rivo/uniseg v0.2.0 // indirect
168-
github.com/rogpeppe/go-internal v1.12.0 // indirect
169152
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
170153
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
171154
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect

0 commit comments

Comments
 (0)