From 44fa28b27b1fab25479bc1463b8fd715a6730ba9 Mon Sep 17 00:00:00 2001 From: Wilmer Paulino Date: Mon, 25 Nov 2019 10:59:00 -0800 Subject: [PATCH 1/2] build: bump travis bitcoind version to 0.19.0.1 --- .travis.yml | 2 +- scripts/install_bitcoind.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8253912e3..6808af3ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go cache: directories: - - ~/bitcoin/bitcoin-0.18.1/bin + - ~/bitcoin/bitcoin-0.19.0.1/bin - $GOCACHE - $GOPATH/pkg/mod - $GOPATH/src/github.com/btcsuite diff --git a/scripts/install_bitcoind.sh b/scripts/install_bitcoind.sh index f70f8a3d7..b30496932 100755 --- a/scripts/install_bitcoind.sh +++ b/scripts/install_bitcoind.sh @@ -2,7 +2,7 @@ set -ev -export BITCOIND_VERSION=0.18.1 +export BITCOIND_VERSION=0.19.0.1 if sudo cp ~/bitcoin/bitcoin-$BITCOIND_VERSION/bin/bitcoind /usr/local/bin/bitcoind then From 75dbfba4ec7e76af67d9daa60e71cf3205a6544d Mon Sep 17 00:00:00 2001 From: Wilmer Paulino Date: Mon, 25 Nov 2019 12:40:01 -0800 Subject: [PATCH 2/2] lntest: lower cpfp fee due to new bitcoind max fee restriction --- lntest/itest/onchain.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lntest/itest/onchain.go b/lntest/itest/onchain.go index ccc73feb5..22b50e3c5 100644 --- a/lntest/itest/onchain.go +++ b/lntest/itest/onchain.go @@ -94,7 +94,7 @@ func testCPFP(net *lntest.NetworkHarness, t *harnessTest) { } bumpFeeReq := &walletrpc.BumpFeeRequest{ Outpoint: op, - SatPerByte: uint32(sweep.DefaultMaxFeeRate.FeePerKVByte() / 1000), + SatPerByte: uint32(sweep.DefaultMaxFeeRate.FeePerKVByte() / 2000), } ctxt, _ = context.WithTimeout(ctxb, defaultTimeout) _, err = net.Bob.WalletKitClient.BumpFee(ctxt, bumpFeeReq)