Skip to content

[wip] lnwallet+walletrpc: add SubmitPackage and related RPC call #9784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bhandras wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

[wip] lnwallet+walletrpc: add SubmitPackage and related RPC call #9784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30e71b5
lnwallet: add SubmitPackage
bhandras May 6, 2025
2d18b86
walletrpc: add SubmitPackage RPC
bhandras May 6, 2025
8cf409d
[wip]itest: add itest
bhandras May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions chainreg/no_chain_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,10 @@ func (n *NoChainSource) MapRPCErr(err error) error {
return err
}

func (n *NoChainSource) SubmitPackage([]*wire.MsgTx, *wire.MsgTx,
*float64) (*btcjson.SubmitPackageResult, error) {

return nil, errNotImplemented
}

var _ chain.Interface = (*NoChainSource)(nil)
2 changes: 1 addition & 1 deletion config_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"github.com/btcsuite/btcwallet/walletdb"
proxy "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/lightninglabs/neutrino"
"github.com/lightninglabs/neutrino/blockntfns"

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run windows itest 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Check commits 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit-cover) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="test_db_postgres") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="kvdb_etcd") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-sqlite-nativesql, backend=bitcoind dbbackend=sqlite nativesql=true) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run basic itests (btcd, backend=btcd cover=1) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run macOS itest 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="test_db_sqlite") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-rpcpolling, backend="bitcoind rpcpolling") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-etcd, backend=bitcoind dbbackend=etcd) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="kvdb_postgres") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-postgres, backend=bitcoind dbbackend=postgres) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run basic itests (neutrino, backend=neutrino cover=1) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-postgres-nativesql-experiment, backend=bitcoind dbbackend=postgres nativesql... 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run basic itests (bitcoind, backend=bitcoind cover=1) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run basic itests (bitcoind-notxindex, backend="bitcoind notxindex") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit-race) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="kvdb_sqlite") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-postgres-nativesql, backend=bitcoind dbbackend=postgres nativesql=true) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-sqlite, backend=bitcoind dbbackend=sqlite) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 28 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-sqlite=nativesql-experiment, backend=bitcoind dbbackend=sqlite nativesql=tru... 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a
"github.com/lightninglabs/neutrino/headerfs"
"github.com/lightninglabs/neutrino/pushtx"

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run windows itest 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Check commits 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit-cover) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="test_db_postgres") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="kvdb_etcd") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-sqlite-nativesql, backend=bitcoind dbbackend=sqlite nativesql=true) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run basic itests (btcd, backend=btcd cover=1) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run macOS itest 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="test_db_sqlite") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-rpcpolling, backend="bitcoind rpcpolling") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-etcd, backend=bitcoind dbbackend=etcd) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="kvdb_postgres") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-postgres, backend=bitcoind dbbackend=postgres) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run basic itests (neutrino, backend=neutrino cover=1) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-postgres-nativesql-experiment, backend=bitcoind dbbackend=postgres nativesql... 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run basic itests (bitcoind, backend=bitcoind cover=1) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run basic itests (bitcoind-notxindex, backend="bitcoind notxindex") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit-race) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run unit tests (unit tags="kvdb_sqlite") 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-postgres-nativesql, backend=bitcoind dbbackend=postgres nativesql=true) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-sqlite, backend=bitcoind dbbackend=sqlite) 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a

Check failure on line 30 in config_builder.go

View workflow job for this annotation

GitHub Actions / Run itests (bitcoind-sqlite=nativesql-experiment, backend=bitcoind dbbackend=sqlite nativesql=tru... 

github.com/bhandras/[email protected]: invalid version: unknown revision 61e8377df57a
"github.com/lightningnetwork/lnd/blockcache"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/chainreg"
Expand Down Expand Up @@ -1736,7 +1736,7 @@
"client: %v", err)
}

if err := neutrinoCS.Start(); err != nil {
if err := neutrinoCS.Start(ctx); err != nil {
db.Close()
return nil, nil, err
}
Expand Down
52 changes: 30 additions & 22 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ require (
github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344
github.com/andybalholm/brotli v1.0.4
github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6
github.com/btcsuite/btcd/btcec/v2 v2.3.4
github.com/btcsuite/btcd/btcutil v1.1.5
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
github.com/btcsuite/btcd v0.25.0-beta.rc1.0.20250925015248-b7d070601def
github.com/btcsuite/btcd/btcec/v2 v2.3.5
github.com/btcsuite/btcd/btcutil v1.1.6
github.com/btcsuite/btcd/btcutil/psbt v1.1.10
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c
github.com/btcsuite/btclog v1.0.0
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b
github.com/btcsuite/btcwallet v0.16.17
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5
Expand All @@ -18,7 +18,7 @@ require (
github.com/btcsuite/btcwallet/wtxmgr v1.5.6
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
github.com/davecgh/go-spew v1.1.1
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0
github.com/gorilla/websocket v1.5.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
Expand All @@ -27,7 +27,7 @@ require (
github.com/jackpal/gateway v1.0.5
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad
github.com/jedib0t/go-pretty/v6 v6.2.7
github.com/jessevdk/go-flags v1.4.0
github.com/jessevdk/go-flags v1.6.1
github.com/jrick/logrotate v1.1.2
github.com/kkdai/bstream v1.0.0
github.com/lightninglabs/neutrino v0.16.1
Expand All @@ -51,19 +51,21 @@ require (
github.com/urfave/cli v1.22.9
go.etcd.io/etcd/client/pkg/v3 v3.5.12
go.etcd.io/etcd/client/v3 v3.5.12
golang.org/x/crypto v0.37.0
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
golang.org/x/crypto v0.41.0
golang.org/x/exp v0.0.0-20250811191247-51f88131bc50
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028
golang.org/x/sync v0.13.0
golang.org/x/term v0.31.0
golang.org/x/sync v0.16.0
golang.org/x/term v0.34.0
golang.org/x/time v0.3.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.33.0
google.golang.org/grpc v1.73.0
google.golang.org/protobuf v1.36.6
gopkg.in/macaroon-bakery.v2 v2.0.1
gopkg.in/macaroon.v2 v2.0.0
pgregory.net/rapid v1.2.0
)

require github.com/btcsuite/btcd/v2transport v1.0.1 // indirect

require (
dario.cat/mergo v1.0.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
Expand All @@ -78,12 +80,12 @@ require (
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
github.com/btcsuite/winsvc v1.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
github.com/decred/dcrd/lru v1.1.2 // indirect
github.com/docker/cli v28.1.1+incompatible // indirect
github.com/docker/docker v28.1.1+incompatible // indirect
Expand Down Expand Up @@ -180,14 +182,14 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.17.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/text v0.24.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
golang.org/x/mod v0.27.0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/text v0.28.0 // indirect
golang.org/x/tools v0.36.0 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
gopkg.in/errgo.v1 v1.0.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -213,6 +215,12 @@ replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
// allows us to specify that as an option.
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display

// Temporary replace to add SubmitPackage support (https://github.com/btcsuite/btcwallet/pull/1009).
replace github.com/btcsuite/btcwallet => github.com/bhandras/btcwallet v0.11.1-0.20251027194657-81c374c1a794

// Temporary replace that bumps btcd dependecy withing neutrino.
replace github.com/lightninglabs/neutrino => github.com/bhandras/neutrino v0.0.0-20251027192912-61e8377df57a

// If you change this please also update docs/INSTALL.md and GO_VERSION in
// Makefile (then run `make lint` to see where else it needs to be updated as
// well).
Expand Down
Loading
Loading