Skip to content

Rebase static addr staging #732

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.

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

Merged
merged 32 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f3919d9
instantout: export value and expiry
sputn1ck Mar 1, 2024
b3805b7
instantout: add listinstantout func
sputn1ck Mar 1, 2024
1f96a61
looprpc: add listinstantouts
sputn1ck Mar 1, 2024
1f211e5
swapclientserver: add listinstantouts
sputn1ck Mar 1, 2024
034bc24
cmd: add listinstantouts cmd
sputn1ck Mar 1, 2024
c094ad4
sweepbatcher: refactor monitorSpendAndNotify to return an error
bhandras Feb 2, 2024
b4ebb19
loopdb+sweepbatcher: add GetParentBatch and TotalSwept calls
bhandras Feb 2, 2024
e1ddb50
loopout+sweepbatcher: calculate the per sweep onchain fees correctly
bhandras Feb 2, 2024
5294b4f
loop: clean up server cost calculation for slightly better UX
bhandras Feb 6, 2024
7fe4ee2
loopdb: make sqlite sync for extra durability
bhandras Mar 4, 2024
1cd4207
Merge pull request #712 from bhandras/db-durability
bhandras Mar 4, 2024
65b8cb6
Merge pull request #694 from bhandras/cost-cleanup
bhandras Mar 5, 2024
5d75e99
Merge pull request #708 from sputn1ck/listinstantouts
sputn1ck Mar 5, 2024
67c59fe
version: bump version to v0.28.0-beta
alexbosworth Mar 5, 2024
0d26875
Merge pull request #713 from lightninglabs/alexbosworth-patch-1
alexbosworth Mar 5, 2024
0babeee
make: cache docker builds
hieblmi Mar 7, 2024
bc09440
Merge pull request #714 from hieblmi/speed-up-docker
hieblmi Mar 8, 2024
d0847cf
mod: bump modernc.org/sqlite to 1.29.5
bhandras Mar 20, 2024
fb0c7f5
loopdb: bump sqlc to 1.25.0
bhandras Mar 20, 2024
664ab04
Merge pull request #723 from bhandras/sqlite-sqlc-bump
bhandras Mar 20, 2024
2326c15
build(deps): bump github.com/jackc/pgx/v4 from 4.18.1 to 4.18.2
dependabot[bot] Mar 20, 2024
e7d0b3a
build(deps): bump github.com/docker/docker
dependabot[bot] Mar 20, 2024
c3371fe
Merge pull request #724 from lightninglabs/dependabot/go_modules/gith…
sputn1ck Mar 20, 2024
06fd21f
loop: fill the correct HTLC in loopout update
bhandras Mar 21, 2024
6ac6ee0
Merge pull request #725 from bhandras/swap-info-fixup
bhandras Mar 21, 2024
54a6f15
Merge pull request #715 from lightninglabs/dependabot/go_modules/gith…
bhandras Apr 11, 2024
1cea76b
loopout: send prepay over outgoing chan set
hieblmi Apr 15, 2024
f8ff35c
Merge pull request #727 from hieblmi/send-prepay-to-selected-channel
hieblmi Apr 15, 2024
99e0c04
version: bump version to v0.28.1-beta
alexbosworth Apr 15, 2024
e08d9da
Merge pull request #728 from lightninglabs/alexbosworth-patch-2
alexbosworth Apr 16, 2024
b363118
build(deps): bump golang.org/x/net from 0.21.0 to 0.23.0
dependabot[bot] Apr 19, 2024
cd5dc90
Merge pull request #731 from lightninglabs/dependabot/go_modules/gola…
sputn1ck Apr 22, 2024
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: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ ifneq ($(workers),)
LINT_WORKERS = --concurrency=$(workers)
endif

DOCKER_TOOLS = docker run -v $$(pwd):/build loop-tools
DOCKER_TOOLS = docker run \
--rm \
-v $(shell bash -c "go env GOCACHE || (mkdir -p /tmp/go-cache; echo /tmp/go-cache)"):/tmp/build/.cache \
-v $(shell bash -c "go env GOMODCACHE || (mkdir -p /tmp/go-modcache; echo /tmp/go-modcache)"):/tmp/build/.modcache \
-v $$(pwd):/build loop-tools

GREEN := "\\033[0;32m"
NC := "\\033[0m"
Expand Down
28 changes: 28 additions & 0 deletions cmd/loop/instantout.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,3 +202,31 @@ func instantOut(ctx *cli.Context) error {

return nil
}

var listInstantOutsCommand = cli.Command{
Name: "listinstantouts",
Usage: "list all instant out swaps",
Description: `
List all instant out swaps.
`,
Action: listInstantOuts,
}

func listInstantOuts(ctx *cli.Context) error {
// First set up the swap client itself.
client, cleanup, err := getClient(ctx)
if err != nil {
return err
}
defer cleanup()

resp, err := client.ListInstantOuts(
context.Background(), &looprpc.ListInstantOutsRequest{},
)
if err != nil {
return err
}

printRespJSON(resp)
return nil
}
2 changes: 1 addition & 1 deletion cmd/loop/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func main() {
listSwapsCommand, swapInfoCommand, getLiquidityParamsCommand,
setLiquidityRuleCommand, suggestSwapCommand, setParamsCommand,
getInfoCommand, abandonSwapCommand, reservationsCommands,
instantOutCommand,
instantOutCommand, listInstantOutsCommand,
}

err := app.Run(os.Args)
Expand Down
48 changes: 23 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/fortytw2/leaktest v1.3.0
github.com/golang-migrate/migrate/v4 v4.16.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
github.com/jackc/pgconn v1.14.0
github.com/jackc/pgconn v1.14.3
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
github.com/jessevdk/go-flags v1.4.0
github.com/lib/pq v1.10.7
Expand All @@ -31,12 +31,12 @@ require (
github.com/ory/dockertest/v3 v3.10.0
github.com/stretchr/testify v1.8.4
github.com/urfave/cli v1.22.9
golang.org/x/net v0.17.0
golang.org/x/net v0.23.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
gopkg.in/macaroon-bakery.v2 v2.1.0
gopkg.in/macaroon.v2 v2.1.0
modernc.org/sqlite v1.20.3
modernc.org/sqlite v1.29.5
)

require (
Expand Down Expand Up @@ -67,11 +67,11 @@ require (
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
github.com/decred/dcrd/lru v1.0.0 // indirect
github.com/docker/cli v20.10.17+incompatible // indirect
github.com/docker/docker v24.0.7+incompatible // indirect
github.com/docker/docker v24.0.9+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fergusstrange/embedded-postgres v1.10.0 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-logr/logr v1.3.0 // indirect
Expand All @@ -89,21 +89,21 @@ require (
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgtype v1.14.0 // indirect
github.com/jackc/pgx/v4 v4.18.1 // indirect
github.com/jackc/pgx/v4 v4.18.2 // indirect
github.com/jackpal/gateway v1.0.5 // indirect
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/jrick/logrotate v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kkdai/bstream v1.0.0 // indirect
github.com/klauspost/compress v1.15.9 // indirect
github.com/klauspost/pgzip v1.2.5 // indirect
Expand All @@ -123,6 +123,7 @@ require (
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/nwaples/rardecode v1.1.2 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
Expand All @@ -134,7 +135,7 @@ require (
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.30.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rogpeppe/fastuuid v1.2.0 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
Expand Down Expand Up @@ -172,31 +173,28 @@ 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/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20231108232855-2478ac86f678 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.1 // indirect
golang.org/x/tools v0.17.0 // indirect
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // 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
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/uint128 v1.2.0 // indirect
modernc.org/cc/v3 v3.40.0 // indirect
modernc.org/ccgo/v3 v3.16.13 // indirect
modernc.org/libc v1.22.2 // indirect
modernc.org/mathutil v1.5.0 // indirect
modernc.org/memory v1.4.0 // indirect
modernc.org/opt v0.1.3 // indirect
modernc.org/strutil v1.1.3 // indirect
modernc.org/token v1.0.1 // indirect
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
modernc.org/libc v1.41.0 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.2 // indirect
modernc.org/strutil v1.2.0 // indirect
modernc.org/token v1.1.0 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

Expand Down
Loading
Loading