From 8f4426e09becbe26c3a7d9089b2f6c2b39ad7112 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 25 Jun 2015 13:49:17 +0930
Subject: [PATCH] scripts: move to scripts/ subdir, prepare for alpha.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 test-cli/getinput.sh                |  36 --------
 test-cli/scripts/generate-block.sh  |  16 ++++
 test-cli/scripts/get-new-address.sh |  17 ++++
 test-cli/scripts/getinput.sh        |  36 ++++++++
 test-cli/scripts/test.sh            | 136 ++++++++++++++++++++++++++++
 test-cli/scripts/vars.sh            |   7 ++
 test-cli/test.sh                    | 135 ---------------------------
 7 files changed, 212 insertions(+), 171 deletions(-)
 delete mode 100755 test-cli/getinput.sh
 create mode 100755 test-cli/scripts/generate-block.sh
 create mode 100755 test-cli/scripts/get-new-address.sh
 create mode 100755 test-cli/scripts/getinput.sh
 create mode 100755 test-cli/scripts/test.sh
 create mode 100644 test-cli/scripts/vars.sh
 delete mode 100755 test-cli/test.sh

diff --git a/test-cli/getinput.sh b/test-cli/getinput.sh
deleted file mode 100755
index d7a62d9a2..000000000
--- a/test-cli/getinput.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Query bitcoind to get (first) unspent output to spend.
-
-###
-# Nobody should *EVER* write code like this.  EVER!!
-###
-BITCOIN_CLI=bitcoin-cli
-
-set -e
-
-if [ n"$1" = n--privkey ]; then
-    KEY=1
-    shift
-fi
-NUM=1
-if [ $# = 1 ]; then
-    NUM=$1
-    shift
-fi
-    
-if [ $# -gt 0 ]; then
-    echo "Usage: getinput.sh [--privkey] [INPUT-INDEX]"
-    exit 1
-fi
-
-if [ -n "$KEY" ]; then
-    ADDR=`$BITCOIN_CLI listunspent | sed -n 's/^ *"address" *: *"\([0-9a-zA-Z]*\)",$/\1/p' | tail -n +$NUM | head -n1`
-    $BITCOIN_CLI dumpprivkey $ADDR
-else
-    TXID=`$BITCOIN_CLI listunspent | sed -n 's/^ *"txid" *: *"\([0-9a-f]*\)",$/\1/p' | tail -n +$NUM | head -n1`
-    OUTNUM=`$BITCOIN_CLI listunspent | sed -n 's/^ *"vout" *: *\([0-9]*\),$/\1/p' | tail -n +$NUM | head -n1`
-    AMOUNT=`$BITCOIN_CLI listunspent | sed -n 's/^ *"amount" *: *\([0-9.]*\),$/\1/p' | tail -n +$NUM | head -n1 | tr -d . | sed 's/^0*//'`
-    SCRIPT=`$BITCOIN_CLI listunspent | sed -n 's/^ *"scriptPubKey" *: *"\([0-9a-f]*\)",$/\1/p' | tail -n +$NUM | head -n1`
-
-    echo $TXID/$OUTNUM/$AMOUNT/$SCRIPT
-fi
diff --git a/test-cli/scripts/generate-block.sh b/test-cli/scripts/generate-block.sh
new file mode 100755
index 000000000..5969edfd0
--- /dev/null
+++ b/test-cli/scripts/generate-block.sh
@@ -0,0 +1,16 @@
+#! /bin/sh
+# Query bitcoind to get (first) unspent output to spend.
+
+set -e
+
+. `dirname $0`/vars.sh
+
+case $STYLE in
+    alpha)
+	# This is a one-shot in alpha, it seems.
+	$CLI setgenerate true
+	;;
+    bitcoin)
+	$CLI generate 1
+	;;
+esac
diff --git a/test-cli/scripts/get-new-address.sh b/test-cli/scripts/get-new-address.sh
new file mode 100755
index 000000000..00b4d73b1
--- /dev/null
+++ b/test-cli/scripts/get-new-address.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+# Alpha defaults to confidential addresses.  We don't handle those (yet?)
+# so extract the unconfidential address.
+set -e
+
+. `dirname $0`/vars.sh
+
+case $STYLE in
+    alpha)
+	A=`$CLI getnewaddress`
+	$CLI validateaddress $A | sed -n 's/.*"unconfidential" : "\([A-Za-z0-9]*\)".*/\1/p'
+	;;
+    bitcoin)
+	$CLI getnewaddress
+	;;
+esac
diff --git a/test-cli/scripts/getinput.sh b/test-cli/scripts/getinput.sh
new file mode 100755
index 000000000..85195cc1a
--- /dev/null
+++ b/test-cli/scripts/getinput.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+# Query bitcoind to get (first) unspent output to spend.
+
+###
+# Nobody should *EVER* write code like this.  EVER!!
+###
+set -e
+
+. `dirname $0`/vars.sh
+
+if [ n"$1" = n--privkey ]; then
+    KEY=1
+    shift
+fi
+NUM=1
+if [ $# = 1 ]; then
+    NUM=$1
+    shift
+fi
+    
+if [ $# -gt 0 ]; then
+    echo "Usage: getinput.sh [--privkey] [INPUT-INDEX]"
+    exit 1
+fi
+
+if [ -n "$KEY" ]; then
+    ADDR=`$CLI listunspent | sed -n 's/^ *"address" *: *"\([0-9a-zA-Z]*\)",$/\1/p' | tail -n +$NUM | head -n1`
+    $CLI dumpprivkey $ADDR
+else
+    TXID=`$CLI listunspent | sed -n 's/^ *"txid" *: *"\([0-9a-f]*\)",$/\1/p' | tail -n +$NUM | head -n1`
+    OUTNUM=`$CLI listunspent | sed -n 's/^ *"vout" *: *\([0-9]*\),$/\1/p' | tail -n +$NUM | head -n1`
+    AMOUNT=`$CLI listunspent | sed -n 's/^ *"amount" *: *\([0-9.]*\),$/\1/p' | tail -n +$NUM | head -n1 | tr -d . | sed 's/^0*//'`
+    SCRIPT=`$CLI listunspent | sed -n 's/^ *"scriptPubKey" *: *"\([0-9a-f]*\)",$/\1/p' | tail -n +$NUM | head -n1`
+
+    echo $TXID/$OUTNUM/$AMOUNT/$SCRIPT
+fi
diff --git a/test-cli/scripts/test.sh b/test-cli/scripts/test.sh
new file mode 100755
index 000000000..214fea83c
--- /dev/null
+++ b/test-cli/scripts/test.sh
@@ -0,0 +1,136 @@
+#! /bin/sh
+set -e
+
+# Expect to be run from test-cli dir.
+. scripts/vars.sh
+
+getpubkey()
+{
+    $CLI validateaddress $1 | sed -n 's/.*"pubkey" : "\([0-9a-f]*\)".*/\1/p'
+}
+
+getprivkey()
+{
+    $CLI dumpprivkey $1
+}
+
+A_INPUTNUM=1
+B_INPUTNUM=2
+#A_INPUTNUM=4
+#B_INPUTNUM=1
+A_AMOUNT=1000000
+B_AMOUNT=9795000
+
+A_CHANGEADDR=`scripts/get-new-address.sh`
+A_TMPADDR=`scripts/get-new-address.sh`
+A_FINALADDR=`scripts/get-new-address.sh`
+
+B_CHANGEADDR=`scripts/get-new-address.sh`
+B_TMPADDR=`scripts/get-new-address.sh`
+B_FINALADDR=`scripts/get-new-address.sh`
+
+#A_CHANGEADDR=mzJseRSpUnmUDRJkp9Jp3XRmLKRrFk8KEF
+#A_TMPADDR=mxAucVQU1WWRcMd9ubx1gisteFuy5MgSVh
+#A_FINALADDR=mgjMAVHe8Kgx38SY3apjHdLwz2deJ2ZY2H
+
+#B_CHANGEADDR=mmCiKXHPWunBMFhqZx7fg1v23HssJJesLV
+#B_TMPADDR=mvY4WDonPXq3Xa3NL4uSG26PXKRuLsXGTT
+#B_FINALADDR=mvQgfEX4iMSEYqD31524jASQviPwPwpvuv
+
+A_TXIN=`scripts/getinput.sh $A_INPUTNUM`
+A_TXINKEY=`scripts/getinput.sh --privkey $A_INPUTNUM`
+B_TXIN=`scripts/getinput.sh $B_INPUTNUM`
+B_TXINKEY=`scripts/getinput.sh --privkey $B_INPUTNUM`
+
+A_SEED=00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff
+B_SEED=112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00
+
+A_CHANGEPUBKEY=`getpubkey $A_CHANGEADDR`
+A_TMPKEY=`getprivkey $A_TMPADDR`
+A_FINALKEY=`getprivkey $A_FINALADDR`
+
+B_CHANGEPUBKEY=`getpubkey $B_CHANGEADDR`
+B_TMPKEY=`getprivkey $B_TMPADDR`
+B_FINALKEY=`getprivkey $B_FINALADDR`
+
+# Both sides say what they want from channel
+$PREFIX ./open-channel $A_SEED $A_AMOUNT $A_CHANGEPUBKEY $A_TMPKEY $A_FINALKEY $A_TXIN > A-open.pb
+$PREFIX ./open-channel $B_SEED $B_AMOUNT $B_CHANGEPUBKEY $B_TMPKEY $B_FINALKEY $B_TXIN > B-open.pb
+
+# Now sign anchor.
+$PREFIX ./open-anchor-scriptsigs A-open.pb B-open.pb $A_TXINKEY > A-anchor-scriptsigs.pb
+$PREFIX ./open-anchor-scriptsigs B-open.pb A-open.pb $B_TXINKEY > B-anchor-scriptsigs.pb
+
+# Now leak that signature.
+$PREFIX ./leak-anchor-sigs A-anchor-scriptsigs.pb > A-leak-anchor-sigs.pb
+$PREFIX ./leak-anchor-sigs B-anchor-scriptsigs.pb > B-leak-anchor-sigs.pb
+
+# Now create commit signature
+$PREFIX ./open-commit-sig A-open.pb B-open.pb $A_TMPKEY A-leak-anchor-sigs.pb B-leak-anchor-sigs.pb > A-commit-sig.pb
+
+$PREFIX ./open-commit-sig B-open.pb A-open.pb $B_TMPKEY B-leak-anchor-sigs.pb A-leak-anchor-sigs.pb > B-commit-sig.pb
+
+# Now check it.
+$PREFIX ./check-commit-sig A-open.pb B-open.pb B-commit-sig.pb $A_TMPKEY A-leak-anchor-sigs.pb B-leak-anchor-sigs.pb > A-commit.tx
+$PREFIX ./check-commit-sig B-open.pb A-open.pb A-commit-sig.pb $B_TMPKEY B-leak-anchor-sigs.pb A-leak-anchor-sigs.pb > B-commit.tx
+
+# Now check anchor sigs and make sure they're the same.
+$PREFIX ./check-anchor-scriptsigs A-open.pb B-open.pb A-anchor-scriptsigs.pb B-anchor-scriptsigs.pb > A-anchor.tx
+$PREFIX ./check-anchor-scriptsigs B-open.pb A-open.pb B-anchor-scriptsigs.pb A-anchor-scriptsigs.pb > B-anchor.tx
+cmp A-anchor.tx B-anchor.tx
+
+# Broadcast
+$CLI sendrawtransaction `cat A-anchor.tx` > anchor.txid
+
+# # Wait for confirms
+# while [ 0$($CLI getrawtransaction $(cat anchor.txid) 1 | sed -n 's/.*"confirmations" : \([0-9]*\),/\1/p') -lt $($PREFIX ./get-anchor-depth A-open.pb) ]; do scripts/generate-block.sh; done
+
+# while [ 0$($CLI getrawtransaction $(cat anchor.txid) 1 | sed -n 's/.*"confirmations" : \([0-9]*\),/\1/p') -lt $($PREFIX ./get-anchor-depth B-open.pb) ]; do scripts/generate-block.sh; done
+
+# Just for testing, generate the first transaction.
+$PREFIX ./create-commit-tx A-anchor.tx A-open.pb B-open.pb $A_TMPKEY B-commit-sig.pb > A-commit-0.tx
+
+# Now, update the channel, so I pay you 500 satoshi.
+$PREFIX ./update-channel --to-them=500 $A_SEED > A-update-1.pb
+$PREFIX ./update-channel-accept $B_SEED B-anchor.tx B-open.pb A-open.pb $B_TMPKEY A-update-1.pb > B-update-accept-1.pb
+$PREFIX ./update-channel-signature $A_SEED A-anchor.tx A-open.pb B-open.pb $A_TMPKEY A-update-1.pb B-update-accept-1.pb > A-update-sig-1.pb
+$PREFIX ./update-channel-complete $B_SEED B-anchor.tx B-open.pb A-open.pb A-update-1.pb A-update-sig-1.pb > B-update-complete-1.pb
+
+# Just for testing, generate second transaction
+$PREFIX ./create-commit-tx A-anchor.tx A-open.pb B-open.pb $A_TMPKEY B-update-accept-1.pb A-update-1.pb > A-commit-1.tx
+
+# Now you pay me 1000.
+$PREFIX ./update-channel --from-them=1000 $A_SEED A-update-1.pb > A-update-2.pb
+$PREFIX ./update-channel-accept $B_SEED B-anchor.tx B-open.pb A-open.pb $B_TMPKEY A-update-2.pb A-update-1.pb > B-update-accept-2.pb 2>/dev/null
+$PREFIX ./update-channel-signature $A_SEED A-anchor.tx A-open.pb B-open.pb $A_TMPKEY A-update-2.pb B-update-accept-2.pb A-update-1.pb > A-update-sig-2.pb
+$PREFIX ./update-channel-complete $B_SEED B-anchor.tx B-open.pb A-open.pb A-update-2.pb A-update-sig-2.pb A-update-1.pb > B-update-complete-2.pb
+
+# Just for testing, generate third transaction
+$PREFIX ./create-commit-tx A-anchor.tx A-open.pb B-open.pb $A_TMPKEY B-update-accept-2.pb A-update-1.pb A-update-2.pb > A-commit-2.tx
+
+if [ x"$1" = x--steal ]; then
+    # A stupidly broadcasts a revoked transaction.
+    $CLI sendrawtransaction `cat A-commit-1.tx` > A-commit-1.txid
+    
+    # B uses the preimage from A-update-sig-2 to cash in.
+    $PREFIX ./create-steal-tx A-commit-1.tx A-update-sig-2.pb $B_FINALKEY B-open.pb A-open.pb $B_CHANGEPUBKEY > B-commit-steal.tx
+
+    $CLI sendrawtransaction `cat B-commit-steal.tx` > B-commit-steal.txid
+    exit 0
+fi
+
+if [ x"$1" = x--unilateral ]; then
+    $CLI sendrawtransaction `cat A-commit-2.tx` > A-commit-2.txid
+    # Normally we'd have to wait before redeeming, but OP_CHECKSEQUENCEVERIFY
+    # is a noop.
+    $PREFIX ./create-commit-spend-tx A-commit-2.tx A-open.pb B-open.pb $A_FINALKEY $A_CHANGEPUBKEY A-update-1.pb A-update-2.pb > A-spend.tx
+    $CLI sendrawtransaction `cat A-spend.tx` > A-spend.txid
+    exit 0
+fi
+
+# Now close channel by mutual consent.
+$PREFIX ./close-channel A-anchor.tx A-open.pb B-open.pb $A_TMPKEY A-update-1.pb A-update-2.pb > A-close.pb
+$PREFIX ./close-channel --complete B-anchor.tx B-open.pb A-open.pb $B_TMPKEY A-update-1.pb A-update-2.pb > B-close-complete.pb
+$PREFIX ./create-close-tx A-anchor.tx A-open.pb B-open.pb A-close.pb B-close-complete.pb A-update-1.pb A-update-2.pb > A-close.tx
+
+$CLI sendrawtransaction `cat A-close.tx` > close.txid
diff --git a/test-cli/scripts/vars.sh b/test-cli/scripts/vars.sh
new file mode 100644
index 000000000..be0c59c6e
--- /dev/null
+++ b/test-cli/scripts/vars.sh
@@ -0,0 +1,7 @@
+# Sourced by other scripts
+CLI="bitcoin-cli -regtest"
+STYLE=bitcoin
+#CLI="alpha-cli -regtest -testnet=0"
+#STYLE=alpha
+
+#PREFIX="valgrind --vgdb-error=1"
diff --git a/test-cli/test.sh b/test-cli/test.sh
deleted file mode 100755
index 6eb679eb3..000000000
--- a/test-cli/test.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#! /bin/sh
-
-set -e
-
-BITCOIN="bitcoin-cli -regtest"
-getpubkey()
-{
-    $BITCOIN validateaddress $1 | sed -n 's/.*"pubkey" : "\([0-9a-f]*\)".*/\1/p'
-}
-
-getprivkey()
-{
-    $BITCOIN dumpprivkey $1
-}
-
-A_INPUTNUM=4
-B_INPUTNUM=74
-#A_INPUTNUM=4
-#B_INPUTNUM=1
-A_AMOUNT=100000000
-B_AMOUNT=9795000
-
-A_CHANGEADDR=`$BITCOIN getnewaddress`
-A_TMPADDR=`$BITCOIN getnewaddress`
-A_FINALADDR=`$BITCOIN getnewaddress`
-
-B_CHANGEADDR=`$BITCOIN getnewaddress`
-B_TMPADDR=`$BITCOIN getnewaddress`
-B_FINALADDR=`$BITCOIN getnewaddress`
-
-#A_CHANGEADDR=mzJseRSpUnmUDRJkp9Jp3XRmLKRrFk8KEF
-#A_TMPADDR=mxAucVQU1WWRcMd9ubx1gisteFuy5MgSVh
-#A_FINALADDR=mgjMAVHe8Kgx38SY3apjHdLwz2deJ2ZY2H
-
-#B_CHANGEADDR=mmCiKXHPWunBMFhqZx7fg1v23HssJJesLV
-#B_TMPADDR=mvY4WDonPXq3Xa3NL4uSG26PXKRuLsXGTT
-#B_FINALADDR=mvQgfEX4iMSEYqD31524jASQviPwPwpvuv
-
-A_TXIN=`./getinput.sh $A_INPUTNUM`
-A_TXINKEY=`./getinput.sh --privkey $A_INPUTNUM`
-B_TXIN=`./getinput.sh $B_INPUTNUM`
-B_TXINKEY=`./getinput.sh --privkey $B_INPUTNUM`
-
-A_SEED=00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff
-B_SEED=112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00
-
-A_CHANGEPUBKEY=`getpubkey $A_CHANGEADDR`
-A_TMPKEY=`getprivkey $A_TMPADDR`
-A_FINALKEY=`getprivkey $A_FINALADDR`
-
-B_CHANGEPUBKEY=`getpubkey $B_CHANGEADDR`
-B_TMPKEY=`getprivkey $B_TMPADDR`
-B_FINALKEY=`getprivkey $B_FINALADDR`
-
-# Both sides say what they want from channel
-./open-channel $A_SEED $A_AMOUNT $A_CHANGEPUBKEY $A_TMPKEY $A_FINALKEY $A_TXIN > A-open.pb
-./open-channel $B_SEED $B_AMOUNT $B_CHANGEPUBKEY $B_TMPKEY $B_FINALKEY $B_TXIN > B-open.pb
-
-# Now sign anchor.
-./open-anchor-scriptsigs A-open.pb B-open.pb $A_TXINKEY > A-anchor-scriptsigs.pb
-./open-anchor-scriptsigs B-open.pb A-open.pb $B_TXINKEY > B-anchor-scriptsigs.pb
-
-# Now leak that signature.
-./leak-anchor-sigs A-anchor-scriptsigs.pb > A-leak-anchor-sigs.pb
-./leak-anchor-sigs B-anchor-scriptsigs.pb > B-leak-anchor-sigs.pb
-
-# Now create commit signature
-./open-commit-sig A-open.pb B-open.pb $A_TMPKEY A-leak-anchor-sigs.pb B-leak-anchor-sigs.pb > A-commit-sig.pb
-
-./open-commit-sig B-open.pb A-open.pb $B_TMPKEY B-leak-anchor-sigs.pb A-leak-anchor-sigs.pb > B-commit-sig.pb
-
-# Now check it.
-./check-commit-sig A-open.pb B-open.pb B-commit-sig.pb $A_TMPKEY A-leak-anchor-sigs.pb B-leak-anchor-sigs.pb > A-commit.tx
-./check-commit-sig B-open.pb A-open.pb A-commit-sig.pb $B_TMPKEY B-leak-anchor-sigs.pb A-leak-anchor-sigs.pb > B-commit.tx
-
-# Now check anchor sigs and make sure they're the same.
-./check-anchor-scriptsigs A-open.pb B-open.pb A-anchor-scriptsigs.pb B-anchor-scriptsigs.pb > A-anchor.tx
-./check-anchor-scriptsigs B-open.pb A-open.pb B-anchor-scriptsigs.pb A-anchor-scriptsigs.pb > B-anchor.tx
-cmp A-anchor.tx B-anchor.tx
-
-# Broadcast
-$BITCOIN sendrawtransaction `cat A-anchor.tx` > anchor.txid
-
-# # Wait for confirms
-# while [ 0$($BITCOIN getrawtransaction $(cat anchor.txid) 1 | sed -n 's/.*"confirmations" : \([0-9]*\),/\1/p') -lt $(./get-anchor-depth A-open.pb) ]; do $BITCOIN generate 1; done
-
-# while [ 0$($BITCOIN getrawtransaction $(cat anchor.txid) 1 | sed -n 's/.*"confirmations" : \([0-9]*\),/\1/p') -lt $(./get-anchor-depth B-open.pb) ]; do $BITCOIN generate 1; done
-
-# Just for testing, generate the first transaction.
-./create-commit-tx A-anchor.tx A-open.pb B-open.pb $A_TMPKEY B-commit-sig.pb > A-commit-0.tx
-
-# Now, update the channel, so I pay you 500 satoshi.
-./update-channel --to-them=500 $A_SEED > A-update-1.pb
-./update-channel-accept $B_SEED B-anchor.tx B-open.pb A-open.pb $B_TMPKEY A-update-1.pb > B-update-accept-1.pb
-./update-channel-signature $A_SEED A-anchor.tx A-open.pb B-open.pb $A_TMPKEY A-update-1.pb B-update-accept-1.pb > A-update-sig-1.pb
-./update-channel-complete $B_SEED B-anchor.tx B-open.pb A-open.pb A-update-1.pb A-update-sig-1.pb > B-update-complete-1.pb
-
-# Just for testing, generate second transaction
-./create-commit-tx A-anchor.tx A-open.pb B-open.pb $A_TMPKEY B-update-accept-1.pb A-update-1.pb > A-commit-1.tx
-
-# Now you pay me 1000.
-./update-channel --from-them=1000 $A_SEED A-update-1.pb > A-update-2.pb
-./update-channel-accept $B_SEED B-anchor.tx B-open.pb A-open.pb $B_TMPKEY A-update-2.pb A-update-1.pb > B-update-accept-2.pb 2>/dev/null
-./update-channel-signature $A_SEED A-anchor.tx A-open.pb B-open.pb $A_TMPKEY A-update-2.pb B-update-accept-2.pb A-update-1.pb > A-update-sig-2.pb
-./update-channel-complete $B_SEED B-anchor.tx B-open.pb A-open.pb A-update-2.pb A-update-sig-2.pb A-update-1.pb > B-update-complete-2.pb
-
-# Just for testing, generate third transaction
-./create-commit-tx A-anchor.tx A-open.pb B-open.pb $A_TMPKEY B-update-accept-2.pb A-update-1.pb A-update-2.pb > A-commit-2.tx
-
-if [ x"$1" = x--steal ]; then
-    # A stupidly broadcasts a revoked transaction.
-    $BITCOIN sendrawtransaction `cat A-commit-1.tx` > A-commit-1.txid
-    
-    # B uses the preimage from A-update-sig-2 to cash in.
-    ./create-steal-tx A-commit-1.tx A-update-sig-2.pb $B_FINALKEY B-open.pb A-open.pb $B_CHANGEPUBKEY > B-commit-steal.tx
-
-    $BITCOIN sendrawtransaction `cat B-commit-steal.tx` > B-commit-steal.txid
-    exit 0
-fi
-
-if [ x"$1" = x--unilateral ]; then
-    $BITCOIN sendrawtransaction `cat A-commit-2.tx` > A-commit-2.txid
-    # Normally we'd have to wait before redeeming, but OP_CHECKSEQUENCEVERIFY
-    # is a noop.
-    ./create-commit-spend-tx A-commit-2.tx A-open.pb B-open.pb $A_FINALKEY $A_CHANGEPUBKEY A-update-1.pb A-update-2.pb > A-spend.tx
-    $BITCOIN sendrawtransaction `cat A-spend.tx` > A-spend.txid
-    exit 0
-fi
-
-# Now close channel by mutual consent.
-./close-channel A-anchor.tx A-open.pb B-open.pb $A_TMPKEY A-update-1.pb A-update-2.pb > A-close.pb
-./close-channel --complete B-anchor.tx B-open.pb A-open.pb $B_TMPKEY A-update-1.pb A-update-2.pb > B-close-complete.pb
-./create-close-tx A-anchor.tx A-open.pb B-open.pb A-close.pb B-close-complete.pb A-update-1.pb A-update-2.pb > A-close.tx
-
-$BITCOIN sendrawtransaction `cat A-close.tx` > close.txid