alpha: switch over to Elements Alpha by default.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Makefile

@@ -4,9 +4,9 @@
 PROTOCC:=protoc-c
 
 # Alpha has checksequenceverify, segregated witness+input-amount-in-sig+confidentual-transactions, schnorr
-#FEATURES := -DHAS_CSV=1 -DALPHA_TXSTYLE=1 -DUSE_SCHNORR=1
+FEATURES := -DHAS_CSV=1 -DALPHA_TXSTYLE=1 -DUSE_SCHNORR=1
 # Bitcoin uses DER for signatures
-FEATURES := -DSCRIPTS_USE_DER
+#FEATURES := -DSCRIPTS_USE_DER
 
 PROGRAMS := test-cli/open-channel test-cli/open-anchor-scriptsigs test-cli/leak-anchor-sigs test-cli/open-commit-sig test-cli/check-commit-sig test-cli/check-anchor-scriptsigs test-cli/get-anchor-depth test-cli/create-steal-tx test-cli/create-commit-spend-tx test-cli/close-channel test-cli/create-close-tx test-cli/update-channel test-cli/update-channel-accept test-cli/update-channel-signature test-cli/update-channel-complete test-cli/create-commit-tx
 

test-cli/scripts/vars.sh

@@ -1,14 +1,14 @@
 # Sourced by other scripts
-STYLE=bitcoin
-CLI="bitcoin-cli -regtest"
-DATADIR=$HOME/.bitcoin
-REGTESTDIR=regtest
-DAEMON=bitcoind
+#STYLE=bitcoin
+#CLI="bitcoin-cli -regtest"
+#DATADIR=$HOME/.bitcoin
+#REGTESTDIR=regtest
+#DAEMON=bitcoind
 
-#STYLE=alpha
-#DATADIR=$HOME/.alpha
-#REGTESTDIR=alpharegtest
-#CLI="alpha-cli -datadir=$DATADIR -regtest -testnet=0"
-#DAEMON="alphad -datadir=$DATADIR"
+STYLE=alpha
+DATADIR=$HOME/.alpha
+REGTESTDIR=alpharegtest
+CLI="alpha-cli -datadir=$DATADIR -regtest -testnet=0"
+DAEMON="alphad -datadir=$DATADIR"
 
 #PREFIX="valgrind --vgdb-error=1"