Skip to content

Commit 6b38cf0

Browse files
guggeroguggero
authored
Merge pull request #875 from GeorgeTsagk/itest-custom-chan-strict-forwarding
Add itest coverage for custom channels strict forwarding
2 parents a4d76ed + 5b1be53 commit 6b38cf0

File tree

4 files changed

+86
-19
lines changed

4 files changed

+86
-19
lines changed

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require (
55
github.com/btcsuite/btcd/btcec/v2 v2.3.4
66
github.com/btcsuite/btcd/btcutil v1.1.5
77
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
8-
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
8+
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
99
github.com/btcsuite/btcwallet/walletdb v1.4.4
1010
github.com/davecgh/go-spew v1.1.1
1111
github.com/go-errors/errors v1.0.1
@@ -16,17 +16,17 @@ require (
1616
github.com/lightninglabs/lightning-node-connect v0.3.2-alpha.0.20240822142323-ee4e7ff52f83
1717
github.com/lightninglabs/lightning-terminal/autopilotserverrpc v0.0.1
1818
github.com/lightninglabs/lightning-terminal/litrpc v1.0.0
19-
github.com/lightninglabs/lndclient v0.18.4-0
19+
github.com/lightninglabs/lndclient v0.18.4-1
2020
github.com/lightninglabs/loop v0.28.8-beta.0.20241022072406-1e8ae31ddc27
2121
github.com/lightninglabs/loop/looprpc v1.0.0
2222
github.com/lightninglabs/loop/swapserverrpc v1.0.10
2323
github.com/lightninglabs/pool v0.6.5-beta.0.20241015105339-044cb451b5df
2424
github.com/lightninglabs/pool/auctioneerrpc v1.1.2
2525
github.com/lightninglabs/pool/poolrpc v1.0.0
26-
github.com/lightninglabs/taproot-assets v0.4.2-0.20241022143621-54f007d7cfc3
27-
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241021112623-6f0d7f9a87d3
26+
github.com/lightninglabs/taproot-assets v0.4.2-0.20241031160301-588e58bfae6c
27+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241025090009-615f3d633e61
2828
github.com/lightningnetwork/lnd/cert v1.2.2
29-
github.com/lightningnetwork/lnd/fn v1.2.1
29+
github.com/lightningnetwork/lnd/fn v1.2.3
3030
github.com/lightningnetwork/lnd/kvdb v1.4.10
3131
github.com/lightningnetwork/lnd/tlv v1.2.6
3232
github.com/lightningnetwork/lnd/tor v1.1.2

‎go.sum

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -667,8 +667,9 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtyd
667667
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
668668
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
669669
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
670-
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
671670
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
671+
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c h1:4HxD1lBUGUddhzgaNgrCPsFWd7cGYNpeFUgd9ZIgyM0=
672+
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhwT3lmrS4H3b/D1XAXxvh+tbhUm8xeHN2y3TQ=
672673
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
673674
github.com/btcsuite/btcwallet v0.16.10-0.20240912233857-ffb143c77cc5 h1:zYy233eUBvkF3lq2MUkybEhxhDsrRDSgiToIKN57mtk=
674675
github.com/btcsuite/btcwallet v0.16.10-0.20240912233857-ffb143c77cc5/go.mod h1:1HJXYbjJzgumlnxOC2+ViR1U+gnHWoOn7WeK5OfY1eU=
@@ -1156,8 +1157,8 @@ github.com/lightninglabs/lightning-node-connect v0.3.2-alpha.0.20240822142323-ee
11561157
github.com/lightninglabs/lightning-node-connect v0.3.2-alpha.0.20240822142323-ee4e7ff52f83/go.mod h1:+SasPOt0evcJdfApb/ALTaTz4x3a2/kWy5KqFoTpiX8=
11571158
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2XZwcfE4xoS5AILqP1mj7kqnhbBSxW9BDxY=
11581159
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
1159-
github.com/lightninglabs/lndclient v0.18.4-0 h1:TdorvV9UIw3fjZrNpVKn3fpsOdw2KWF2Eqdx7+++lcY=
1160-
github.com/lightninglabs/lndclient v0.18.4-0/go.mod h1:LbINSPfKEdZuTGqqJ+ZmUxXWNvUCaDqrZeJ7/Al0Z3Y=
1160+
github.com/lightninglabs/lndclient v0.18.4-1 h1:k2UnxHGNH243NRe5/dL2sKgrxc8WMHbFQRdnCtfilwc=
1161+
github.com/lightninglabs/lndclient v0.18.4-1/go.mod h1:/HLqmZGL9MtP8F1g+laq+L9VrsugBN5tsTct3C5wWCg=
11611162
github.com/lightninglabs/loop v0.28.8-beta.0.20241022072406-1e8ae31ddc27 h1:eZBvG9XvDL0zsUIqFfD7SCk+Ex8rGWEL8j5UQ/aqjco=
11621163
github.com/lightninglabs/loop v0.28.8-beta.0.20241022072406-1e8ae31ddc27/go.mod h1:4B1DqrcOc5Yv9KyclAeQJY9Ah9UMX7RpI4Uru7aEzl4=
11631164
github.com/lightninglabs/loop/looprpc v1.0.0 h1:xry4QPCZShPww660xJm1BVcNFj8etgNeN2vMpfsv3c4=
@@ -1176,18 +1177,18 @@ github.com/lightninglabs/pool/poolrpc v1.0.0 h1:vvosrgNx9WXF4mcHGqLjZOW8wNM0q+BL
11761177
github.com/lightninglabs/pool/poolrpc v1.0.0/go.mod h1:ZqpEpBFRMMBAerMmilEjh27tqauSXDwLaLR0O3jvmMA=
11771178
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
11781179
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
1179-
github.com/lightninglabs/taproot-assets v0.4.2-0.20241022143621-54f007d7cfc3 h1:TFSJVnDMKwQZpyjEHc3u+5T5Q++XlLM33dABKlLDxfg=
1180-
github.com/lightninglabs/taproot-assets v0.4.2-0.20241022143621-54f007d7cfc3/go.mod h1:IlJS9fgVouE3sQuWnEq4DMMVvaKTN3qM+rucyY6BR9M=
1180+
github.com/lightninglabs/taproot-assets v0.4.2-0.20241031160301-588e58bfae6c h1:HfU82bWD4Yk+Mf2Ax25uhcIwq0SxToTq8J8YJLReW/U=
1181+
github.com/lightninglabs/taproot-assets v0.4.2-0.20241031160301-588e58bfae6c/go.mod h1:AYq9p1FOMdwAGjEjVaT79+cDyAwcc4fj8W0YJvCU0JE=
11811182
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11821183
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
1183-
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241021112623-6f0d7f9a87d3 h1:J3wuk/7KNrtYZFcYeMA8enJnTTT1Nhbxodt1nPZDVpM=
1184-
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241021112623-6f0d7f9a87d3/go.mod h1:BcBxbCOsAm7Fq3HNdN5qFKngDDO4vYHKC1LybDW8rxY=
1184+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241025090009-615f3d633e61 h1:EcBM2tz+iyspYRFaDVjUe5a2bkuBWFxOWD2mzdCraUc=
1185+
github.com/lightningnetwork/lnd v0.18.3-beta.rc3.0.20241025090009-615f3d633e61/go.mod h1:q2DlXwj6ev8TMbo+CvfJ3BIrqw42HFM/fSBoyCFrjdc=
11851186
github.com/lightningnetwork/lnd/cert v1.2.2 h1:71YK6hogeJtxSxw2teq3eGeuy4rHGKcFf0d0Uy4qBjI=
11861187
github.com/lightningnetwork/lnd/cert v1.2.2/go.mod h1:jQmFn/Ez4zhDgq2hnYSw8r35bqGVxViXhX6Cd7HXM6U=
11871188
github.com/lightningnetwork/lnd/clock v1.1.1 h1:OfR3/zcJd2RhH0RU+zX/77c0ZiOnIMsDIBjgjWdZgA0=
11881189
github.com/lightningnetwork/lnd/clock v1.1.1/go.mod h1:mGnAhPyjYZQJmebS7aevElXKTFDuO+uNFFfMXK1W8xQ=
1189-
github.com/lightningnetwork/lnd/fn v1.2.1 h1:pPsVGrwi9QBwdLJzaEGK33wmiVKOxs/zc8H7+MamFf0=
1190-
github.com/lightningnetwork/lnd/fn v1.2.1/go.mod h1:SyFohpVrARPKH3XVAJZlXdVe+IwMYc4OMAvrDY32kw0=
1190+
github.com/lightningnetwork/lnd/fn v1.2.3 h1:Q1OrgNSgQynVheBNa16CsKVov1JI5N2AR6G07x9Mles=
1191+
github.com/lightningnetwork/lnd/fn v1.2.3/go.mod h1:SyFohpVrARPKH3XVAJZlXdVe+IwMYc4OMAvrDY32kw0=
11911192
github.com/lightningnetwork/lnd/healthcheck v1.2.5 h1:aTJy5xeBpcWgRtW/PGBDe+LMQEmNm/HQewlQx2jt7OA=
11921193
github.com/lightningnetwork/lnd/healthcheck v1.2.5/go.mod h1:G7Tst2tVvWo7cx6mSBEToQC5L1XOGxzZTPB29g9Rv2I=
11931194
github.com/lightningnetwork/lnd/kvdb v1.4.10 h1:vK89IVv1oVH9ubQWU+EmoCQFeVRaC8kfmOrqHbY5zoY=

‎itest/assets_test.go

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,42 @@ func payInvoiceWithSatoshi(t *testing.T, payer *HarnessNode,
812812
require.Equal(t, expectedStatus, result.Status)
813813
}
814814

815+
func payInvoiceWithSatoshiLastHop(t *testing.T, payer *HarnessNode,
816+
invoice *lnrpc.AddInvoiceResponse, hopPub []byte,
817+
expectedStatus lnrpc.Payment_PaymentStatus) {
818+
819+
ctxb := context.Background()
820+
ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
821+
defer cancel()
822+
823+
routeRes, err := payer.RouterClient.BuildRoute(
824+
ctxb, &routerrpc.BuildRouteRequest{
825+
AmtMsat: 17800,
826+
FinalCltvDelta: 80,
827+
PaymentAddr: invoice.PaymentAddr,
828+
HopPubkeys: [][]byte{hopPub},
829+
},
830+
)
831+
require.NoError(t, err)
832+
833+
res, err := payer.RouterClient.SendToRouteV2(
834+
ctxt, &routerrpc.SendToRouteRequest{
835+
PaymentHash: invoice.RHash,
836+
Route: routeRes.Route,
837+
},
838+
)
839+
840+
switch expectedStatus {
841+
case lnrpc.Payment_FAILED:
842+
require.NoError(t, err)
843+
require.Equal(t, lnrpc.HTLCAttempt_FAILED, res.Status)
844+
require.Nil(t, res.Preimage)
845+
846+
case lnrpc.Payment_SUCCEEDED:
847+
require.Equal(t, lnrpc.HTLCAttempt_SUCCEEDED, res.Status)
848+
}
849+
}
850+
815851
func payInvoiceWithAssets(t *testing.T, payer, rfqPeer *HarnessNode,
816852
invoice *lnrpc.AddInvoiceResponse, assetID []byte,
817853
smallShards bool) (uint64, rfqmath.BigIntFixedPoint) {

‎itest/litd_custom_channels_test.go

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/lightninglabs/taproot-assets/tapscript"
2424
"github.com/lightningnetwork/lnd/fn"
2525
"github.com/lightningnetwork/lnd/lnrpc"
26+
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
2627
"github.com/lightningnetwork/lnd/lntest"
2728
"github.com/lightningnetwork/lnd/lntest/port"
2829
"github.com/lightningnetwork/lnd/lntest/wait"
@@ -499,18 +500,20 @@ func testCustomChannels(_ context.Context, net *NetworkHarness,
499500

500501
// ------------
501502
// Test case 3.5: Pay an asset invoice from Dave by Charlie with normal
502-
// payment flow.
503+
// satoshi payment flow. We expect that payment to fail, since it's a
504+
// direct channel payment and the invoice is for assets, not sats. So
505+
// without a conversion, it is rejected by the receiver.
503506
// ------------
504507
invoiceResp = createAssetInvoice(
505508
t.t, charlie, dave, daveInvoiceAssetAmount, assetID,
506509
)
507510
payInvoiceWithSatoshi(
508-
t.t, charlie, invoiceResp, lnrpc.Payment_SUCCEEDED,
511+
t.t, charlie, invoiceResp, lnrpc.Payment_FAILED,
509512
)
510513
logBalance(t.t, nodes, assetID, "after asset invoice paid with sats")
511514

512515
// We don't need to update the asset balances of Charlie and Dave here
513-
// as the invoice was paid with sats.
516+
// as the invoice payment failed.
514517

515518
// ------------
516519
// Test case 4: Pay a normal invoice from Erin by Charlie.
@@ -1937,13 +1940,13 @@ func testCustomChannelsLiquidityEdgeCases(_ context.Context,
19371940
logBalance(t.t, nodes, assetID, "after big asset payment (btc "+
19381941
"invoice, direct)")
19391942

1940-
// Dave sends 200k assets and 2k sats to Yara.
1943+
// Dave sends 200k assets and 5k sats to Yara.
19411944
sendAssetKeySendPayment(
19421945
t.t, dave, yara, 2*bigAssetAmount, assetID,
19431946
fn.None[int64](), lnrpc.Payment_SUCCEEDED,
19441947
fn.None[lnrpc.PaymentFailureReason](),
19451948
)
1946-
sendKeySendPayment(t.t, dave, yara, 2000)
1949+
sendKeySendPayment(t.t, dave, yara, 5_000)
19471950

19481951
logBalance(t.t, nodes, assetID, "after 200k assets to Yara")
19491952

@@ -1969,6 +1972,33 @@ func testCustomChannelsLiquidityEdgeCases(_ context.Context,
19691972

19701973
logBalance(t.t, nodes, assetID, "after small payment (asset "+
19711974
"invoice, <354sats)")
1975+
1976+
// Edge case: Now Charlie creates an asset invoice to be paid for by
1977+
// Yara with satoshi. For the last hop we try to settle the invoice in
1978+
// satoshi, where we will check whether Charlie's strict forwarding
1979+
// works as expected.
1980+
invoiceResp = createAssetInvoice(
1981+
t.t, charlie, dave, 1, assetID,
1982+
)
1983+
1984+
ctxb := context.Background()
1985+
stream, err := dave.InvoicesClient.SubscribeSingleInvoice(
1986+
ctxb, &invoicesrpc.SubscribeSingleInvoiceRequest{
1987+
RHash: invoiceResp.RHash,
1988+
},
1989+
)
1990+
require.NoError(t.t, err)
1991+
1992+
// Yara pays Dave with enough satoshis, but Charlie will not settle as
1993+
// he expects assets.
1994+
payInvoiceWithSatoshiLastHop(
1995+
t.t, yara, invoiceResp, dave.PubKey[:], lnrpc.Payment_FAILED,
1996+
)
1997+
1998+
t.lndHarness.LNDHarness.AssertInvoiceState(stream, lnrpc.Invoice_OPEN)
1999+
2000+
logBalance(t.t, nodes, assetID, "after failed payment (asset "+
2001+
"invoice, strict forwarding)")
19722002
}
19732003

19742004
// testCustomChannelsBalanceConsistency is a test that test the balance of nodes

0 commit comments

Comments
 (0)