client/eth: Use bytes as string in key import.

Also set the simnet contract address.
decred · Dec 8, 2021 · d275c56 · d275c56
1 parent 2d6d4cb
commit d275c56
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/client/asset/eth/node.go b/client/asset/eth/node.go
@@ -9,7 +9,6 @@ package eth
 import (
 	"bytes"
 	"crypto/ecdsa"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -271,7 +270,7 @@ func importKeyToNode(node *node.Node, privateKey, password []byte) error {
 	ks := backends[0].(*keystore.KeyStore)
 	accounts := ks.Accounts()
 	if len(accounts) == 0 {
-		_, err = ks.ImportECDSA(ecdsaPrivateKey, hex.EncodeToString(password))
+		_, err = ks.ImportECDSA(ecdsaPrivateKey, string(password))
 		return err
 	} else if len(accounts) == 1 {
 		address := crypto.PubkeyToAddress(ecdsaPrivateKey.PublicKey)

diff --git a/client/asset/eth/nodeclient_harness_test.go b/client/asset/eth/nodeclient_harness_test.go
@@ -220,11 +220,10 @@ func setupWallet(walletDir, seed, listenAddress string) error {
 		"nodelistenaddr": listenAddress,
 	}
 	seedB, _ := hex.DecodeString(seed)
-	walletPass, _ := hex.DecodeString(pw)
 	createWalletParams := asset.CreateWalletParams{
 		Type:     walletTypeGeth,
 		Seed:     seedB,
-		Pass:     walletPass,
+		Pass:     []byte(pw),
 		Settings: settings,
 		DataDir:  walletDir,
 		Net:      dex.Simnet,

diff --git a/client/cmd/dexcctl/simnet-setup.sh b/client/cmd/dexcctl/simnet-setup.sh
@@ -37,7 +37,7 @@ fi
 
 if [ $ETH_ON -eq 0 ]; then
 	echo configuring Eth wallet
-	./dexcctl -p abc -p "" --simnet newwallet 60 geth "" '{"appDir":"~/dextest/eth/testnode"}'
+	./dexcctl -p abc -p "" --simnet newwallet 60 geth
 fi
 
 echo registering with DEX

diff --git a/dex/networks/eth/params.go b/dex/networks/eth/params.go
@@ -39,7 +39,7 @@ var (
 	ContractAddresses = map[uint32]map[dex.Network]common.Address{
 		0: {
 			dex.Mainnet: common.Address{},
-			dex.Simnet:  common.Address{},
+			dex.Simnet:  common.HexToAddress("0x2f68e723b8989ba1c6a9f03e42f33cb7dc9d606f"),
 			dex.Testnet: common.Address{},
 		},
 	}