From aeedafc20f919b93a2faabda1ec97eda9ea10c02 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 22 Jan 2016 06:38:08 +1030 Subject: [PATCH] Switch to bitcoind by default. I haven't implemented getting transactions from alphad (it needs the values for the inputs, too), so switch to bitcoind. Signed-off-by: Rusty Russell --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 40f9d2073..a08c3d402 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,9 @@ NAME=MtGox's Cold Wallet PROTOCC:=protoc-c # Alpha has checksequenceverify, segregated witness+input-amount-in-sig+confidentual-transactions, schnorr, checklocktimeverify -FEATURES := -DHAS_CSV=1 -DALPHA_TXSTYLE=1 -DUSE_SCHNORR=1 -DHAS_CLTV=1 -# Bitcoin uses DER for signatures (Add BIP68 if it's supported) -#FEATURES := -DSCRIPTS_USE_DER #-DHAS_BIP68 +#FEATURES := -DHAS_CSV=1 -DALPHA_TXSTYLE=1 -DUSE_SCHNORR=1 -DHAS_CLTV=1 +# Bitcoin uses DER for signatures (Add BIP68 & HAS_CSV if it's supported) +FEATURES := -DSCRIPTS_USE_DER=1 #-DHAS_CSV=1 -DHAS_BIP68=1 TEST_CLI_PROGRAMS := \ test-cli/check-commit-sig \