From 7f2c4f920ea3a950c4850e7d9d400e774915900d Mon Sep 17 00:00:00 2001 From: Jonathan Chappelow Date: Mon, 17 Aug 2020 14:03:55 -0500 Subject: [PATCH 1/4] dex/testing/dcr: update the addresses for simnet auto cointype upgrade Update the mining and transfer addresses to account for the change to dcrwallet master which always upgrades the cointype on simnet. This also makes a valid seed for the "beta" wallet. --- dex/testing/dcr/harness.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dex/testing/dcr/harness.sh b/dex/testing/dcr/harness.sh index 7232e6ff34..7ad4b71f44 100755 --- a/dex/testing/dcr/harness.sh +++ b/dex/testing/dcr/harness.sh @@ -4,22 +4,23 @@ set -ex SESSION="dcr-harness" RPC_USER="user" RPC_PASS="pass" -ALPHA_WALLET_SEED="b280922d2cffda44648346412c5ec97f429938105003730414f10b01e1402eac" -BETA_WALLET_SEED="aabbcaabbcaabbcaabbcaabbcaabbcaabbcaabbcaabbcaabbcaabbcaabbcaabbc" WALLET_PASS=abc -ALPHA_MINING_ADDR="SspUvSyDGSzvPz2NfdZ5LW15uq6rmuGZyhL" -BETA_MINING_ADDR="SsiuwSRYvH7pqWmRxFJWR8Vmqc3AWsjmK2Y" +ALPHA_WALLET_SEED="b280922d2cffda44648346412c5ec97f429938105003730414f10b01e1402eac" +ALPHA_MINING_ADDR="SsXciQNTo3HuV5tX3yy4hXndRWgLMRVC7Ah" +ALPHA_NODE_PORT="19571" ALPHA_WALLET_PORT="19567" -BETA_WALLET_PORT="19568" ALPHA_RPC_PORT="19570" +BETA_WALLET_SEED="3285a47d6a59f9c548b2a72c2c34a2de97967bede3844090102bbba76707fe9d" +BETA_MINING_ADDR="Ssge52jCzbixgFC736RSTrwAnvH3a4hcPRX" +BETA_NODE_PORT="19559" +BETA_WALLET_PORT="19568" BETA_RPC_PORT="19569" -ALPHA_PORT="19571" TRADING_WALLET1_SEED="31cc0eeb220aa5b1f1ab3b6c47529d737976af1a556b156a665408f1711c962f" -TRADING_WALLET1_ADDRESS="SsZFpS6iDJS2dEFa4i4azCTgjbv6zrEbos9" +TRADING_WALLET1_ADDRESS="SsjTp2QaT8qkPGWKKSeFi4DtaZsgkoPbgXt" TRADING_WALLET1_PORT="19581" TRADING_WALLET2_SEED="3db72efa55b9e6cce9c27dde9bea848c6199004f9b1ae2add3b04389495edb9c" -TRADING_WALLET2_ADDRESS="SsYeg8owvUbE2crm61E3ePcvNtAestYfZYR" +TRADING_WALLET2_ADDRESS="SsYW5LPmGCvvHuWok8U9FQu1kotv8LpvoEt" TRADING_WALLET2_PORT="19582" # WAIT can be used in a send-keys call along with a `wait-for donedcr` command to @@ -90,7 +91,7 @@ cat > "${NODES_ROOT}/harness-ctl/reorg" < Date: Mon, 17 Aug 2020 14:27:40 -0500 Subject: [PATCH 2/4] update server_fees xpub for dcrdex harness --- dex/testing/dcrdex/harness.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dex/testing/dcrdex/harness.sh b/dex/testing/dcrdex/harness.sh index d207d69e8f..cb14a6880a 100755 --- a/dex/testing/dcrdex/harness.sh +++ b/dex/testing/dcrdex/harness.sh @@ -59,9 +59,9 @@ cat > "./markets.json" <server_fees account. cat > "./dcrdex.conf" < Date: Mon, 17 Aug 2020 14:35:14 -0500 Subject: [PATCH 3/4] show server_fees account xpub in harness --- dex/testing/dcr/harness.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dex/testing/dcr/harness.sh b/dex/testing/dcr/harness.sh index 7ad4b71f44..a00aae1623 100755 --- a/dex/testing/dcr/harness.sh +++ b/dex/testing/dcr/harness.sh @@ -225,5 +225,6 @@ done # Create fee account on alpha wallet for use by dcrdex simnet instances. tmux send-keys -t $SESSION:0 "./alpha createnewaccount server_fees${WAIT}" C-m\; wait-for donedcr +tmux send-keys -t $SESSION:0 "./alpha getmasterpubkey server_fees${WAIT}" C-m\; wait-for donedcr tmux attach-session -t $SESSION From b89067c974a093a2bed4775738774d4fdd981c13 Mon Sep 17 00:00:00 2001 From: Jonathan Chappelow Date: Mon, 17 Aug 2020 16:02:51 -0500 Subject: [PATCH 4/4] client/asset/dcr: update simnet test addresses --- client/asset/dcr/simnet_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/asset/dcr/simnet_test.go b/client/asset/dcr/simnet_test.go index bced3c641e..572140123a 100644 --- a/client/asset/dcr/simnet_test.go +++ b/client/asset/dcr/simnet_test.go @@ -33,8 +33,8 @@ import ( const ( walletPassword = "abc" - alphaAddress = "SsonWQK6xkLSYm7VttCddHWkWWhETFMdR4Y" - betaAddress = "Ssb7Peny8omFwicUi8hC6hCALhcEp59p7UK" + alphaAddress = "SsWKp7wtdTZYabYFYSc9cnxhwFEjA5g4pFc" + betaAddress = "Ssge52jCzbixgFC736RSTrwAnvH3a4hcPRX" ) var (