From 010e55051bd4797ccdda7135c499095a3b34fd9a Mon Sep 17 00:00:00 2001 From: Viktor Torstensson Date: Fri, 31 Oct 2025 18:12:58 +0100 Subject: [PATCH 01/10] build: bump github.com/go-viper/mapstructure/v2 to v2.4.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 06094c72b..85fbe26fb 100644 --- a/go.mod +++ b/go.mod @@ -106,7 +106,7 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect - github.com/go-viper/mapstructure/v2 v2.3.0 // indirect + github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/goccy/go-yaml v1.15.23 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect diff --git a/go.sum b/go.sum index d710ed254..0013f276c 100644 --- a/go.sum +++ b/go.sum @@ -851,8 +851,8 @@ github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GO github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk= -github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= +github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= From daaeed056cc93692282e29689079f8b1b134596d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Sep 2025 10:01:11 +0000 Subject: [PATCH 02/10] build(deps): bump github.com/go-viper/mapstructure/v2 in /litrpc Bumps [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/go-viper/mapstructure/releases) - [Changelog](https://github.com/go-viper/mapstructure/blob/main/CHANGELOG.md) - [Commits](https://github.com/go-viper/mapstructure/compare/v2.3.0...v2.4.0) --- updated-dependencies: - dependency-name: github.com/go-viper/mapstructure/v2 dependency-version: 2.4.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- litrpc/go.mod | 2 +- litrpc/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/litrpc/go.mod b/litrpc/go.mod index fba25481c..cd3a2f6e4 100644 --- a/litrpc/go.mod +++ b/litrpc/go.mod @@ -56,7 +56,7 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect - github.com/go-viper/mapstructure/v2 v2.3.0 // indirect + github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/golang-migrate/migrate/v4 v4.17.0 // indirect diff --git a/litrpc/go.sum b/litrpc/go.sum index 5a44cd155..18070a44b 100644 --- a/litrpc/go.sum +++ b/litrpc/go.sum @@ -826,8 +826,8 @@ github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhO github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk= -github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= +github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= From 9a5397a5169a663c36d7c4373a4a502c6d491a19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 11:38:13 +0000 Subject: [PATCH 03/10] build(deps): bump github.com/go-viper/mapstructure/v2 in /tools Bumps [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/go-viper/mapstructure/releases) - [Changelog](https://github.com/go-viper/mapstructure/blob/main/CHANGELOG.md) - [Commits](https://github.com/go-viper/mapstructure/compare/v2.3.0...v2.4.0) --- updated-dependencies: - dependency-name: github.com/go-viper/mapstructure/v2 dependency-version: 2.4.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- tools/go.mod | 2 +- tools/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/go.mod b/tools/go.mod index 4ae1aab2d..660921d1b 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -76,7 +76,7 @@ require ( github.com/go-toolsmith/astp v1.1.0 // indirect github.com/go-toolsmith/strparse v1.1.0 // indirect github.com/go-toolsmith/typep v1.1.0 // indirect - github.com/go-viper/mapstructure/v2 v2.3.0 // indirect + github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gofrs/flock v0.12.1 // indirect diff --git a/tools/go.sum b/tools/go.sum index 5b1ea569c..35aa57027 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -250,8 +250,8 @@ github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQi github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ= github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus= github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig= -github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk= -github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= +github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUWY= github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= From ebac47aacb89448ccc3f31bd88bab628bcf077d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Sep 2025 10:52:05 +0000 Subject: [PATCH 04/10] build(deps): bump github.com/go-viper/mapstructure/v2 in /perms Bumps [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.3.0 to 2.4.0. - [Release notes](https://github.com/go-viper/mapstructure/releases) - [Changelog](https://github.com/go-viper/mapstructure/blob/main/CHANGELOG.md) - [Commits](https://github.com/go-viper/mapstructure/compare/v2.3.0...v2.4.0) --- updated-dependencies: - dependency-name: github.com/go-viper/mapstructure/v2 dependency-version: 2.4.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- perms/go.mod | 2 +- perms/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perms/go.mod b/perms/go.mod index a5d50a285..07b588747 100644 --- a/perms/go.mod +++ b/perms/go.mod @@ -56,7 +56,7 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect - github.com/go-viper/mapstructure/v2 v2.3.0 // indirect + github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/gofrs/uuid v4.2.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect diff --git a/perms/go.sum b/perms/go.sum index addb15222..edb9593f7 100644 --- a/perms/go.sum +++ b/perms/go.sum @@ -176,8 +176,8 @@ github.com/go-macaroon-bakery/macaroonpb v1.0.0/go.mod h1:UzrGOcbiwTXISFP2XDLDPj github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk= -github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= +github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= From 9ff02e065ce219101713af44507c0bfd008141ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Sep 2025 19:55:20 +0000 Subject: [PATCH 05/10] build(deps): bump tar-fs from 2.1.3 to 2.1.4 in /app Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.3 to 2.1.4. - [Commits](https://github.com/mafintosh/tar-fs/compare/v2.1.3...v2.1.4) --- updated-dependencies: - dependency-name: tar-fs dependency-version: 2.1.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- app/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index f38f36cee..906c88fff 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -14175,9 +14175,9 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== tar-fs@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92" - integrity sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg== + version "2.1.4" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.4.tgz#800824dbf4ef06ded9afea4acafe71c67c76b930" + integrity sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ== dependencies: chownr "^1.1.1" mkdirp-classic "^0.5.2" From 27b816c2b5c50d2ac92d8c760736f05b26e1fd66 Mon Sep 17 00:00:00 2001 From: Viktor Torstensson Date: Thu, 30 Oct 2025 18:06:13 +0100 Subject: [PATCH 06/10] terminal: bump `loop` to `v0.31.5-beta` Bump `loop` to `v0.31.5-beta`. We also bump `looprpc` to `v1.0.11` & `swapserverrpc` to `v1.0.18` in order for `litd` to be compatible with the new loop client. As the new loop client is now ready for `lndclient` `v0.19.0-12`, we also remove the previously added replace for `lndclient`. --- app/src/types/generated/loop_pb.d.ts | 50 +++ app/src/types/generated/loop_pb.js | 423 +++++++++++++++++- .../generated/swapserverrpc/server_pb.d.ts | 48 ++ .../generated/swapserverrpc/server_pb.js | 336 +++++++++++++- app/src/util/tests/sampleData.ts | 1 + go.mod | 61 ++- go.sum | 131 +++--- proto/loop.proto | 83 +++- proto/swapserverrpc/server.proto | 22 + 9 files changed, 1049 insertions(+), 106 deletions(-) diff --git a/app/src/types/generated/loop_pb.d.ts b/app/src/types/generated/loop_pb.d.ts index 15fcf1a48..4a45b17f1 100644 --- a/app/src/types/generated/loop_pb.d.ts +++ b/app/src/types/generated/loop_pb.d.ts @@ -566,6 +566,12 @@ export class QuoteRequest extends jspb.Message { getAssetInfo(): AssetLoopOutRequest | undefined; setAssetInfo(value?: AssetLoopOutRequest): void; + getAutoSelectDeposits(): boolean; + setAutoSelectDeposits(value: boolean): void; + + getFast(): boolean; + setFast(value: boolean): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): QuoteRequest.AsObject; static toObject(includeInstance: boolean, msg: QuoteRequest): QuoteRequest.AsObject; @@ -587,6 +593,8 @@ export namespace QuoteRequest { pb_private: boolean, depositOutpointsList: Array, assetInfo?: AssetLoopOutRequest.AsObject, + autoSelectDeposits: boolean, + fast: boolean, } } @@ -603,6 +611,9 @@ export class InQuoteResponse extends jspb.Message { getConfTarget(): number; setConfTarget(value: number): void; + getQuotedAmt(): string; + setQuotedAmt(value: string): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): InQuoteResponse.AsObject; static toObject(includeInstance: boolean, msg: InQuoteResponse): InQuoteResponse.AsObject; @@ -619,6 +630,7 @@ export namespace InQuoteResponse { htlcPublishFeeSat: string, cltvDelta: number, confTarget: number, + quotedAmt: string, } } @@ -2026,6 +2038,11 @@ export class Deposit extends jspb.Message { getBlocksUntilExpiry(): string; setBlocksUntilExpiry(value: string): void; + getSwapHash(): Uint8Array | string; + getSwapHash_asU8(): Uint8Array; + getSwapHash_asB64(): string; + setSwapHash(value: Uint8Array | string): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): Deposit.AsObject; static toObject(includeInstance: boolean, msg: Deposit): Deposit.AsObject; @@ -2044,6 +2061,7 @@ export namespace Deposit { value: string, confirmationHeight: string, blocksUntilExpiry: string, + swapHash: Uint8Array | string, } } @@ -2109,6 +2127,11 @@ export class StaticAddressLoopInSwap extends jspb.Message { getPaymentRequestAmountSatoshis(): string; setPaymentRequestAmountSatoshis(value: string): void; + clearDepositsList(): void; + getDepositsList(): Array; + setDepositsList(value: Array): void; + addDeposits(value?: Deposit, index?: number): Deposit; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): StaticAddressLoopInSwap.AsObject; static toObject(includeInstance: boolean, msg: StaticAddressLoopInSwap): StaticAddressLoopInSwap.AsObject; @@ -2126,6 +2149,7 @@ export namespace StaticAddressLoopInSwap { state: StaticAddressLoopInSwapStateMap[keyof StaticAddressLoopInSwapStateMap], swapAmountSatoshis: string, paymentRequestAmountSatoshis: string, + depositsList: Array, } } @@ -2160,6 +2184,12 @@ export class StaticAddressLoopInRequest extends jspb.Message { getPaymentTimeoutSeconds(): number; setPaymentTimeoutSeconds(value: number): void; + getAmount(): string; + setAmount(value: string): void; + + getFast(): boolean; + setFast(value: boolean): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): StaticAddressLoopInRequest.AsObject; static toObject(includeInstance: boolean, msg: StaticAddressLoopInRequest): StaticAddressLoopInRequest.AsObject; @@ -2180,6 +2210,8 @@ export namespace StaticAddressLoopInRequest { routeHintsList: Array, pb_private: boolean, paymentTimeoutSeconds: number, + amount: string, + fast: boolean, } } @@ -2219,6 +2251,20 @@ export class StaticAddressLoopInResponse extends jspb.Message { getPaymentTimeoutSeconds(): number; setPaymentTimeoutSeconds(value: number): void; + clearUsedDepositsList(): void; + getUsedDepositsList(): Array; + setUsedDepositsList(value: Array): void; + addUsedDeposits(value?: Deposit, index?: number): Deposit; + + getSwapAmount(): string; + setSwapAmount(value: string): void; + + getChange(): string; + setChange(value: string): void; + + getFast(): boolean; + setFast(value: boolean): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): StaticAddressLoopInResponse.AsObject; static toObject(includeInstance: boolean, msg: StaticAddressLoopInResponse): StaticAddressLoopInResponse.AsObject; @@ -2242,6 +2288,10 @@ export namespace StaticAddressLoopInResponse { label: string, initiator: string, paymentTimeoutSeconds: number, + usedDepositsList: Array, + swapAmount: string, + change: string, + fast: boolean, } } diff --git a/app/src/types/generated/loop_pb.js b/app/src/types/generated/loop_pb.js index 2da7801bf..7c73a3901 100644 --- a/app/src/types/generated/loop_pb.js +++ b/app/src/types/generated/loop_pb.js @@ -1503,7 +1503,7 @@ if (goog.DEBUG && !COMPILED) { * @constructor */ proto.looprpc.StaticAddressLoopInResponse = function(opt_data) { - jspb.Message.initialize(this, opt_data, 0, -1, null, null); + jspb.Message.initialize(this, opt_data, 0, -1, proto.looprpc.StaticAddressLoopInResponse.repeatedFields_, null); }; goog.inherits(proto.looprpc.StaticAddressLoopInResponse, jspb.Message); if (goog.DEBUG && !COMPILED) { @@ -5461,7 +5461,9 @@ proto.looprpc.QuoteRequest.toObject = function(includeInstance, msg) { swapserverrpc_common_pb.RouteHint.toObject, includeInstance), pb_private: jspb.Message.getBooleanFieldWithDefault(msg, 7, false), depositOutpointsList: (f = jspb.Message.getRepeatedField(msg, 8)) == null ? undefined : f, - assetInfo: (f = msg.getAssetInfo()) && proto.looprpc.AssetLoopOutRequest.toObject(includeInstance, f) + assetInfo: (f = msg.getAssetInfo()) && proto.looprpc.AssetLoopOutRequest.toObject(includeInstance, f), + autoSelectDeposits: jspb.Message.getBooleanFieldWithDefault(msg, 10, false), + fast: jspb.Message.getBooleanFieldWithDefault(msg, 11, false) }; if (includeInstance) { @@ -5536,6 +5538,14 @@ proto.looprpc.QuoteRequest.deserializeBinaryFromReader = function(msg, reader) { reader.readMessage(value,proto.looprpc.AssetLoopOutRequest.deserializeBinaryFromReader); msg.setAssetInfo(value); break; + case 10: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setAutoSelectDeposits(value); + break; + case 11: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setFast(value); + break; default: reader.skipField(); break; @@ -5630,6 +5640,20 @@ proto.looprpc.QuoteRequest.serializeBinaryToWriter = function(message, writer) { proto.looprpc.AssetLoopOutRequest.serializeBinaryToWriter ); } + f = message.getAutoSelectDeposits(); + if (f) { + writer.writeBool( + 10, + f + ); + } + f = message.getFast(); + if (f) { + writer.writeBool( + 11, + f + ); + } }; @@ -5877,6 +5901,42 @@ proto.looprpc.QuoteRequest.prototype.hasAssetInfo = function() { }; +/** + * optional bool auto_select_deposits = 10; + * @return {boolean} + */ +proto.looprpc.QuoteRequest.prototype.getAutoSelectDeposits = function() { + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 10, false)); +}; + + +/** + * @param {boolean} value + * @return {!proto.looprpc.QuoteRequest} returns this + */ +proto.looprpc.QuoteRequest.prototype.setAutoSelectDeposits = function(value) { + return jspb.Message.setProto3BooleanField(this, 10, value); +}; + + +/** + * optional bool fast = 11; + * @return {boolean} + */ +proto.looprpc.QuoteRequest.prototype.getFast = function() { + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 11, false)); +}; + + +/** + * @param {boolean} value + * @return {!proto.looprpc.QuoteRequest} returns this + */ +proto.looprpc.QuoteRequest.prototype.setFast = function(value) { + return jspb.Message.setProto3BooleanField(this, 11, value); +}; + + @@ -5912,7 +5972,8 @@ proto.looprpc.InQuoteResponse.toObject = function(includeInstance, msg) { swapFeeSat: jspb.Message.getFieldWithDefault(msg, 1, "0"), htlcPublishFeeSat: jspb.Message.getFieldWithDefault(msg, 3, "0"), cltvDelta: jspb.Message.getFieldWithDefault(msg, 5, 0), - confTarget: jspb.Message.getFieldWithDefault(msg, 6, 0) + confTarget: jspb.Message.getFieldWithDefault(msg, 6, 0), + quotedAmt: jspb.Message.getFieldWithDefault(msg, 7, "0") }; if (includeInstance) { @@ -5965,6 +6026,10 @@ proto.looprpc.InQuoteResponse.deserializeBinaryFromReader = function(msg, reader var value = /** @type {number} */ (reader.readInt32()); msg.setConfTarget(value); break; + case 7: + var value = /** @type {string} */ (reader.readInt64String()); + msg.setQuotedAmt(value); + break; default: reader.skipField(); break; @@ -6022,6 +6087,13 @@ proto.looprpc.InQuoteResponse.serializeBinaryToWriter = function(message, writer f ); } + f = message.getQuotedAmt(); + if (parseInt(f, 10) !== 0) { + writer.writeInt64String( + 7, + f + ); + } }; @@ -6097,6 +6169,24 @@ proto.looprpc.InQuoteResponse.prototype.setConfTarget = function(value) { }; +/** + * optional int64 quoted_amt = 7; + * @return {string} + */ +proto.looprpc.InQuoteResponse.prototype.getQuotedAmt = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, "0")); +}; + + +/** + * @param {string} value + * @return {!proto.looprpc.InQuoteResponse} returns this + */ +proto.looprpc.InQuoteResponse.prototype.setQuotedAmt = function(value) { + return jspb.Message.setProto3StringIntField(this, 7, value); +}; + + @@ -15971,7 +16061,8 @@ proto.looprpc.Deposit.toObject = function(includeInstance, msg) { outpoint: jspb.Message.getFieldWithDefault(msg, 3, ""), value: jspb.Message.getFieldWithDefault(msg, 4, "0"), confirmationHeight: jspb.Message.getFieldWithDefault(msg, 5, "0"), - blocksUntilExpiry: jspb.Message.getFieldWithDefault(msg, 6, "0") + blocksUntilExpiry: jspb.Message.getFieldWithDefault(msg, 6, "0"), + swapHash: msg.getSwapHash_asB64() }; if (includeInstance) { @@ -16032,6 +16123,10 @@ proto.looprpc.Deposit.deserializeBinaryFromReader = function(msg, reader) { var value = /** @type {string} */ (reader.readInt64String()); msg.setBlocksUntilExpiry(value); break; + case 7: + var value = /** @type {!Uint8Array} */ (reader.readBytes()); + msg.setSwapHash(value); + break; default: reader.skipField(); break; @@ -16103,6 +16198,13 @@ proto.looprpc.Deposit.serializeBinaryToWriter = function(message, writer) { f ); } + f = message.getSwapHash_asU8(); + if (f.length > 0) { + writer.writeBytes( + 7, + f + ); + } }; @@ -16238,6 +16340,48 @@ proto.looprpc.Deposit.prototype.setBlocksUntilExpiry = function(value) { }; +/** + * optional bytes swap_hash = 7; + * @return {!(string|Uint8Array)} + */ +proto.looprpc.Deposit.prototype.getSwapHash = function() { + return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 7, "")); +}; + + +/** + * optional bytes swap_hash = 7; + * This is a type-conversion wrapper around `getSwapHash()` + * @return {string} + */ +proto.looprpc.Deposit.prototype.getSwapHash_asB64 = function() { + return /** @type {string} */ (jspb.Message.bytesAsB64( + this.getSwapHash())); +}; + + +/** + * optional bytes swap_hash = 7; + * Note that Uint8Array is not supported on all browsers. + * @see http://caniuse.com/Uint8Array + * This is a type-conversion wrapper around `getSwapHash()` + * @return {!Uint8Array} + */ +proto.looprpc.Deposit.prototype.getSwapHash_asU8 = function() { + return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8( + this.getSwapHash())); +}; + + +/** + * @param {!(string|Uint8Array)} value + * @return {!proto.looprpc.Deposit} returns this + */ +proto.looprpc.Deposit.prototype.setSwapHash = function(value) { + return jspb.Message.setProto3BytesField(this, 7, value); +}; + + /** * List of repeated fields within this message type. @@ -16554,7 +16698,7 @@ proto.looprpc.StaticAddressWithdrawal.prototype.setConfirmationHeight = function * @private {!Array} * @const */ -proto.looprpc.StaticAddressLoopInSwap.repeatedFields_ = [2]; +proto.looprpc.StaticAddressLoopInSwap.repeatedFields_ = [2,6]; @@ -16591,7 +16735,9 @@ proto.looprpc.StaticAddressLoopInSwap.toObject = function(includeInstance, msg) depositOutpointsList: (f = jspb.Message.getRepeatedField(msg, 2)) == null ? undefined : f, state: jspb.Message.getFieldWithDefault(msg, 3, 0), swapAmountSatoshis: jspb.Message.getFieldWithDefault(msg, 4, "0"), - paymentRequestAmountSatoshis: jspb.Message.getFieldWithDefault(msg, 5, "0") + paymentRequestAmountSatoshis: jspb.Message.getFieldWithDefault(msg, 5, "0"), + depositsList: jspb.Message.toObjectList(msg.getDepositsList(), + proto.looprpc.Deposit.toObject, includeInstance) }; if (includeInstance) { @@ -16648,6 +16794,11 @@ proto.looprpc.StaticAddressLoopInSwap.deserializeBinaryFromReader = function(msg var value = /** @type {string} */ (reader.readInt64String()); msg.setPaymentRequestAmountSatoshis(value); break; + case 6: + var value = new proto.looprpc.Deposit; + reader.readMessage(value,proto.looprpc.Deposit.deserializeBinaryFromReader); + msg.addDeposits(value); + break; default: reader.skipField(); break; @@ -16712,6 +16863,14 @@ proto.looprpc.StaticAddressLoopInSwap.serializeBinaryToWriter = function(message f ); } + f = message.getDepositsList(); + if (f.length > 0) { + writer.writeRepeatedMessage( + 6, + f, + proto.looprpc.Deposit.serializeBinaryToWriter + ); + } }; @@ -16848,6 +17007,44 @@ proto.looprpc.StaticAddressLoopInSwap.prototype.setPaymentRequestAmountSatoshis }; +/** + * repeated Deposit deposits = 6; + * @return {!Array} + */ +proto.looprpc.StaticAddressLoopInSwap.prototype.getDepositsList = function() { + return /** @type{!Array} */ ( + jspb.Message.getRepeatedWrapperField(this, proto.looprpc.Deposit, 6)); +}; + + +/** + * @param {!Array} value + * @return {!proto.looprpc.StaticAddressLoopInSwap} returns this +*/ +proto.looprpc.StaticAddressLoopInSwap.prototype.setDepositsList = function(value) { + return jspb.Message.setRepeatedWrapperField(this, 6, value); +}; + + +/** + * @param {!proto.looprpc.Deposit=} opt_value + * @param {number=} opt_index + * @return {!proto.looprpc.Deposit} + */ +proto.looprpc.StaticAddressLoopInSwap.prototype.addDeposits = function(opt_value, opt_index) { + return jspb.Message.addToRepeatedWrapperField(this, 6, opt_value, proto.looprpc.Deposit, opt_index); +}; + + +/** + * Clears the list making it empty but non-null. + * @return {!proto.looprpc.StaticAddressLoopInSwap} returns this + */ +proto.looprpc.StaticAddressLoopInSwap.prototype.clearDepositsList = function() { + return this.setDepositsList([]); +}; + + /** * List of repeated fields within this message type. @@ -16895,7 +17092,9 @@ proto.looprpc.StaticAddressLoopInRequest.toObject = function(includeInstance, ms routeHintsList: jspb.Message.toObjectList(msg.getRouteHintsList(), swapserverrpc_common_pb.RouteHint.toObject, includeInstance), pb_private: jspb.Message.getBooleanFieldWithDefault(msg, 7, false), - paymentTimeoutSeconds: jspb.Message.getFieldWithDefault(msg, 8, 0) + paymentTimeoutSeconds: jspb.Message.getFieldWithDefault(msg, 8, 0), + amount: jspb.Message.getFieldWithDefault(msg, 9, "0"), + fast: jspb.Message.getBooleanFieldWithDefault(msg, 10, false) }; if (includeInstance) { @@ -16965,6 +17164,14 @@ proto.looprpc.StaticAddressLoopInRequest.deserializeBinaryFromReader = function( var value = /** @type {number} */ (reader.readUint32()); msg.setPaymentTimeoutSeconds(value); break; + case 9: + var value = /** @type {string} */ (reader.readInt64String()); + msg.setAmount(value); + break; + case 10: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setFast(value); + break; default: reader.skipField(); break; @@ -17051,6 +17258,20 @@ proto.looprpc.StaticAddressLoopInRequest.serializeBinaryToWriter = function(mess f ); } + f = message.getAmount(); + if (parseInt(f, 10) !== 0) { + writer.writeInt64String( + 9, + f + ); + } + f = message.getFast(); + if (f) { + writer.writeBool( + 10, + f + ); + } }; @@ -17261,6 +17482,49 @@ proto.looprpc.StaticAddressLoopInRequest.prototype.setPaymentTimeoutSeconds = fu }; +/** + * optional int64 amount = 9; + * @return {string} + */ +proto.looprpc.StaticAddressLoopInRequest.prototype.getAmount = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, "0")); +}; + + +/** + * @param {string} value + * @return {!proto.looprpc.StaticAddressLoopInRequest} returns this + */ +proto.looprpc.StaticAddressLoopInRequest.prototype.setAmount = function(value) { + return jspb.Message.setProto3StringIntField(this, 9, value); +}; + + +/** + * optional bool fast = 10; + * @return {boolean} + */ +proto.looprpc.StaticAddressLoopInRequest.prototype.getFast = function() { + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 10, false)); +}; + + +/** + * @param {boolean} value + * @return {!proto.looprpc.StaticAddressLoopInRequest} returns this + */ +proto.looprpc.StaticAddressLoopInRequest.prototype.setFast = function(value) { + return jspb.Message.setProto3BooleanField(this, 10, value); +}; + + + +/** + * List of repeated fields within this message type. + * @private {!Array} + * @const + */ +proto.looprpc.StaticAddressLoopInResponse.repeatedFields_ = [12]; @@ -17303,7 +17567,12 @@ proto.looprpc.StaticAddressLoopInResponse.toObject = function(includeInstance, m protocolVersion: jspb.Message.getFieldWithDefault(msg, 8, ""), label: jspb.Message.getFieldWithDefault(msg, 9, ""), initiator: jspb.Message.getFieldWithDefault(msg, 10, ""), - paymentTimeoutSeconds: jspb.Message.getFieldWithDefault(msg, 11, 0) + paymentTimeoutSeconds: jspb.Message.getFieldWithDefault(msg, 11, 0), + usedDepositsList: jspb.Message.toObjectList(msg.getUsedDepositsList(), + proto.looprpc.Deposit.toObject, includeInstance), + swapAmount: jspb.Message.getFieldWithDefault(msg, 13, "0"), + change: jspb.Message.getFieldWithDefault(msg, 14, "0"), + fast: jspb.Message.getBooleanFieldWithDefault(msg, 15, false) }; if (includeInstance) { @@ -17384,6 +17653,23 @@ proto.looprpc.StaticAddressLoopInResponse.deserializeBinaryFromReader = function var value = /** @type {number} */ (reader.readUint32()); msg.setPaymentTimeoutSeconds(value); break; + case 12: + var value = new proto.looprpc.Deposit; + reader.readMessage(value,proto.looprpc.Deposit.deserializeBinaryFromReader); + msg.addUsedDeposits(value); + break; + case 13: + var value = /** @type {string} */ (reader.readUint64String()); + msg.setSwapAmount(value); + break; + case 14: + var value = /** @type {string} */ (reader.readInt64String()); + msg.setChange(value); + break; + case 15: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setFast(value); + break; default: reader.skipField(); break; @@ -17490,6 +17776,35 @@ proto.looprpc.StaticAddressLoopInResponse.serializeBinaryToWriter = function(mes f ); } + f = message.getUsedDepositsList(); + if (f.length > 0) { + writer.writeRepeatedMessage( + 12, + f, + proto.looprpc.Deposit.serializeBinaryToWriter + ); + } + f = message.getSwapAmount(); + if (parseInt(f, 10) !== 0) { + writer.writeUint64String( + 13, + f + ); + } + f = message.getChange(); + if (parseInt(f, 10) !== 0) { + writer.writeInt64String( + 14, + f + ); + } + f = message.getFast(); + if (f) { + writer.writeBool( + 15, + f + ); + } }; @@ -17715,6 +18030,98 @@ proto.looprpc.StaticAddressLoopInResponse.prototype.setPaymentTimeoutSeconds = f }; +/** + * repeated Deposit used_deposits = 12; + * @return {!Array} + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.getUsedDepositsList = function() { + return /** @type{!Array} */ ( + jspb.Message.getRepeatedWrapperField(this, proto.looprpc.Deposit, 12)); +}; + + +/** + * @param {!Array} value + * @return {!proto.looprpc.StaticAddressLoopInResponse} returns this +*/ +proto.looprpc.StaticAddressLoopInResponse.prototype.setUsedDepositsList = function(value) { + return jspb.Message.setRepeatedWrapperField(this, 12, value); +}; + + +/** + * @param {!proto.looprpc.Deposit=} opt_value + * @param {number=} opt_index + * @return {!proto.looprpc.Deposit} + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.addUsedDeposits = function(opt_value, opt_index) { + return jspb.Message.addToRepeatedWrapperField(this, 12, opt_value, proto.looprpc.Deposit, opt_index); +}; + + +/** + * Clears the list making it empty but non-null. + * @return {!proto.looprpc.StaticAddressLoopInResponse} returns this + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.clearUsedDepositsList = function() { + return this.setUsedDepositsList([]); +}; + + +/** + * optional uint64 swap_amount = 13; + * @return {string} + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.getSwapAmount = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 13, "0")); +}; + + +/** + * @param {string} value + * @return {!proto.looprpc.StaticAddressLoopInResponse} returns this + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.setSwapAmount = function(value) { + return jspb.Message.setProto3StringIntField(this, 13, value); +}; + + +/** + * optional int64 change = 14; + * @return {string} + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.getChange = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 14, "0")); +}; + + +/** + * @param {string} value + * @return {!proto.looprpc.StaticAddressLoopInResponse} returns this + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.setChange = function(value) { + return jspb.Message.setProto3StringIntField(this, 14, value); +}; + + +/** + * optional bool fast = 15; + * @return {boolean} + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.getFast = function() { + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 15, false)); +}; + + +/** + * @param {boolean} value + * @return {!proto.looprpc.StaticAddressLoopInResponse} returns this + */ +proto.looprpc.StaticAddressLoopInResponse.prototype.setFast = function(value) { + return jspb.Message.setProto3BooleanField(this, 15, value); +}; + + diff --git a/app/src/types/generated/swapserverrpc/server_pb.d.ts b/app/src/types/generated/swapserverrpc/server_pb.d.ts index 00cc4dfce..63bff3334 100644 --- a/app/src/types/generated/swapserverrpc/server_pb.d.ts +++ b/app/src/types/generated/swapserverrpc/server_pb.d.ts @@ -351,6 +351,9 @@ export class ServerLoopInQuoteRequest extends jspb.Message { getNumStaticAddressDeposits(): number; setNumStaticAddressDeposits(value: number): void; + getFast(): boolean; + setFast(value: boolean): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): ServerLoopInQuoteRequest.AsObject; static toObject(includeInstance: boolean, msg: ServerLoopInQuoteRequest): ServerLoopInQuoteRequest.AsObject; @@ -370,6 +373,7 @@ export namespace ServerLoopInQuoteRequest { protocolVersion: ProtocolVersionMap[keyof ProtocolVersionMap], userAgent: string, numStaticAddressDeposits: number, + fast: boolean, } } @@ -1052,6 +1056,9 @@ export namespace FetchL402Response { } export class SubscribeNotificationsRequest extends jspb.Message { + getVersion(): SubscribeNotificationsRequest.ListenerVersionMap[keyof SubscribeNotificationsRequest.ListenerVersionMap]; + setVersion(value: SubscribeNotificationsRequest.ListenerVersionMap[keyof SubscribeNotificationsRequest.ListenerVersionMap]): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): SubscribeNotificationsRequest.AsObject; static toObject(includeInstance: boolean, msg: SubscribeNotificationsRequest): SubscribeNotificationsRequest.AsObject; @@ -1064,7 +1071,15 @@ export class SubscribeNotificationsRequest extends jspb.Message { export namespace SubscribeNotificationsRequest { export type AsObject = { + version: SubscribeNotificationsRequest.ListenerVersionMap[keyof SubscribeNotificationsRequest.ListenerVersionMap], + } + + export interface ListenerVersionMap { + LEGACY: 0; + V1: 1; } + + export const ListenerVersion: ListenerVersionMap; } export class SubscribeNotificationsResponse extends jspb.Message { @@ -1078,6 +1093,11 @@ export class SubscribeNotificationsResponse extends jspb.Message { getStaticLoopInSweep(): ServerStaticLoopInSweepNotification | undefined; setStaticLoopInSweep(value?: ServerStaticLoopInSweepNotification): void; + hasUnfinishedSwap(): boolean; + clearUnfinishedSwap(): void; + getUnfinishedSwap(): ServerUnfinishedSwapNotification | undefined; + setUnfinishedSwap(value?: ServerUnfinishedSwapNotification): void; + getNotificationCase(): SubscribeNotificationsResponse.NotificationCase; serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): SubscribeNotificationsResponse.AsObject; @@ -1093,12 +1113,14 @@ export namespace SubscribeNotificationsResponse { export type AsObject = { reservationNotification?: swapserverrpc_reservation_pb.ServerReservationNotification.AsObject, staticLoopInSweep?: ServerStaticLoopInSweepNotification.AsObject, + unfinishedSwap?: ServerUnfinishedSwapNotification.AsObject, } export enum NotificationCase { NOTIFICATION_NOT_SET = 0, RESERVATION_NOTIFICATION = 1, STATIC_LOOP_IN_SWEEP = 2, + UNFINISHED_SWAP = 3, } } @@ -1139,6 +1161,32 @@ export namespace ServerStaticLoopInSweepNotification { } } +export class ServerUnfinishedSwapNotification extends jspb.Message { + getSwapHash(): Uint8Array | string; + getSwapHash_asU8(): Uint8Array; + getSwapHash_asB64(): string; + setSwapHash(value: Uint8Array | string): void; + + getIsLoopIn(): boolean; + setIsLoopIn(value: boolean): void; + + serializeBinary(): Uint8Array; + toObject(includeInstance?: boolean): ServerUnfinishedSwapNotification.AsObject; + static toObject(includeInstance: boolean, msg: ServerUnfinishedSwapNotification): ServerUnfinishedSwapNotification.AsObject; + static extensions: {[key: number]: jspb.ExtensionFieldInfo}; + static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo}; + static serializeBinaryToWriter(message: ServerUnfinishedSwapNotification, writer: jspb.BinaryWriter): void; + static deserializeBinary(bytes: Uint8Array): ServerUnfinishedSwapNotification; + static deserializeBinaryFromReader(message: ServerUnfinishedSwapNotification, reader: jspb.BinaryReader): ServerUnfinishedSwapNotification; +} + +export namespace ServerUnfinishedSwapNotification { + export type AsObject = { + swapHash: Uint8Array | string, + isLoopIn: boolean, + } +} + export interface ProtocolVersionMap { LEGACY: 0; MULTI_LOOP_OUT: 1; diff --git a/app/src/types/generated/swapserverrpc/server_pb.js b/app/src/types/generated/swapserverrpc/server_pb.js index 84a2e5625..f984720a3 100644 --- a/app/src/types/generated/swapserverrpc/server_pb.js +++ b/app/src/types/generated/swapserverrpc/server_pb.js @@ -66,9 +66,11 @@ goog.exportSymbol('proto.looprpc.ServerPushKeyReq', null, global); goog.exportSymbol('proto.looprpc.ServerPushKeyRes', null, global); goog.exportSymbol('proto.looprpc.ServerStaticLoopInSweepNotification', null, global); goog.exportSymbol('proto.looprpc.ServerSwapState', null, global); +goog.exportSymbol('proto.looprpc.ServerUnfinishedSwapNotification', null, global); goog.exportSymbol('proto.looprpc.SubscribeLoopInUpdatesResponse', null, global); goog.exportSymbol('proto.looprpc.SubscribeLoopOutUpdatesResponse', null, global); goog.exportSymbol('proto.looprpc.SubscribeNotificationsRequest', null, global); +goog.exportSymbol('proto.looprpc.SubscribeNotificationsRequest.ListenerVersion', null, global); goog.exportSymbol('proto.looprpc.SubscribeNotificationsResponse', null, global); goog.exportSymbol('proto.looprpc.SubscribeNotificationsResponse.NotificationCase', null, global); goog.exportSymbol('proto.looprpc.SubscribeUpdatesRequest', null, global); @@ -849,6 +851,27 @@ if (goog.DEBUG && !COMPILED) { */ proto.looprpc.ServerStaticLoopInSweepNotification.displayName = 'proto.looprpc.ServerStaticLoopInSweepNotification'; } +/** + * Generated by JsPbCodeGenerator. + * @param {Array=} opt_data Optional initial data array, typically from a + * server response, or constructed directly in Javascript. The array is used + * in place and becomes part of the constructed object. It is not cloned. + * If no data is provided, the constructed object will be empty, but still + * valid. + * @extends {jspb.Message} + * @constructor + */ +proto.looprpc.ServerUnfinishedSwapNotification = function(opt_data) { + jspb.Message.initialize(this, opt_data, 0, -1, null, null); +}; +goog.inherits(proto.looprpc.ServerUnfinishedSwapNotification, jspb.Message); +if (goog.DEBUG && !COMPILED) { + /** + * @public + * @override + */ + proto.looprpc.ServerUnfinishedSwapNotification.displayName = 'proto.looprpc.ServerUnfinishedSwapNotification'; +} @@ -3201,7 +3224,8 @@ proto.looprpc.ServerLoopInQuoteRequest.toObject = function(includeInstance, msg) swapserverrpc_common_pb.RouteHint.toObject, includeInstance), protocolVersion: jspb.Message.getFieldWithDefault(msg, 2, 0), userAgent: jspb.Message.getFieldWithDefault(msg, 6, ""), - numStaticAddressDeposits: jspb.Message.getFieldWithDefault(msg, 7, 0) + numStaticAddressDeposits: jspb.Message.getFieldWithDefault(msg, 7, 0), + fast: jspb.Message.getBooleanFieldWithDefault(msg, 8, false) }; if (includeInstance) { @@ -3267,6 +3291,10 @@ proto.looprpc.ServerLoopInQuoteRequest.deserializeBinaryFromReader = function(ms var value = /** @type {number} */ (reader.readUint32()); msg.setNumStaticAddressDeposits(value); break; + case 8: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setFast(value); + break; default: reader.skipField(); break; @@ -3346,6 +3374,13 @@ proto.looprpc.ServerLoopInQuoteRequest.serializeBinaryToWriter = function(messag f ); } + f = message.getFast(); + if (f) { + writer.writeBool( + 8, + f + ); + } }; @@ -3543,6 +3578,24 @@ proto.looprpc.ServerLoopInQuoteRequest.prototype.setNumStaticAddressDeposits = f }; +/** + * optional bool fast = 8; + * @return {boolean} + */ +proto.looprpc.ServerLoopInQuoteRequest.prototype.getFast = function() { + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 8, false)); +}; + + +/** + * @param {boolean} value + * @return {!proto.looprpc.ServerLoopInQuoteRequest} returns this + */ +proto.looprpc.ServerLoopInQuoteRequest.prototype.setFast = function(value) { + return jspb.Message.setProto3BooleanField(this, 8, value); +}; + + @@ -8378,7 +8431,7 @@ proto.looprpc.SubscribeNotificationsRequest.prototype.toObject = function(opt_in */ proto.looprpc.SubscribeNotificationsRequest.toObject = function(includeInstance, msg) { var f, obj = { - + version: jspb.Message.getFieldWithDefault(msg, 1, 0) }; if (includeInstance) { @@ -8415,6 +8468,10 @@ proto.looprpc.SubscribeNotificationsRequest.deserializeBinaryFromReader = functi } var field = reader.getFieldNumber(); switch (field) { + case 1: + var value = /** @type {!proto.looprpc.SubscribeNotificationsRequest.ListenerVersion} */ (reader.readEnum()); + msg.setVersion(value); + break; default: reader.skipField(); break; @@ -8444,6 +8501,39 @@ proto.looprpc.SubscribeNotificationsRequest.prototype.serializeBinary = function */ proto.looprpc.SubscribeNotificationsRequest.serializeBinaryToWriter = function(message, writer) { var f = undefined; + f = message.getVersion(); + if (f !== 0.0) { + writer.writeEnum( + 1, + f + ); + } +}; + + +/** + * @enum {number} + */ +proto.looprpc.SubscribeNotificationsRequest.ListenerVersion = { + LEGACY: 0, + V1: 1 +}; + +/** + * optional ListenerVersion version = 1; + * @return {!proto.looprpc.SubscribeNotificationsRequest.ListenerVersion} + */ +proto.looprpc.SubscribeNotificationsRequest.prototype.getVersion = function() { + return /** @type {!proto.looprpc.SubscribeNotificationsRequest.ListenerVersion} */ (jspb.Message.getFieldWithDefault(this, 1, 0)); +}; + + +/** + * @param {!proto.looprpc.SubscribeNotificationsRequest.ListenerVersion} value + * @return {!proto.looprpc.SubscribeNotificationsRequest} returns this + */ +proto.looprpc.SubscribeNotificationsRequest.prototype.setVersion = function(value) { + return jspb.Message.setProto3EnumField(this, 1, value); }; @@ -8456,7 +8546,7 @@ proto.looprpc.SubscribeNotificationsRequest.serializeBinaryToWriter = function(m * @private {!Array>} * @const */ -proto.looprpc.SubscribeNotificationsResponse.oneofGroups_ = [[1,2]]; +proto.looprpc.SubscribeNotificationsResponse.oneofGroups_ = [[1,2,3]]; /** * @enum {number} @@ -8464,7 +8554,8 @@ proto.looprpc.SubscribeNotificationsResponse.oneofGroups_ = [[1,2]]; proto.looprpc.SubscribeNotificationsResponse.NotificationCase = { NOTIFICATION_NOT_SET: 0, RESERVATION_NOTIFICATION: 1, - STATIC_LOOP_IN_SWEEP: 2 + STATIC_LOOP_IN_SWEEP: 2, + UNFINISHED_SWAP: 3 }; /** @@ -8506,7 +8597,8 @@ proto.looprpc.SubscribeNotificationsResponse.prototype.toObject = function(opt_i proto.looprpc.SubscribeNotificationsResponse.toObject = function(includeInstance, msg) { var f, obj = { reservationNotification: (f = msg.getReservationNotification()) && swapserverrpc_reservation_pb.ServerReservationNotification.toObject(includeInstance, f), - staticLoopInSweep: (f = msg.getStaticLoopInSweep()) && proto.looprpc.ServerStaticLoopInSweepNotification.toObject(includeInstance, f) + staticLoopInSweep: (f = msg.getStaticLoopInSweep()) && proto.looprpc.ServerStaticLoopInSweepNotification.toObject(includeInstance, f), + unfinishedSwap: (f = msg.getUnfinishedSwap()) && proto.looprpc.ServerUnfinishedSwapNotification.toObject(includeInstance, f) }; if (includeInstance) { @@ -8553,6 +8645,11 @@ proto.looprpc.SubscribeNotificationsResponse.deserializeBinaryFromReader = funct reader.readMessage(value,proto.looprpc.ServerStaticLoopInSweepNotification.deserializeBinaryFromReader); msg.setStaticLoopInSweep(value); break; + case 3: + var value = new proto.looprpc.ServerUnfinishedSwapNotification; + reader.readMessage(value,proto.looprpc.ServerUnfinishedSwapNotification.deserializeBinaryFromReader); + msg.setUnfinishedSwap(value); + break; default: reader.skipField(); break; @@ -8598,6 +8695,14 @@ proto.looprpc.SubscribeNotificationsResponse.serializeBinaryToWriter = function( proto.looprpc.ServerStaticLoopInSweepNotification.serializeBinaryToWriter ); } + f = message.getUnfinishedSwap(); + if (f != null) { + writer.writeMessage( + 3, + f, + proto.looprpc.ServerUnfinishedSwapNotification.serializeBinaryToWriter + ); + } }; @@ -8675,6 +8780,43 @@ proto.looprpc.SubscribeNotificationsResponse.prototype.hasStaticLoopInSweep = fu }; +/** + * optional ServerUnfinishedSwapNotification unfinished_swap = 3; + * @return {?proto.looprpc.ServerUnfinishedSwapNotification} + */ +proto.looprpc.SubscribeNotificationsResponse.prototype.getUnfinishedSwap = function() { + return /** @type{?proto.looprpc.ServerUnfinishedSwapNotification} */ ( + jspb.Message.getWrapperField(this, proto.looprpc.ServerUnfinishedSwapNotification, 3)); +}; + + +/** + * @param {?proto.looprpc.ServerUnfinishedSwapNotification|undefined} value + * @return {!proto.looprpc.SubscribeNotificationsResponse} returns this +*/ +proto.looprpc.SubscribeNotificationsResponse.prototype.setUnfinishedSwap = function(value) { + return jspb.Message.setOneofWrapperField(this, 3, proto.looprpc.SubscribeNotificationsResponse.oneofGroups_[0], value); +}; + + +/** + * Clears the message field making it undefined. + * @return {!proto.looprpc.SubscribeNotificationsResponse} returns this + */ +proto.looprpc.SubscribeNotificationsResponse.prototype.clearUnfinishedSwap = function() { + return this.setUnfinishedSwap(undefined); +}; + + +/** + * Returns whether this field is set. + * @return {boolean} + */ +proto.looprpc.SubscribeNotificationsResponse.prototype.hasUnfinishedSwap = function() { + return jspb.Message.getField(this, 3) != null; +}; + + /** * List of repeated fields within this message type. @@ -8977,6 +9119,190 @@ proto.looprpc.ServerStaticLoopInSweepNotification.prototype.clearPrevoutInfoList }; + + + +if (jspb.Message.GENERATE_TO_OBJECT) { +/** + * Creates an object representation of this proto. + * Field names that are reserved in JavaScript and will be renamed to pb_name. + * Optional fields that are not set will be set to undefined. + * To access a reserved field use, foo.pb_, eg, foo.pb_default. + * For the list of reserved names please see: + * net/proto2/compiler/js/internal/generator.cc#kKeyword. + * @param {boolean=} opt_includeInstance Deprecated. whether to include the + * JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration + * @return {!Object} + */ +proto.looprpc.ServerUnfinishedSwapNotification.prototype.toObject = function(opt_includeInstance) { + return proto.looprpc.ServerUnfinishedSwapNotification.toObject(opt_includeInstance, this); +}; + + +/** + * Static version of the {@see toObject} method. + * @param {boolean|undefined} includeInstance Deprecated. Whether to include + * the JSPB instance for transitional soy proto support: + * http://goto/soy-param-migration + * @param {!proto.looprpc.ServerUnfinishedSwapNotification} msg The msg instance to transform. + * @return {!Object} + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.looprpc.ServerUnfinishedSwapNotification.toObject = function(includeInstance, msg) { + var f, obj = { + swapHash: msg.getSwapHash_asB64(), + isLoopIn: jspb.Message.getBooleanFieldWithDefault(msg, 2, false) + }; + + if (includeInstance) { + obj.$jspbMessageInstance = msg; + } + return obj; +}; +} + + +/** + * Deserializes binary data (in protobuf wire format). + * @param {jspb.ByteSource} bytes The bytes to deserialize. + * @return {!proto.looprpc.ServerUnfinishedSwapNotification} + */ +proto.looprpc.ServerUnfinishedSwapNotification.deserializeBinary = function(bytes) { + var reader = new jspb.BinaryReader(bytes); + var msg = new proto.looprpc.ServerUnfinishedSwapNotification; + return proto.looprpc.ServerUnfinishedSwapNotification.deserializeBinaryFromReader(msg, reader); +}; + + +/** + * Deserializes binary data (in protobuf wire format) from the + * given reader into the given message object. + * @param {!proto.looprpc.ServerUnfinishedSwapNotification} msg The message object to deserialize into. + * @param {!jspb.BinaryReader} reader The BinaryReader to use. + * @return {!proto.looprpc.ServerUnfinishedSwapNotification} + */ +proto.looprpc.ServerUnfinishedSwapNotification.deserializeBinaryFromReader = function(msg, reader) { + while (reader.nextField()) { + if (reader.isEndGroup()) { + break; + } + var field = reader.getFieldNumber(); + switch (field) { + case 1: + var value = /** @type {!Uint8Array} */ (reader.readBytes()); + msg.setSwapHash(value); + break; + case 2: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setIsLoopIn(value); + break; + default: + reader.skipField(); + break; + } + } + return msg; +}; + + +/** + * Serializes the message to binary data (in protobuf wire format). + * @return {!Uint8Array} + */ +proto.looprpc.ServerUnfinishedSwapNotification.prototype.serializeBinary = function() { + var writer = new jspb.BinaryWriter(); + proto.looprpc.ServerUnfinishedSwapNotification.serializeBinaryToWriter(this, writer); + return writer.getResultBuffer(); +}; + + +/** + * Serializes the given message to binary data (in protobuf wire + * format), writing to the given BinaryWriter. + * @param {!proto.looprpc.ServerUnfinishedSwapNotification} message + * @param {!jspb.BinaryWriter} writer + * @suppress {unusedLocalVariables} f is only used for nested messages + */ +proto.looprpc.ServerUnfinishedSwapNotification.serializeBinaryToWriter = function(message, writer) { + var f = undefined; + f = message.getSwapHash_asU8(); + if (f.length > 0) { + writer.writeBytes( + 1, + f + ); + } + f = message.getIsLoopIn(); + if (f) { + writer.writeBool( + 2, + f + ); + } +}; + + +/** + * optional bytes swap_hash = 1; + * @return {!(string|Uint8Array)} + */ +proto.looprpc.ServerUnfinishedSwapNotification.prototype.getSwapHash = function() { + return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 1, "")); +}; + + +/** + * optional bytes swap_hash = 1; + * This is a type-conversion wrapper around `getSwapHash()` + * @return {string} + */ +proto.looprpc.ServerUnfinishedSwapNotification.prototype.getSwapHash_asB64 = function() { + return /** @type {string} */ (jspb.Message.bytesAsB64( + this.getSwapHash())); +}; + + +/** + * optional bytes swap_hash = 1; + * Note that Uint8Array is not supported on all browsers. + * @see http://caniuse.com/Uint8Array + * This is a type-conversion wrapper around `getSwapHash()` + * @return {!Uint8Array} + */ +proto.looprpc.ServerUnfinishedSwapNotification.prototype.getSwapHash_asU8 = function() { + return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8( + this.getSwapHash())); +}; + + +/** + * @param {!(string|Uint8Array)} value + * @return {!proto.looprpc.ServerUnfinishedSwapNotification} returns this + */ +proto.looprpc.ServerUnfinishedSwapNotification.prototype.setSwapHash = function(value) { + return jspb.Message.setProto3BytesField(this, 1, value); +}; + + +/** + * optional bool is_loop_in = 2; + * @return {boolean} + */ +proto.looprpc.ServerUnfinishedSwapNotification.prototype.getIsLoopIn = function() { + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 2, false)); +}; + + +/** + * @param {boolean} value + * @return {!proto.looprpc.ServerUnfinishedSwapNotification} returns this + */ +proto.looprpc.ServerUnfinishedSwapNotification.prototype.setIsLoopIn = function(value) { + return jspb.Message.setProto3BooleanField(this, 2, value); +}; + + /** * @enum {number} */ diff --git a/app/src/util/tests/sampleData.ts b/app/src/util/tests/sampleData.ts index 27e3f1acb..11dde4953 100644 --- a/app/src/util/tests/sampleData.ts +++ b/app/src/util/tests/sampleData.ts @@ -395,6 +395,7 @@ export const loopInQuote: LOOP.InQuoteResponse.AsObject = { htlcPublishFeeSat: '7387', swapFeeSat: '83', confTarget: 6, + quotedAmt: '1000000', }; export const loopSwapResponse: LOOP.SwapResponse.AsObject = { diff --git a/go.mod b/go.mod index 85fbe26fb..8e6c3c85d 100644 --- a/go.mod +++ b/go.mod @@ -26,9 +26,9 @@ require ( github.com/lightninglabs/lightning-terminal/litrpc v1.0.2 github.com/lightninglabs/lightning-terminal/perms v1.0.1 github.com/lightninglabs/lndclient v0.19.0-12 - github.com/lightninglabs/loop v0.31.2-beta - github.com/lightninglabs/loop/looprpc v1.0.8 - github.com/lightninglabs/loop/swapserverrpc v1.0.15 + github.com/lightninglabs/loop v0.31.5-beta + github.com/lightninglabs/loop/looprpc v1.0.11 + github.com/lightninglabs/loop/swapserverrpc v1.0.18 github.com/lightninglabs/pool v0.6.6-beta github.com/lightninglabs/pool/auctioneerrpc v1.1.3 github.com/lightninglabs/pool/poolrpc v1.0.1 @@ -49,13 +49,13 @@ require ( github.com/pmezard/go-difflib v1.0.0 github.com/stretchr/testify v1.10.0 github.com/urfave/cli v1.22.14 - go.etcd.io/bbolt v1.3.11 - golang.org/x/crypto v0.36.0 - golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 - golang.org/x/net v0.38.0 - golang.org/x/sync v0.12.0 + go.etcd.io/bbolt v1.4.3 + golang.org/x/crypto v0.37.0 + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 + golang.org/x/net v0.39.0 + golang.org/x/sync v0.13.0 google.golang.org/grpc v1.65.0 - google.golang.org/protobuf v1.34.2 + google.golang.org/protobuf v1.36.5 gopkg.in/macaroon-bakery.v2 v2.3.0 gopkg.in/macaroon.v2 v2.1.0 modernc.org/sqlite v1.34.5 @@ -76,7 +76,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/btcsuite/btcd/btcutil/psbt v1.1.10 // indirect github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect - github.com/btcsuite/btcwallet v0.16.15-0.20250805011126-a3632ae48ab3 // indirect + github.com/btcsuite/btcwallet v0.16.17 // indirect github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 // indirect github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 // indirect github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 // indirect @@ -96,14 +96,14 @@ require ( github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/decred/dcrd/lru v1.1.2 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/docker/cli v28.0.1+incompatible // indirect - github.com/docker/docker v28.0.1+incompatible // indirect + github.com/docker/cli v28.1.1+incompatible // indirect + github.com/docker/docker v28.1.1+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/fergusstrange/embedded-postgres v1.25.0 // indirect github.com/fortytw2/leaktest v1.3.0 // indirect - github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect @@ -127,12 +127,12 @@ require ( github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // 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.2 // indirect - github.com/jackc/pgx/v5 v5.6.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgtype v1.14.4 // indirect + github.com/jackc/pgx/v4 v4.18.3 // indirect + github.com/jackc/pgx/v5 v5.7.4 // indirect github.com/jackc/puddle v1.3.0 // indirect - github.com/jackc/puddle/v2 v2.2.1 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jackpal/gateway v1.0.5 // indirect github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect github.com/jedib0t/go-pretty/v6 v6.2.7 // indirect @@ -180,11 +180,12 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/soheilhy/cmux v0.1.5 // indirect - github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/pflag v1.0.6 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect + github.com/urfave/cli/v3 v3.4.1 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect @@ -200,23 +201,23 @@ require ( go.etcd.io/etcd/server/v3 v3.5.12 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect - go.opentelemetry.io/otel v1.36.0 // indirect + go.opentelemetry.io/otel v1.37.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect - go.opentelemetry.io/otel/metric v1.36.0 // indirect - go.opentelemetry.io/otel/sdk v1.36.0 // indirect - go.opentelemetry.io/otel/trace v1.36.0 // indirect + go.opentelemetry.io/otel/metric v1.37.0 // indirect + go.opentelemetry.io/otel/sdk v1.37.0 // indirect + go.opentelemetry.io/otel/trace v1.37.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.23.0 // indirect - golang.org/x/mod v0.21.0 // indirect + go.uber.org/zap v1.24.0 // indirect + golang.org/x/mod v0.24.0 // indirect golang.org/x/sys v0.33.0 // indirect - golang.org/x/term v0.30.0 // indirect - golang.org/x/text v0.23.0 // indirect + golang.org/x/term v0.31.0 // indirect + golang.org/x/text v0.24.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/tools v0.31.0 // indirect google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect @@ -247,7 +248,3 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d // it is a replace in the tapd repository, it doesn't get propagated here // automatically, so we need to add it manually. replace github.com/golang-migrate/migrate/v4 => github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2 - -// tapd wants v0.19.0-12, but loop can't handle that yet. So we'll just use the -// previous version for now. -replace github.com/lightninglabs/lndclient => github.com/lightninglabs/lndclient v0.19.0-11 diff --git a/go.sum b/go.sum index 0013f276c..5daece08c 100644 --- a/go.sum +++ b/go.sum @@ -600,13 +600,14 @@ git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3p github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= +github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= -github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e h1:n+DcnTNkQnHlwpsrHoQtkrJIO7CBx029fw6oR4vIob4= @@ -670,8 +671,8 @@ github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c/go.mod h1:w7xnGOhw github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b h1:MQ+Q6sDy37V1wP1Yu79A5KqJutolqUGwA99UZWQDWZM= github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b/go.mod h1:XItGUfVOxotJL8kkuk2Hj3EVow5KCugXl3wWfQ6K0AE= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= -github.com/btcsuite/btcwallet v0.16.15-0.20250805011126-a3632ae48ab3 h1:MAjNRpj3XhCOrhchq4wq0qI34TIBX/DCnT6OLWejx68= -github.com/btcsuite/btcwallet v0.16.15-0.20250805011126-a3632ae48ab3/go.mod h1:H6dfoZcWPonM2wbVsR2ZBY0PKNZKdQyLAmnX8vL9JFA= +github.com/btcsuite/btcwallet v0.16.17 h1:1N6lHznRdcjDopBvcofxaIHknArkJ/EcVKgLKfGL4Dg= +github.com/btcsuite/btcwallet v0.16.17/go.mod h1:YO+W745BAH8n/Rpgj68QsLR6eLlgM4W2do4RejT0buo= github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 h1:Rr0njWI3r341nhSPesKQ2JF+ugDSzdPoeckS75SeDZk= github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5/go.mod h1:+tXJ3Ym0nlQc/iHSwW1qzjmPs3ev+UVWMbGgfV1OZqU= github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 h1:YEO+Lx1ZJJAtdRrjuhXjWrYsmAk26wLTlNzxt2q0lhk= @@ -762,10 +763,10 @@ github.com/dhui/dktest v0.4.5 h1:uUfYBIVREmj/Rw6MvgmqNAYzTiKOHJak+enB5Di73MM= github.com/dhui/dktest v0.4.5/go.mod h1:tmcyeHDKagvlDrz7gDKq4UAJOLIfVZYkfD5OnHDwcCo= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v28.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs= -github.com/docker/cli v28.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0= -github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k= +github.com/docker/cli v28.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= +github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -833,8 +834,8 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-macaroon-bakery/macaroonpb v1.0.0 h1:It9exBaRMZ9iix1iJ6gwzfwsDE6ExNuwtAJ9e09v6XE= @@ -1039,29 +1040,32 @@ github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwX github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.14.4 h1:fKuNiCumbKTAIxQwXfB/nsrnkEI6bPJrrSiMKgbJ2j8= +github.com/jackc/pgtype v1.14.4/go.mod h1:aKeozOde08iifGosdJpz9MBZonJOUJxqNpPBcMJTlVA= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= -github.com/jackc/pgx/v4 v4.18.2 h1:xVpYkNR5pk5bMCZGfClbO962UIqVABcAGt7ha1s/FeU= github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= -github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY= -github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= +github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= +github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= +github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg= +github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0= github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= -github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jackpal/gateway v1.0.5 h1:qzXWUJfuMdlLMtt0a3Dgt+xkWQiA5itDEITVJtuSwMc= github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA= github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad h1:heFfj7z0pGsNCekUlsFhO2jstxO4b5iQ665LjwM5mDc= @@ -1150,14 +1154,14 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3 h1:NuDp6Z+QNM github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.3/go.mod h1:bDnEKRN1u13NFBuy/C+bFLhxA5bfd3clT25y76QY0AM= github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1 h1:RWmohykp3n/DTMWY8b18RNTEcLDf+KT/AZHKYdOObkM= github.com/lightninglabs/lightning-node-connect/mailbox v1.0.1/go.mod h1:NYtNexZE9gO1eOeegTxmIW9fqanl7eZ9cOrE9yewSAk= -github.com/lightninglabs/lndclient v0.19.0-11 h1:/WwowlNff19lb7DXzq3c6L4nRMvwBZjbjLOy1/u4a5Y= -github.com/lightninglabs/lndclient v0.19.0-11/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw= -github.com/lightninglabs/loop v0.31.2-beta h1:lm5t5FqDpSfQCxoz/vTvXpylxSgU+gvJJIbfJiKeyUk= -github.com/lightninglabs/loop v0.31.2-beta/go.mod h1:xnPKuZmLusNERwzz15RZ7mpQ8xuSqqh3g8Qw/PRyiRE= -github.com/lightninglabs/loop/looprpc v1.0.8 h1:OFmJNLjem6fLuH1YUO+3G6QA1wmjAd0zyhvdHONOBDs= -github.com/lightninglabs/loop/looprpc v1.0.8/go.mod h1:c7WykKQZ3PspCMVvv2kr9o4l3bgJBEBVv0SOoBOjPOw= -github.com/lightninglabs/loop/swapserverrpc v1.0.15 h1:vEZBF65Lv0T7MPydCRxHSIlEJzHBkZ4I8FtSD6OJK88= -github.com/lightninglabs/loop/swapserverrpc v1.0.15/go.mod h1:YDoUxA1eV/mbv+gXr4Ova7AFNSiIO+7xXdP7teQmMJY= +github.com/lightninglabs/lndclient v0.19.0-12 h1:aSIKfnvnHKiyFWppUGHJG5fn8VoF5WG5Lx958ksLmqs= +github.com/lightninglabs/lndclient v0.19.0-12/go.mod h1:cicoJY1AwZuRVXGD8Knp50TRT7TGBmw1k37uPQsGQiw= +github.com/lightninglabs/loop v0.31.5-beta h1:2McS3d3eWQ+5OIZ+sTsGnAou8orcK3HdXAaZ4sV/wHA= +github.com/lightninglabs/loop v0.31.5-beta/go.mod h1:CvBtozrs47tJGP7JQFkQ84fPmfL9PeB2xAP3x3ovIxA= +github.com/lightninglabs/loop/looprpc v1.0.11 h1:YCz67k5GSm3EKMCRBfis034Pd3R0+vPPHgfNwQqjpaE= +github.com/lightninglabs/loop/looprpc v1.0.11/go.mod h1:m2B9bg8Cus1TVbXD3RffKVmGS3lpV2Zl1yu5x3wcQYk= +github.com/lightninglabs/loop/swapserverrpc v1.0.18 h1:gMZi7uU5yeNqqKyPYZHpjgiPr8mmU6DDRPYCIGdtL/A= +github.com/lightninglabs/loop/swapserverrpc v1.0.18/go.mod h1:yZqah0rhO54JN9/dk41DdRvjQCxX0RjGVVwtXOXgypE= github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2 h1:eFjp1dIB2BhhQp/THKrjLdlYuPugO9UU4kDqu91OX/Q= github.com/lightninglabs/migrate/v4 v4.18.2-9023d66a-fork-pr-2/go.mod h1:99BKpIi6ruaaXRM1A77eqZ+FWPQ3cfRa+ZVy5bmWMaY= github.com/lightninglabs/neutrino v0.16.1 h1:5Kz4ToxncEVkpKC6fwUjXKtFKJhuxlG3sBB3MdJTJjs= @@ -1326,8 +1330,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= +github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -1354,8 +1358,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -1388,6 +1392,8 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk= github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA= +github.com/urfave/cli/v3 v3.4.1 h1:1M9UOCy5bLmGnuu1yn3t3CB4rG79Rtoxuv1sPhnm6qM= +github.com/urfave/cli/v3 v3.4.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= @@ -1410,8 +1416,8 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec h1:FpfFs4EhNehiVfzQttTuxanPIT43FtkkCFypIod8LHo= gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec/go.mod h1:BZ1RAoRPbCxum9Grlv5aeksu2H8BiKehBYooU2LFiOQ= -go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= -go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= +go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo= +go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E= go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c= go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A= @@ -1440,18 +1446,18 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= -go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= -go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= +go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ= +go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0 h1:dIIDULZJpgdiHz5tXrTgKIMLkus6jEFa7x5SOKcyR7E= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0/go.mod h1:jlRVBe7+Z1wyxFSUs48L6OBQZ5JwH2Hg/Vbl+t9rAgI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 h1:gvmNvqrPYovvyRmCSygkUDyL8lC5Tl845MLEwqpxhEU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0/go.mod h1:vNUq47TGFioo+ffTSnKNdob241vePmtNZnAODKapKd0= -go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= -go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= -go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs= -go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY= -go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= -go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE= +go.opentelemetry.io/otel/metric v1.37.0/go.mod h1:04wGrZurHYKOc+RKeye86GwKiTb9FKm1WHtO+4EVr2E= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= +go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4= +go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= @@ -1481,8 +1487,8 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1500,8 +1506,10 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= +golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= +golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1517,8 +1525,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= -golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= -golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1561,8 +1569,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= +golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20150829230318-ea47fc708ee3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1634,8 +1642,10 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= +golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1682,8 +1692,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= -golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= +golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1785,6 +1795,8 @@ golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1796,8 +1808,10 @@ golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= -golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= +golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1814,8 +1828,9 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= +golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1895,8 +1910,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU= +golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/proto/loop.proto b/proto/loop.proto index 7ba9ab95f..b57f10d00 100644 --- a/proto/loop.proto +++ b/proto/loop.proto @@ -775,7 +775,10 @@ message OutTermsResponse { message QuoteRequest { /* - The amount to swap in satoshis. + The amount to swap in satoshis. In the loop-in case this can either be taken + from the connected lnd wallet or coin-selected from static address deposits. + This is controlled by the select_deposits flag. If deposit_outpoints are + specified, the coins are taken out of that. */ int64 amt = 1 [jstype = JS_STRING]; @@ -823,8 +826,9 @@ message QuoteRequest { /* Static address deposit outpoints that will be quoted for. This option only - pertains to loop in swaps. Either this or the amt parameter can be set at - the same time. + pertains to loop in swaps. If the amt field is set as well the respective + partial amount will be swapped. Cannot be used in conjunction with + auto_select_deposits. */ repeated string deposit_outpoints = 8; @@ -833,6 +837,21 @@ message QuoteRequest { be returned in the specified asset. */ AssetLoopOutRequest asset_info = 9; + + /* + In the legacy loop-in case this field must be set to false. + If set to true, the swap amount will be automatically selected from the + static address deposits. If set to true, deposit_outpoints must be empty. + This option only pertains to loop in swaps. + */ + bool auto_select_deposits = 10; + + /* + If set to true the server will immediately publish the swap in exchange for + a higher fee. This can be useful if the client expects change from a swap. + Note that this feature is only available for static address loop in swaps. + */ + bool fast = 11; } message InQuoteResponse { @@ -862,6 +881,13 @@ message InQuoteResponse { The confirmation target to be used to publish the on-chain HTLC. */ int32 conf_target = 6; + + /* + If the quote request was for a static address loop in and only contained + deposit outpoints the quote response will return the total amount of the + selected deposits. + */ + int64 quoted_amt = 7 [jstype = JS_STRING]; } message OutQuoteResponse { @@ -1910,6 +1936,12 @@ message Deposit { loop-in swap anymore. */ int64 blocks_until_expiry = 6 [jstype = JS_STRING]; + + /* + The swap hash of the swap that this deposit is part of. This field is only + set if the deposit is part of a loop-in swap. + */ + bytes swap_hash = 7; } message StaticAddressWithdrawal { @@ -1971,6 +2003,11 @@ message StaticAddressLoopInSwap { fees. */ int64 payment_request_amount_satoshis = 5 [jstype = JS_STRING]; + + /* + The deposits that were used for this swap. + */ + repeated Deposit deposits = 6; } enum StaticAddressLoopInSwapState { @@ -2078,6 +2115,24 @@ message StaticAddressLoopInRequest { side and the client can retry the swap with different parameters. */ uint32 payment_timeout_seconds = 8; + + /* + The optional swap amount the client is attempting to swap. It can be + provided in combination with the outpoints or separately. If provided with + outpoints the client takes out this amount from the sum of provided + outpoints and sends the change back to the static address. If the amount is + provided without outpoints, the client will select deposits automatically. + The coin selection strategy is simplified by sorting all available deposits + in descending order by amount, and equal amounts in ascending order of + blocks until expiry, and then selecting the largest deposits first until the + amount is reached. The change will be sent back to the static address. If a + subset of outpoints suffice to cover the specified amount the swap will be + canceled to allow the user to safe on transaction fees. + */ + int64 amount = 9 [jstype = JS_STRING]; + + // If set, request the server to use fast publication behavior. + bool fast = 10; } message StaticAddressLoopInResponse { @@ -2142,6 +2197,28 @@ message StaticAddressLoopInResponse { side and the client can retry the swap with different parameters. */ uint32 payment_timeout_seconds = 11; + + /* + The deposits that are used for this swap. + */ + repeated Deposit used_deposits = 12; + + /* + The amount that is being swapped (may be less than total deposit value if + change is returned). + */ + uint64 swap_amount = 13 [jstype = JS_STRING]; + + /* + The change amount that will be returned to the static address. + */ + int64 change = 14 [jstype = JS_STRING]; + + /* + If set, indicates that the server was requested to use fast publication + behavior. + */ + bool fast = 15; } message AssetLoopOutRequest { diff --git a/proto/swapserverrpc/server.proto b/proto/swapserverrpc/server.proto index fec99ecd0..e72f06687 100644 --- a/proto/swapserverrpc/server.proto +++ b/proto/swapserverrpc/server.proto @@ -294,6 +294,10 @@ message ServerLoopInQuoteRequest { // service fee. This is to cover for the increased on-chain fee the server // has to pay when the sweeping transaction is broadcast. uint32 num_static_address_deposits = 7; + + // If set, request the server to use fast publication behavior. Note that + // this falg is only available for static address loop ins. + bool fast = 8; } message ServerLoopInQuoteResponse { @@ -660,6 +664,12 @@ message FetchL402Response { // SubscribeNotificationsRequest is a request to subscribe to notifications. message SubscribeNotificationsRequest { + enum ListenerVersion { + LEGACY = 0; + V1 = 1; + } + + ListenerVersion version = 1; } // SubscribeNotificationsResponse is a response to a @@ -668,6 +678,7 @@ message SubscribeNotificationsResponse { oneof notification { ServerReservationNotification reservation_notification = 1; ServerStaticLoopInSweepNotification static_loop_in_sweep = 2; + ServerUnfinishedSwapNotification unfinished_swap = 3; } } @@ -687,3 +698,14 @@ message ServerStaticLoopInSweepNotification { // The prevout information of the sweep txn. repeated PrevoutInfo prevout_info = 4; } + +// ServerUnfinishedSwapNotification notifies the client about an unfinished +// swap that needs attention. This is useful in client data loss scenarios to +// help the client recover the swap. +message ServerUnfinishedSwapNotification { + // The swap hash of the unfinished swap. + bytes swap_hash = 1; + + // Whether the swap is a loop in or loop out. + bool is_loop_in = 2; +} From 9b08651afa5e0ffa92aec2bc8e9de1df56ef29d0 Mon Sep 17 00:00:00 2001 From: Viktor Torstensson Date: Fri, 31 Oct 2025 17:13:37 +0100 Subject: [PATCH 07/10] litrpc: bump looprpc to `v1.0.11` --- litrpc/go.mod | 2 +- litrpc/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/litrpc/go.mod b/litrpc/go.mod index cd3a2f6e4..76451c76d 100644 --- a/litrpc/go.mod +++ b/litrpc/go.mod @@ -5,7 +5,7 @@ go 1.23.12 require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 github.com/lightninglabs/faraday/frdrpc v1.0.1 - github.com/lightninglabs/loop/looprpc v1.0.8 + github.com/lightninglabs/loop/looprpc v1.0.11 github.com/lightninglabs/pool/poolrpc v1.0.1 github.com/lightninglabs/taproot-assets/taprpc v1.0.8-0.20250716163904-2ef55ba74036 github.com/lightningnetwork/lnd v0.19.3-beta diff --git a/litrpc/go.sum b/litrpc/go.sum index 18070a44b..268232854 100644 --- a/litrpc/go.sum +++ b/litrpc/go.sum @@ -1084,8 +1084,8 @@ github.com/lightninglabs/faraday/frdrpc v1.0.1 h1:3YlP9UwT0bmT468oAdn4dxwsaJBI4Q github.com/lightninglabs/faraday/frdrpc v1.0.1/go.mod h1:ot1R/RGzk61d3qCrZPL36jI5ziGmKbvvE7UQKsJKuvk= github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc= github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk= -github.com/lightninglabs/loop/looprpc v1.0.8 h1:OFmJNLjem6fLuH1YUO+3G6QA1wmjAd0zyhvdHONOBDs= -github.com/lightninglabs/loop/looprpc v1.0.8/go.mod h1:c7WykKQZ3PspCMVvv2kr9o4l3bgJBEBVv0SOoBOjPOw= +github.com/lightninglabs/loop/looprpc v1.0.11 h1:YCz67k5GSm3EKMCRBfis034Pd3R0+vPPHgfNwQqjpaE= +github.com/lightninglabs/loop/looprpc v1.0.11/go.mod h1:m2B9bg8Cus1TVbXD3RffKVmGS3lpV2Zl1yu5x3wcQYk= github.com/lightninglabs/loop/swapserverrpc v1.0.13 h1:Qf4L8QBJKzhKRcC8dpvfrrBEXJMF3+XbpomAHEJsRDY= github.com/lightninglabs/loop/swapserverrpc v1.0.13/go.mod h1:Ml3gMwe/iTRLvu1QGGZzXcr0DYSa9sJGwKPktLaWtwE= github.com/lightninglabs/neutrino v0.16.1 h1:5Kz4ToxncEVkpKC6fwUjXKtFKJhuxlG3sBB3MdJTJjs= From e29ea1f7494a06e8aaa8e9a0787aa32d93d68fe4 Mon Sep 17 00:00:00 2001 From: Viktor Torstensson Date: Fri, 31 Oct 2025 17:22:39 +0100 Subject: [PATCH 08/10] docs: add `v0.15.3` release notes --- docs/release-notes/release-notes-0.15.3.md | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 docs/release-notes/release-notes-0.15.3.md diff --git a/docs/release-notes/release-notes-0.15.3.md b/docs/release-notes/release-notes-0.15.3.md new file mode 100644 index 000000000..9a36a0787 --- /dev/null +++ b/docs/release-notes/release-notes-0.15.3.md @@ -0,0 +1,41 @@ +# Release Notes + +- [Lightning Terminal](#lightning-terminal) + - [Bug Fixes](#bug-fixes) + - [Functional Changes/Additions](#functional-changesadditions) + - [Technical and Architectural Updates](#technical-and-architectural-updates) +- [Integrated Binary Updates](#integrated-binary-updates) + - [LND](#lnd) + - [Loop](#loop) + - [Pool](#pool) + - [Faraday](#faraday) + - [Taproot Assets](#taproot-assets) +- [Contributors](#contributors-alphabetical-order) +## Lightning Terminal + +### Bug Fixes + +### Functional Changes/Additions + +### Technical and Architectural Updates + +## RPC Updates + +## Integrated Binary Updates + +### LND + +### Loop + +* Updated [`loop` to + `v0.31.5-beta`](https://github.com/lightninglabs/lightning-terminal/pull/1164). + +### Pool + +### Faraday + +### Taproot Assets + +# Contributors (Alphabetical Order) + +* Viktor T From 34d4eba51b51e4f40360cf38d37830e869241f0c Mon Sep 17 00:00:00 2001 From: Viktor Torstensson Date: Fri, 31 Oct 2025 17:24:32 +0100 Subject: [PATCH 09/10] README: update for release of `v0.15.3-alpha` --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1bb1a0227..8d846cfd1 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,7 @@ in remote mode (meaning that `lnd-mode=remote` is set). It shows the | LiT | LND | |-------------------|--------------| +| **v0.15.3-alpha** | v0.19.0-beta | | **v0.15.2-alpha** | v0.19.0-beta | | **v0.15.1-alpha** | v0.19.0-beta | | **v0.15.0-alpha** | v0.19.0-beta | @@ -172,6 +173,7 @@ will be added in the future. | LiT | LND | Loop | Faraday | Pool | Taproot Assets | |-------------------|--------------|--------------|---------------|--------------|----------------| +| **v0.15.3-alpha** | v0.19.3-beta | v0.31.5-beta | v0.2.16-alpha | v0.6.6-beta | v0.6.1-alpha | | **v0.15.2-alpha** | v0.19.3-beta | v0.31.2-beta | v0.2.16-alpha | v0.6.6-beta | v0.6.1-alpha | | **v0.15.1-alpha** | v0.19.2-beta | v0.31.2-beta | v0.2.16-alpha | v0.6.6-beta | v0.6.1-alpha | | **v0.15.0-alpha** | v0.19.1-beta | v0.31.2-beta | v0.2.16-alpha | v0.6.6-beta | v0.6.0-alpha | From 5af10ea936edd8a89b36bb66af371fef385e67b0 Mon Sep 17 00:00:00 2001 From: Viktor Torstensson Date: Fri, 31 Oct 2025 17:25:24 +0100 Subject: [PATCH 10/10] version: bump version to v0.15.3-alpha --- version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.go b/version.go index 9aaf3ef21..4bee3cf65 100644 --- a/version.go +++ b/version.go @@ -34,7 +34,7 @@ const semanticAlphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr const ( appMajor uint = 0 appMinor uint = 15 - appPatch uint = 2 + appPatch uint = 3 // appPreRelease MUST only contain characters from semanticAlphabet per // the semantic versioning spec.