mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-24 22:58:23 +01:00
Code Issues Projects Releases Wiki Activity

[WIP] fix eclair-cli to use the new APIs

Browse source
This commit is contained in:
Andrea 2019-03-13 13:13:01 +01:00
parent 7908f5e58d
commit af9a9691bc
No known key found for this signature in database
GPG key ID: FFB3470FFF04CA76
2 changed files with 37 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
eclair-core/eclair-cli
View file

@ -7,7 +7,7 @@ command -v curl >/dev/null 2>&1 || { echo -e "This tool requires curl.\n\nAborti
FULL_OUTPUT='false' FULL_OUTPUT='false'
URL='http://localhost:8080' URL='http://localhost:8080'
PASSWORD='' PASSWORD='foobar'
# -------------------- METHODS # -------------------- METHODS
@ -31,13 +31,19 @@ Full documentation at: <https://github.com/ACINQ/eclair>"
# Executes a JSON RPC call to a node listening on ${URL} # Executes a JSON RPC call to a node listening on ${URL}
call() { call() {
jqexp='if .error == null then .result else .error.message end' jqexp='.' # 'if .error == null then .result else .error.message end'
# override default jq parsing expression # override default jq parsing expression
if [ $# -ge 3 ] && [ ${FULL_OUTPUT} == "false" ]; then jqexp=${3}; fi if [ $# -ge 3 ] && [ ${FULL_OUTPUT} == "false" ]; then jqexp=${3}; fi
# set password # set password
if [ -z ${PASSWORD} ]; then auth="eclair-cli"; if [ -z ${PASSWORD} ]; then auth="eclair-cli";
else auth="eclair-cli:"${PASSWORD}; fi else auth="eclair-cli:"${PASSWORD}; fi
eval curl "--user ${auth} --silent --show-error -X POST -H \"Content-Type: application/json\" -d '{ \"method\": \"'${1}'\", \"params\": '${2}' }' ${URL}" | jq -r "$jqexp" # collect form data from 2nd parameter
form_data=""
for param in ${2}; do
form_data="$form_data -F \"$param\""
done;
eval curl "--user ${auth} --silent --show-error -X POST $form_data ${URL}/${1}" | jq -r "$jqexp"
} }
# get script options # get script options
@ -80,12 +86,15 @@ case ${METHOD}_${#} in
"open_3") call ${METHOD} "'$(printf '["%s",%s,%s]' "${1}" "${2}" "${3}")'" ;; # ${2} ${3} are numeric (funding, push) "open_3") call ${METHOD} "'$(printf '["%s",%s,%s]' "${1}" "${2}" "${3}")'" ;; # ${2} ${3} are numeric (funding, push)
"open_2") call ${METHOD} "'$(printf '["%s",%s]' "${1}" "${2}")'" ;; # ${2} is numeric (funding) "open_2") call ${METHOD} "'$(printf '["%s",%s]' "${1}" "${2}")'" ;; # ${2} is numeric (funding)
"receive_2") call ${METHOD} "'$(printf '[%s,"%s"]' "${1}" "${2}")'" ;; # ${1} is numeric (amount to receive) "receive_2") call ${METHOD} " "$(printf amountMsat=%s ${1})" "$(printf description=%s ${2})" " ;; # ${1} is numeric (amount to receive)
"receive_3") call ${METHOD} "'$(printf '[%s,"%s",%s]' "${1}" "${2}" "${3}")'" ;; # ${1} is numeric (amount to receive) as is ${2} for expiry in seconds "receive_3") call ${METHOD} "'$(printf '[%s,"%s",%s]' "${1}" "${2}" "${3}")'" ;; # ${1} is numeric (amount to receive) as is ${2} for expiry in seconds
"channel_"*) call ${METHOD} "'${PARAMS}'" "if .error != null then .error.message else .result | { nodeId, shortChannelId: .data.shortChannelId, channelId, state, balanceSat: (try (.data.commitments.localCommit.spec.toLocalMsat / 1000 | floor) catch null), capacitySat: .data.commitments.commitInput.amountSatoshis, channelPoint: .data.commitments.commitInput.outPoint } end" ;; "channel_"*) call ${METHOD} "'${PARAMS}'" "map( { nodeId, shortChannelId: .data.shortChannelId, channelId, state, balanceSat: (try (.data.commitments.localCommit.spec.toLocalMsat / 1000 | floor) catch null), capacitySat: .data.commitments.commitInput.amountSatoshis, channelPoint: .data.commitments.commitInput.outPoint } )" ;;
"channels_"*) call ${METHOD} "'${PARAMS}'" "if .error != null then .error.message else .result | map( { nodeId, shortChannelId: .data.shortChannelId, channelId, state, balanceSat: (try (.data.commitments.localCommit.spec.toLocalMsat / 1000 | floor) catch null), capacitySat: .data.commitments.commitInput.amountSatoshis, channelPoint: .data.commitments.commitInput.outPoint } ) end" ;; "channels_"*) call ${METHOD} "'${PARAMS}'" "map( { nodeId, shortChannelId: .data.shortChannelId, channelId, state, balanceSat: (try (.data.commitments.localCommit.spec.toLocalMsat / 1000 | floor) catch null), capacitySat: .data.commitments.commitInput.amountSatoshis, channelPoint: .data.commitments.commitInput.outPoint } )" ;;
"send_3") call ${METHOD} "'$(printf '[%s,"%s","%s"]' "${1}" "${2}" "${3}")'" ;; # ${1} is numeric (amount of the payment) "send_3") call ${METHOD} "'$(printf '[%s,"%s","%s"]' "${1}" "${2}" "${3}")'" ;; # ${1} is numeric (amount of the payment)
"send_2") call ${METHOD} "'$(printf '["%s",%s]' "${1}" "${2}")'" ;; # ${2} is numeric (amount overriding the payment request) "send_2") call ${METHOD} "'$(printf '["%s",%s]' "${1}" "${2}")'" ;; # ${2} is numeric (amount overriding the payment request)

32
eclair-core/src/main/scala/fr/acinq/eclair/api/NewService.scala
View file

@ -16,7 +16,7 @@ import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.model.headers.CacheDirectives.{`max-age`, `no-store`, public} import akka.http.scaladsl.model.headers.CacheDirectives.{`max-age`, `no-store`, public}
import akka.http.scaladsl.model.headers.{`Access-Control-Allow-Headers`, `Access-Control-Allow-Methods`, `Cache-Control`} import akka.http.scaladsl.model.headers.{`Access-Control-Allow-Headers`, `Access-Control-Allow-Methods`, `Cache-Control`}
import akka.http.scaladsl.model.ws.{Message, TextMessage} import akka.http.scaladsl.model.ws.{Message, TextMessage}
import akka.http.scaladsl.server.directives.Credentials import akka.http.scaladsl.server.directives.{Credentials, LoggingMagnet}
import akka.stream.{ActorMaterializer, OverflowStrategy} import akka.stream.{ActorMaterializer, OverflowStrategy}
import akka.stream.scaladsl.{BroadcastHub, Flow, Keep, Source} import akka.stream.scaladsl.{BroadcastHub, Flow, Keep, Source}
import fr.acinq.eclair.channel._ import fr.acinq.eclair.channel._
@ -69,7 +69,10 @@ trait NewService extends Directives with WithJsonSerializers with Logging with M
// register an actor that feeds the queue when a payment is received // register an actor that feeds the queue when a payment is received
appKit.system.actorOf(Props(new Actor { appKit.system.actorOf(Props(new Actor {
override def preStart: Unit = context.system.eventStream.subscribe(self, classOf[PaymentReceived]) override def preStart: Unit = context.system.eventStream.subscribe(self, classOf[PaymentReceived])
def receive: Receive = { case received: PaymentReceived => flowInput.offer(received.paymentHash.toString) }
def receive: Receive = {
case received: PaymentReceived => flowInput.offer(received.paymentHash.toString)
}
})) }))
Flow[Message] Flow[Message]
@ -79,12 +82,16 @@ trait NewService extends Directives with WithJsonSerializers with Logging with M
} }
val route: Route = { val route: Route = {
respondWithDefaultHeaders(customHeaders){ respondWithDefaultHeaders(customHeaders) {
handleExceptions(apiExceptionHandler){ handleExceptions(apiExceptionHandler) {
authenticateBasicAsync(realm = "Access restricted", userPassAuthenticator){ _ => authenticateBasicAsync(realm = "Access restricted", userPassAuthenticator) { _ =>
post { post {
path("getinfo") { complete(getInfoResponse) } ~ path("getinfo") {
path("help") { complete(help.mkString) } ~ complete(getInfoResponse)
} ~
path("help") {
complete(help.mkString)
} ~
path("connect") { path("connect") {
formFields("nodeId".as[PublicKey], "address".as[NodeAddress]) { (nodeId, addr) => formFields("nodeId".as[PublicKey], "address".as[NodeAddress]) { (nodeId, addr) =>
complete(connect(s"$nodeId@$addr")) complete(connect(s"$nodeId@$addr"))
@ -126,8 +133,12 @@ trait NewService extends Directives with WithJsonSerializers with Logging with M
complete(channelInfo(channelId)) complete(channelInfo(channelId))
} }
} ~ } ~
path("allnodes") { complete(allnodes()) } ~ path("allnodes") {
path("allchannels") { complete(allchannels()) } ~ complete(allnodes())
} ~
path("allchannels") {
complete(allchannels())
} ~
path("allupdates") { path("allupdates") {
formFields("nodeId".as[PublicKey].?) { nodeId_opt => formFields("nodeId".as[PublicKey].?) { nodeId_opt =>
complete(allupdates(nodeId_opt)) complete(allupdates(nodeId_opt))
@ -178,6 +189,7 @@ trait NewService extends Directives with WithJsonSerializers with Logging with M
} }
} }
} }
} }
def connect(uri: String): Future[String] = { def connect(uri: String): Future[String] = {
@ -254,7 +266,7 @@ trait NewService extends Directives with WithJsonSerializers with Logging with M
case (Some(nodeId), Some(amount), Some(ph), None) => (nodeId, ph, amount) case (Some(nodeId), Some(amount), Some(ph), None) => (nodeId, ph, amount)
case (None, None, None, Some(invoice@PaymentRequest(_, Some(amount), _, target, _, _))) => (target, invoice.paymentHash, amount.toLong) case (None, None, None, Some(invoice@PaymentRequest(_, Some(amount), _, target, _, _))) => (target, invoice.paymentHash, amount.toLong)
case (None, Some(amount), None, Some(invoice@PaymentRequest(_, Some(_), _, target, _, _))) => (target, invoice.paymentHash, amount) // invoice amount is overridden case (None, Some(amount), None, Some(invoice@PaymentRequest(_, Some(_), _, target, _, _))) => (target, invoice.paymentHash, amount) // invoice amount is overridden
case _ => throw ApiError("send", "Wrong params list, call 'help' to know more about it") case _ => throw ApiError("send", "Wrong params list, call 'help' to know more about it")
} }
val sendPayment = SendPayment(amountMsat, paymentHash, targetNodeId, assistedRoutes = invoice_opt.map(_.routingInfo).getOrElse(Seq.empty)) // TODO add minFinalCltvExpiry val sendPayment = SendPayment(amountMsat, paymentHash, targetNodeId, assistedRoutes = invoice_opt.map(_.routingInfo).getOrElse(Seq.empty)) // TODO add minFinalCltvExpiry