vincenzopalazzo
/
cln-offers
mirror of https://github.com/vincenzopalazzo/cln-offers.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: improve the response information for the ocean-pay 

This will improve the information of the ocean pay command
by adding all the information that we need as an RPC response

Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
This commit is contained in:
Vincenzo Palazzo 2024-02-29 14:51:00 +01:00
parent e1749a4c2b
commit b1eac19ffc
Signed by: vincenzopalazzo
GPG Key ID: 8B6DC2B870B80D5F
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cln-integration/src/main.rs
View File

@ -91,7 +91,8 @@ async fn test_ocean_simple_payout() -> anyhow::Result<()> {
);
if payout.is_err() {
let _ = ocean_ln.print_logs()?;
payout.unwrap();
}
let payout = payout.unwrap();
log::info!("ocean-pay response {}", serde_json::to_string_pretty(&payout)?);
Ok(())
}

6
go.mod
View File

@ -4,12 +4,12 @@ go 1.18
require (
github.com/mitchellh/mapstructure v1.5.0
github.com/vincenzopalazzo/cln4go/client v0.0.0-20240225150542-fa830ceeae65
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20240225150542-fa830ceeae65
github.com/vincenzopalazzo/cln4go/client v0.0.0-20240229133517-f6b60e643fc6
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20240229133517-f6b60e643fc6
)
require (
github.com/vincenzopalazzo/cln4go v0.0.1-beta.8 // indirect
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20240225150542-fa830ceeae65 // indirect
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20240229123929-875e15a5a917 // indirect
github.com/vincenzopalazzo/cpstl/go v0.0.0-20221204131531-d0659db4dd2a // indirect
)

6
go.sum
View File

@ -8,6 +8,8 @@ github.com/vincenzopalazzo/cln4go/client v0.0.0-20230413130716-35626bd3b34b h1:W
github.com/vincenzopalazzo/cln4go/client v0.0.0-20230413130716-35626bd3b34b/go.mod h1:7C64iH2eVEE7WkIMQa8fmtQmFNzprDt6rIZOxG57Thg=
github.com/vincenzopalazzo/cln4go/client v0.0.0-20240225150542-fa830ceeae65 h1:fW3un3bcVFgWc1+n9U/rU49JwKol6LPnvaG/s9Drlto=
github.com/vincenzopalazzo/cln4go/client v0.0.0-20240225150542-fa830ceeae65/go.mod h1:7C64iH2eVEE7WkIMQa8fmtQmFNzprDt6rIZOxG57Thg=
github.com/vincenzopalazzo/cln4go/client v0.0.0-20240229133517-f6b60e643fc6 h1:eBhxX7nL8Jz/QNvC6ChHUorU8pLXoRj/e4xMTHGe2UA=
github.com/vincenzopalazzo/cln4go/client v0.0.0-20240229133517-f6b60e643fc6/go.mod h1:7C64iH2eVEE7WkIMQa8fmtQmFNzprDt6rIZOxG57Thg=
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20220802085837-fb816fecb890 h1:NvP9FlygyCWYaZizyxTdGBe3yRuzPzdnoxz3g28PAps=
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20220802085837-fb816fecb890/go.mod h1:zyOWcz5aSHCsLuZLaVBTjbRnxlf5Ac+Rfhu5Ciuyy2c=
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20220818123810-7039d15d24ca h1:BkPn3LskgTCmMsgW9pZ9ZZc5nObZF0lo+hIl5mz0Wak=
@ -16,6 +18,8 @@ github.com/vincenzopalazzo/cln4go/comm v0.0.0-20230413130716-35626bd3b34b h1:tg6
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20230413130716-35626bd3b34b/go.mod h1:zyOWcz5aSHCsLuZLaVBTjbRnxlf5Ac+Rfhu5Ciuyy2c=
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20240225150542-fa830ceeae65 h1:tcjluTHscWMynrF3Jlufi5ue8WdPKXCh7Nr9rPpMJuY=
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20240225150542-fa830ceeae65/go.mod h1:zyOWcz5aSHCsLuZLaVBTjbRnxlf5Ac+Rfhu5Ciuyy2c=
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20240229123929-875e15a5a917 h1:p1Ch05kywTJWdpBubj5+wYZjdU5vr2POQcoShyPXI98=
github.com/vincenzopalazzo/cln4go/comm v0.0.0-20240229123929-875e15a5a917/go.mod h1:zyOWcz5aSHCsLuZLaVBTjbRnxlf5Ac+Rfhu5Ciuyy2c=
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20220802085837-fb816fecb890 h1:L32YhQYlO2CeIp7AvjfN8ozuEba1R5/vi2bpH91B5mM=
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20220802085837-fb816fecb890/go.mod h1:vb+knVG7/MR+oTnDRRwDH7WqO6U0FbcRNWjQeu0xdds=
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20220818123810-7039d15d24ca h1:wgoFUhwXvQxbsxsrJE6+jMr1sagIHRD/f7F5irHxkaA=
@ -24,5 +28,7 @@ github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20230413130716-35626bd3b34b h1:h
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20230413130716-35626bd3b34b/go.mod h1:vb+knVG7/MR+oTnDRRwDH7WqO6U0FbcRNWjQeu0xdds=
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20240225150542-fa830ceeae65 h1:lsmN/x6H3h3Np0Wxyio0p0o76NfcLJFo+ECO/EDDSqM=
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20240225150542-fa830ceeae65/go.mod h1:vb+knVG7/MR+oTnDRRwDH7WqO6U0FbcRNWjQeu0xdds=
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20240229133517-f6b60e643fc6 h1:Ex2XRQGVr5Fsn/cNVBEep4vntZ3DQnOwhZWxb2/1qzs=
github.com/vincenzopalazzo/cln4go/plugin v0.0.0-20240229133517-f6b60e643fc6/go.mod h1:vb+knVG7/MR+oTnDRRwDH7WqO6U0FbcRNWjQeu0xdds=
github.com/vincenzopalazzo/cpstl/go v0.0.0-20221204131531-d0659db4dd2a h1:eh427yzx/JbkOuLjSS2bPop/14HMq7eYGWC1bp29mzU=
github.com/vincenzopalazzo/cpstl/go v0.0.0-20221204131531-d0659db4dd2a/go.mod h1:VNETfpfs0pZQKEg9qwSm7M1gfVrliFFzxKVVppNaxbM=

18
pkg/plugin/pay.go
View File

@ -37,12 +37,14 @@ func OceanPay(cln *plugin.Plugin[*State], request map[string]any) (map[string]an
cln.Log("debug", fmt.Sprintf("decode offer: %s", invstrDecode))
var payInvoice map[string]any
var invoice string
switch clnDecode.InvType {
case "bolt12 offer", "bolt12 invoice_request", "bolt12 invoice":
payInvoice, err = FetchOffer(cln, map[string]any{
"offer": clnRequest.Invstr,
"amount_msat": clnRequest.Amount_msat,
})
invoice = payInvoice["bolt11"].(string)
if err != nil {
return nil, err
}
@ -56,5 +58,19 @@ func OceanPay(cln *plugin.Plugin[*State], request map[string]any) (map[string]an
return nil, err
}
return payResponse, nil
invoiceDecode, err := cln.State.Rpc("decode", map[string]any{
"string": invoice,
})
if err != nil {
return nil, err
}
response := map[string]any{
"offer_invoice": clnRequest.Invstr,
"offer_decode": invstrDecode,
"invoice": invoice,
"invoice_decode": invoiceDecode,
"pay": payResponse,
}
return response, nil
}