From a589bcd7028b94a39429b2e1d07da6b7b4756f34 Mon Sep 17 00:00:00 2001 From: Richard Myers Date: Wed, 2 Feb 2022 10:52:28 +0100 Subject: [PATCH] update script, option `--route` is now `--nodeIds` --- scripts/multipart_timeout.sh | 4 ++-- scripts/send_to_route.sh | 8 ++++---- scripts/send_to_route_multipart.sh | 10 +++++----- scripts/send_to_route_trampoline.sh | 4 ++-- scripts/trampoline_multipart.sh | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/multipart_timeout.sh b/scripts/multipart_timeout.sh index a8a6ad5..dfaf1fc 100755 --- a/scripts/multipart_timeout.sh +++ b/scripts/multipart_timeout.sh @@ -59,11 +59,11 @@ echo Awaiting broadcast network state... sleep 60 echo Paying multi-part invoice first part -PAYMENT_ID_1=$(alice-eclair-cli sendtoroute --amountMsat=100000000 --paymentHash=$PAYMENT_HASH --route=$ALICE_ID,$BOB_ID,$DAVE_ID --finalCltvExpiry=144 --invoice=$INVOICE) +PAYMENT_ID_1=$(alice-eclair-cli sendtoroute --amountMsat=100000000 --paymentHash=$PAYMENT_HASH --nodeIds=$ALICE_ID,$BOB_ID,$DAVE_ID --finalCltvExpiry=144 --invoice=$INVOICE | jq .parentId) echo $PAYMENT_ID_1 echo Paying multi-part invoice second part -PAYMENT_ID_2=$(alice-eclair-cli sendtoroute --amountMsat=100000000 --paymentHash=$PAYMENT_HASH --route=$ALICE_ID,$CAROL_ID,$DAVE_ID --finalCltvExpiry=144 --invoice=$INVOICE) +PAYMENT_ID_2=$(alice-eclair-cli sendtoroute --amountMsat=100000000 --paymentHash=$PAYMENT_HASH --nodeIds=$ALICE_ID,$CAROL_ID,$DAVE_ID --finalCltvExpiry=144 --invoice=$INVOICE | jq .parentId) echo $PAYMENT_ID_2 echo Waiting for a timeout... diff --git a/scripts/send_to_route.sh b/scripts/send_to_route.sh index fd8db4e..797a397 100755 --- a/scripts/send_to_route.sh +++ b/scripts/send_to_route.sh @@ -22,8 +22,8 @@ bob-eclair-cli connect --uri=$CAROL_ID@localhost:9737 bob-eclair-cli open --nodeId=$CAROL_ID --fundingSatoshis=500000 echo Generating a few blocks to confirm channels... -MINER=$(bitcoin-cli getnewaddress) -bitcoin-cli generatetoaddress 10 $MINER +MINER=$(btc-cli getnewaddress) +btc-cli generatetoaddress 10 $MINER echo Awaiting confirmations... sleep 30 @@ -39,14 +39,14 @@ echo Awaiting broadcast network state... sleep 60 echo Paying first invoice -PAYMENT_ID1=$(alice-eclair-cli sendtoroute --amountMsat=250000000 --route=$ALICE_ID,$BOB_ID,$CAROL_ID --finalCltvExpiry=16 --invoice=$INVOICE1 | jq .parentId) +PAYMENT_ID1=$(alice-eclair-cli sendtoroute --amountMsat=250000000 --nodeIds=$ALICE_ID,$BOB_ID,$CAROL_ID --finalCltvExpiry=16 --invoice=$INVOICE1 | jq .parentId) sleep 10 echo Checking payment status... alice-eclair-cli getsentinfo --id=$PAYMENT_ID1 echo Paying second invoice -PAYMENT_ID2=$(alice-eclair-cli sendtoroute --amountMsat=200000000 --route=$ALICE_ID,$BOB_ID,$CAROL_ID --finalCltvExpiry=16 --invoice=$INVOICE2 | jq .parentId) +PAYMENT_ID2=$(alice-eclair-cli sendtoroute --amountMsat=200000000 --nodeIds=$ALICE_ID,$BOB_ID,$CAROL_ID --finalCltvExpiry=16 --invoice=$INVOICE2 | jq .parentId) sleep 10 echo Checking payment status... diff --git a/scripts/send_to_route_multipart.sh b/scripts/send_to_route_multipart.sh index 0181edf..88b8535 100755 --- a/scripts/send_to_route_multipart.sh +++ b/scripts/send_to_route_multipart.sh @@ -33,8 +33,8 @@ carol-eclair-cli connect --uri=$DAVE_ID@localhost:9738 carol-eclair-cli open --nodeId=$DAVE_ID --fundingSatoshis=245000 echo Generating a few blocks to confirm channels... -MINER=$(bitcoin-cli getnewaddress) -bitcoin-cli generatetoaddress 10 $MINER +MINER=$(btc-cli getnewaddress) +btc-cli generatetoaddress 10 $MINER echo Awaiting confirmations... sleep 30 @@ -49,11 +49,11 @@ echo Awaiting broadcast network state... sleep 60 echo Paying invoice -PAYMENT=$(alice-eclair-cli sendtoroute --amountMsat=230000000 --route=$ALICE_ID,$BOB_ID,$DAVE_ID --finalCltvExpiry=16 --invoice=$INVOICE) +PAYMENT=$(alice-eclair-cli sendtoroute --amountMsat=230000000 --nodeIds=$ALICE_ID,$BOB_ID,$DAVE_ID --finalCltvExpiry=16 --invoice=$INVOICE) echo $PAYMENT PARENT_ID=$(echo $PAYMENT | jq .parentId) -alice-eclair-cli sendtoroute --amountMsat=220000000 --parentId=$PARENT_ID --route=$ALICE_ID,$BOB_ID,$DAVE_ID --finalCltvExpiry=16 --invoice=$INVOICE -alice-eclair-cli sendtoroute --amountMsat=150000000 --parentId=$PARENT_ID --route=$ALICE_ID,$CAROL_ID,$DAVE_ID --finalCltvExpiry=16 --invoice=$INVOICE +alice-eclair-cli sendtoroute --amountMsat=220000000 --parentId=$PARENT_ID --nodeIds=$ALICE_ID,$BOB_ID,$DAVE_ID --finalCltvExpiry=16 --invoice=$INVOICE +alice-eclair-cli sendtoroute --amountMsat=150000000 --parentId=$PARENT_ID --nodeIds=$ALICE_ID,$CAROL_ID,$DAVE_ID --finalCltvExpiry=16 --invoice=$INVOICE sleep 10 diff --git a/scripts/send_to_route_trampoline.sh b/scripts/send_to_route_trampoline.sh index ea7ca85..327800f 100755 --- a/scripts/send_to_route_trampoline.sh +++ b/scripts/send_to_route_trampoline.sh @@ -49,11 +49,11 @@ sleep 60 echo Paying trampoline invoice # Note that the trampoline fee must be the same and needs to be taken into account in the amountMsat values. -PAYMENT1=$(alice-eclair-cli sendtoroute --amountMsat=160050000 --route=$ALICE_ID,$BOB_ID --trampolineNodes=$BOB_ID,$DAVE_ID --trampolineFeesMsat=80000 --trampolineCltvExpiry=432 --finalCltvExpiry=16 --invoice=$INVOICE) +PAYMENT1=$(alice-eclair-cli sendtoroute --amountMsat=160050000 --nodeIds=$ALICE_ID,$BOB_ID --trampolineNodes=$BOB_ID,$DAVE_ID --trampolineFeesMsat=80000 --trampolineCltvExpiry=432 --finalCltvExpiry=16 --invoice=$INVOICE) echo $PAYMENT1 PARENT_ID=$(echo $PAYMENT1 | jq .parentId) SECRET=$(echo $PAYMENT1 | jq .trampolineSecret) -PAYMENT2=$(alice-eclair-cli sendtoroute --amountMsat=150030000 --parentId=$PARENT_ID --trampolineSecret=$SECRET --route=$ALICE_ID,$BOB_ID --trampolineNodes=$BOB_ID,$DAVE_ID --trampolineFeesMsat=80000 --trampolineCltvExpiry=432 --finalCltvExpiry=16 --invoice=$INVOICE) +PAYMENT2=$(alice-eclair-cli sendtoroute --amountMsat=150030000 --parentId=$PARENT_ID --trampolineSecret=$SECRET --nodeIds=$ALICE_ID,$BOB_ID --trampolineNodes=$BOB_ID,$DAVE_ID --trampolineFeesMsat=80000 --trampolineCltvExpiry=432 --finalCltvExpiry=16 --invoice=$INVOICE) echo $PAYMENT2 sleep 15 diff --git a/scripts/trampoline_multipart.sh b/scripts/trampoline_multipart.sh index 522ea37..f3739af 100755 --- a/scripts/trampoline_multipart.sh +++ b/scripts/trampoline_multipart.sh @@ -41,11 +41,11 @@ sleep 60 echo Paying trampoline invoice # Note that the trampoline fee must be the same and needs to be taken into account in the amountMsat values. -PAYMENT1=$(alice-eclair-cli sendtoroute --amountMsat=220010000 --route=$ALICE_ID,$BOB_ID --trampolineNodes=$BOB_ID,$CAROL_ID --trampolineFeesMsat=50000 --trampolineCltvExpiry=144 --finalCltvExpiry=16 --invoice=$INVOICE) +PAYMENT1=$(alice-eclair-cli sendtoroute --amountMsat=220010000 --nodeIds=$ALICE_ID,$BOB_ID --trampolineNodes=$BOB_ID,$CAROL_ID --trampolineFeesMsat=50000 --trampolineCltvExpiry=144 --finalCltvExpiry=16 --invoice=$INVOICE) echo $PAYMENT1 PARENT_ID=$(echo $PAYMENT1 | jq .parentId) SECRET=$(echo $PAYMENT1 | jq .trampolineSecret) -PAYMENT2=$(alice-eclair-cli sendtoroute --amountMsat=200040000 --parentId=$PARENT_ID --trampolineSecret=$SECRET --route=$ALICE_ID,$BOB_ID --trampolineNodes=$BOB_ID,$CAROL_ID --trampolineFeesMsat=50000 --trampolineCltvExpiry=144 --finalCltvExpiry=16 --invoice=$INVOICE) +PAYMENT2=$(alice-eclair-cli sendtoroute --amountMsat=200040000 --parentId=$PARENT_ID --trampolineSecret=$SECRET --nodeIds=$ALICE_ID,$BOB_ID --trampolineNodes=$BOB_ID,$CAROL_ID --trampolineFeesMsat=50000 --trampolineCltvExpiry=144 --finalCltvExpiry=16 --invoice=$INVOICE) echo $PAYMENT2 sleep 10