Skip to content

dex/testing/dcr: update the addresses for simnet auto cointype upgrade #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chappjc merged 4 commits into from
Aug 18, 2020
Merged

dex/testing/dcr: update the addresses for simnet auto cointype upgrade #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f2c4f9
dex/testing/dcr: update the addresses for simnet auto cointype upgrade
chappjc Aug 17, 2020
c895814
update server_fees xpub for dcrdex harness
chappjc Aug 17, 2020
08e40c2
show server_fees account xpub in harness
chappjc Aug 17, 2020
b89067c
client/asset/dcr: update simnet test addresses
chappjc Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/asset/dcr/simnet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (

const (
walletPassword = "abc"
alphaAddress = "SsonWQK6xkLSYm7VttCddHWkWWhETFMdR4Y"
betaAddress = "Ssb7Peny8omFwicUi8hC6hCALhcEp59p7UK"
alphaAddress = "SsWKp7wtdTZYabYFYSc9cnxhwFEjA5g4pFc"
betaAddress = "Ssge52jCzbixgFC736RSTrwAnvH3a4hcPRX"
Comment on lines +36 to +37
Copy link
Copy Markdown
Member Author

@chappjc chappjc Aug 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client/asset/dcr/simnet_test.go passing now too. Sorry I missed that one.

)

var (
Expand Down
28 changes: 15 additions & 13 deletions dex/testing/dcr/harness.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -90,15 +91,15 @@ cat > "${NODES_ROOT}/harness-ctl/reorg" <<EOF
#!/bin/sh
echo "Disconnecting beta from alpha"
sleep 1
./beta addnode 127.0.0.1:${ALPHA_PORT} remove
./beta addnode 127.0.0.1:${ALPHA_NODE_PORT} remove
echo "Mining a block on alpha"
sleep 1
./mine-alpha 1
echo "Mining 3 blocks on beta"
./mine-beta 3
sleep 2
echo "Reconnecting beta to alpha"
./beta addnode 127.0.0.1:${ALPHA_PORT} add
./beta addnode 127.0.0.1:${ALPHA_NODE_PORT} add
sleep 2
grep REORG ${NODES_ROOT}/alpha/logs/simnet/dcrd.log
EOF
Expand Down Expand Up @@ -153,7 +154,7 @@ echo "Starting simnet alpha node"
tmux send-keys -t $SESSION:1 "dcrd --appdata=${NODES_ROOT}/alpha \
--rpcuser=${RPC_USER} --rpcpass=${RPC_PASS} \
--miningaddr=${ALPHA_MINING_ADDR} --rpclisten=127.0.0.1:${ALPHA_RPC_PORT} \
--txindex --listen=127.0.0.1:${ALPHA_PORT} \
--txindex --listen=127.0.0.1:${ALPHA_NODE_PORT} \
--debuglevel=debug \
--whitelist=127.0.0.0/8 --whitelist=::1 \
--simnet; tmux wait-for -S alphadcr" C-m
Expand All @@ -164,9 +165,9 @@ tmux send-keys -t $SESSION:2 "cd ${NODES_ROOT}/beta" C-m
echo "Starting simnet beta node"
tmux send-keys -t $SESSION:2 "dcrd --appdata=${NODES_ROOT}/beta \
--rpcuser=${RPC_USER} --rpcpass=${RPC_PASS} \
--listen=127.0.0.1:19559 --rpclisten=127.0.0.1:${BETA_RPC_PORT} \
--listen=127.0.0.1:${BETA_NODE_PORT} --rpclisten=127.0.0.1:${BETA_RPC_PORT} \
--miningaddr=${BETA_MINING_ADDR} \
--txindex --connect=127.0.0.1:${ALPHA_PORT} \
--txindex --connect=127.0.0.1:${ALPHA_NODE_PORT} \
--debuglevel=debug \
--whitelist=127.0.0.0/8 --whitelist=::1 \
--simnet; tmux wait-for -S betadcr" C-m
Expand Down Expand Up @@ -224,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
4 changes: 2 additions & 2 deletions dex/testing/dcrdex/harness.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ cat > "./markets.json" <<EOF
}
EOF

# Write dcrdex.conf.
# Write dcrdex.conf. The regfeexpub comes from the alpha>server_fees account.
cat > "./dcrdex.conf" <<EOF
regfeexpub=spubVWHTkHRefqHpw3qMN2VTWqnT9rMuqDZrbdgxp8QzGBvXCYfdUuk2VKFnsPHE1CBBNSZjrwHTx2LrM9LbXbGH7gb9qLCYc3JUkLW883SeQ2H
regfeexpub=spubVWKGn9TGzyo7M4b5xubB5UV4joZ5HBMNBmMyGvYEaoZMkSxVG4opckpmQ26E85iHg8KQxrSVTdex56biddqtXBerG9xMN8Dvb3eNQVFFwpE
pgdbname=${TEST_DB}
simnet=1
rpclisten=127.0.0.1:17273
Expand Down