diff --git a/README.md b/README.md index e3ffa551f..bc2e908cd 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ versioning](#daemon-versions-packaged-with-lit). | LiT | LND | |-------------------|--------------| +| **v0.10.5-alpha** | v0.16.0-beta | | **v0.10.4-alpha** | v0.16.0-beta | | **v0.10.2-alpha** | v0.16.0-beta | | **v0.10.1-alpha** | v0.16.0-beta | @@ -141,6 +142,7 @@ The following table shows the supported combinations: | LiT | LND | Loop | Faraday | Pool | Taproot Assets | |-------------------|--------------|--------------|---------------|--------------|----------------| +| **v0.10.5-alpha** | v0.16.4-beta | v0.26.2-beta | v0.2.11-alpha | v0.6.4-beta | v0.2.3-alpha | | **v0.10.4-alpha** | v0.16.4-beta | v0.25.2-beta | v0.2.11-alpha | v0.6.4-beta | v0.2.3-alpha | | **v0.10.2-alpha** | v0.16.4-beta | v0.25.2-beta | v0.2.11-alpha | v0.6.4-beta | v0.2.2-alpha | | **v0.10.1-alpha** | v0.16.3-beta | v0.24.1-beta | v0.2.11-alpha | v0.6.4-beta | v0.2.0-alpha | diff --git a/app/src/types/generated/loop_pb.d.ts b/app/src/types/generated/loop_pb.d.ts index b338ecbc1..b8e009795 100644 --- a/app/src/types/generated/loop_pb.d.ts +++ b/app/src/types/generated/loop_pb.d.ts @@ -49,6 +49,12 @@ export class LoopOutRequest extends jspb.Message { getInitiator(): string; setInitiator(value: string): void; + getAccount(): string; + setAccount(value: string): void; + + getAccountAddrType(): AddressTypeMap[keyof AddressTypeMap]; + setAccountAddrType(value: AddressTypeMap[keyof AddressTypeMap]): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): LoopOutRequest.AsObject; static toObject(includeInstance: boolean, msg: LoopOutRequest): LoopOutRequest.AsObject; @@ -75,6 +81,8 @@ export namespace LoopOutRequest { swapPublicationDeadline: string, label: string, initiator: string, + account: string, + accountAddrType: AddressTypeMap[keyof AddressTypeMap], } } @@ -873,6 +881,12 @@ export class LiquidityParameters extends jspb.Message { getEasyAutoloopLocalTargetSat(): string; setEasyAutoloopLocalTargetSat(value: string): void; + getAccount(): string; + setAccount(value: string): void; + + getAccountAddrType(): AddressTypeMap[keyof AddressTypeMap]; + setAccountAddrType(value: AddressTypeMap[keyof AddressTypeMap]): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): LiquidityParameters.AsObject; static toObject(includeInstance: boolean, msg: LiquidityParameters): LiquidityParameters.AsObject; @@ -907,6 +921,8 @@ export namespace LiquidityParameters { autoloopBudgetLastRefresh: string, easyAutoloop: boolean, easyAutoloopLocalTargetSat: string, + account: string, + accountAddrType: AddressTypeMap[keyof AddressTypeMap], } } @@ -1070,6 +1086,13 @@ export namespace SuggestSwapsResponse { } } +export interface AddressTypeMap { + ADDRESS_TYPE_UNKNOWN: 0; + TAPROOT_PUBKEY: 1; +} + +export const AddressType: AddressTypeMap; + export interface SwapTypeMap { LOOP_OUT: 0; LOOP_IN: 1; diff --git a/app/src/types/generated/loop_pb.js b/app/src/types/generated/loop_pb.js index 4b6ecb952..efc0c7dfd 100644 --- a/app/src/types/generated/loop_pb.js +++ b/app/src/types/generated/loop_pb.js @@ -15,6 +15,7 @@ var goog = jspb; var global = Function('return this')(); var swapserverrpc_common_pb = require('./swapserverrpc/common_pb.js'); +goog.exportSymbol('proto.looprpc.AddressType', null, global); goog.exportSymbol('proto.looprpc.AutoReason', null, global); goog.exportSymbol('proto.looprpc.Disqualified', null, global); goog.exportSymbol('proto.looprpc.FailureReason', null, global); @@ -117,7 +118,9 @@ proto.looprpc.LoopOutRequest.toObject = function(includeInstance, msg) { htlcConfirmations: jspb.Message.getFieldWithDefault(msg, 13, 0), swapPublicationDeadline: jspb.Message.getFieldWithDefault(msg, 10, "0"), label: jspb.Message.getFieldWithDefault(msg, 12, ""), - initiator: jspb.Message.getFieldWithDefault(msg, 14, "") + initiator: jspb.Message.getFieldWithDefault(msg, 14, ""), + account: jspb.Message.getFieldWithDefault(msg, 15, ""), + accountAddrType: jspb.Message.getFieldWithDefault(msg, 16, 0) }; if (includeInstance) { @@ -210,6 +213,14 @@ proto.looprpc.LoopOutRequest.deserializeBinaryFromReader = function(msg, reader) var value = /** @type {string} */ (reader.readString()); msg.setInitiator(value); break; + case 15: + var value = /** @type {string} */ (reader.readString()); + msg.setAccount(value); + break; + case 16: + var value = /** @type {!proto.looprpc.AddressType} */ (reader.readEnum()); + msg.setAccountAddrType(value); + break; default: reader.skipField(); break; @@ -337,6 +348,20 @@ proto.looprpc.LoopOutRequest.serializeBinaryToWriter = function(message, writer) f ); } + f = message.getAccount(); + if (f.length > 0) { + writer.writeString( + 15, + f + ); + } + f = message.getAccountAddrType(); + if (f !== 0.0) { + writer.writeEnum( + 16, + f + ); + } }; @@ -564,6 +589,36 @@ proto.looprpc.LoopOutRequest.prototype.setInitiator = function(value) { }; +/** + * optional string account = 15; + * @return {string} + */ +proto.looprpc.LoopOutRequest.prototype.getAccount = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, "")); +}; + + +/** @param {string} value */ +proto.looprpc.LoopOutRequest.prototype.setAccount = function(value) { + jspb.Message.setProto3StringField(this, 15, value); +}; + + +/** + * optional AddressType account_addr_type = 16; + * @return {!proto.looprpc.AddressType} + */ +proto.looprpc.LoopOutRequest.prototype.getAccountAddrType = function() { + return /** @type {!proto.looprpc.AddressType} */ (jspb.Message.getFieldWithDefault(this, 16, 0)); +}; + + +/** @param {!proto.looprpc.AddressType} value */ +proto.looprpc.LoopOutRequest.prototype.setAccountAddrType = function(value) { + jspb.Message.setProto3EnumField(this, 16, value); +}; + + /** * Generated by JsPbCodeGenerator. @@ -5904,7 +5959,9 @@ proto.looprpc.LiquidityParameters.toObject = function(includeInstance, msg) { autoloopBudgetRefreshPeriodSec: jspb.Message.getFieldWithDefault(msg, 19, "0"), autoloopBudgetLastRefresh: jspb.Message.getFieldWithDefault(msg, 20, "0"), easyAutoloop: jspb.Message.getFieldWithDefault(msg, 21, false), - easyAutoloopLocalTargetSat: jspb.Message.getFieldWithDefault(msg, 22, "0") + easyAutoloopLocalTargetSat: jspb.Message.getFieldWithDefault(msg, 22, "0"), + account: jspb.Message.getFieldWithDefault(msg, 23, ""), + accountAddrType: jspb.Message.getFieldWithDefault(msg, 24, 0) }; if (includeInstance) { @@ -6030,6 +6087,14 @@ proto.looprpc.LiquidityParameters.deserializeBinaryFromReader = function(msg, re var value = /** @type {string} */ (reader.readUint64String()); msg.setEasyAutoloopLocalTargetSat(value); break; + case 23: + var value = /** @type {string} */ (reader.readString()); + msg.setAccount(value); + break; + case 24: + var value = /** @type {!proto.looprpc.AddressType} */ (reader.readEnum()); + msg.setAccountAddrType(value); + break; default: reader.skipField(); break; @@ -6214,6 +6279,20 @@ proto.looprpc.LiquidityParameters.serializeBinaryToWriter = function(message, wr f ); } + f = message.getAccount(); + if (f.length > 0) { + writer.writeString( + 23, + f + ); + } + f = message.getAccountAddrType(); + if (f !== 0.0) { + writer.writeEnum( + 24, + f + ); + } }; @@ -6567,6 +6646,36 @@ proto.looprpc.LiquidityParameters.prototype.setEasyAutoloopLocalTargetSat = func }; +/** + * optional string account = 23; + * @return {string} + */ +proto.looprpc.LiquidityParameters.prototype.getAccount = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 23, "")); +}; + + +/** @param {string} value */ +proto.looprpc.LiquidityParameters.prototype.setAccount = function(value) { + jspb.Message.setProto3StringField(this, 23, value); +}; + + +/** + * optional AddressType account_addr_type = 24; + * @return {!proto.looprpc.AddressType} + */ +proto.looprpc.LiquidityParameters.prototype.getAccountAddrType = function() { + return /** @type {!proto.looprpc.AddressType} */ (jspb.Message.getFieldWithDefault(this, 24, 0)); +}; + + +/** @param {!proto.looprpc.AddressType} value */ +proto.looprpc.LiquidityParameters.prototype.setAccountAddrType = function(value) { + jspb.Message.setProto3EnumField(this, 24, value); +}; + + /** * Generated by JsPbCodeGenerator. @@ -7739,6 +7848,14 @@ proto.looprpc.SuggestSwapsResponse.prototype.clearDisqualifiedList = function() }; +/** + * @enum {number} + */ +proto.looprpc.AddressType = { + ADDRESS_TYPE_UNKNOWN: 0, + TAPROOT_PUBKEY: 1 +}; + /** * @enum {number} */ diff --git a/app/src/types/generated/swapserverrpc/server_pb.d.ts b/app/src/types/generated/swapserverrpc/server_pb.d.ts index 4b314b594..30b34e4c9 100644 --- a/app/src/types/generated/swapserverrpc/server_pb.d.ts +++ b/app/src/types/generated/swapserverrpc/server_pb.d.ts @@ -103,6 +103,9 @@ export class ServerLoopOutQuoteRequest extends jspb.Message { getExpiry(): number; setExpiry(value: number): void; + getUserAgent(): string; + setUserAgent(value: string): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): ServerLoopOutQuoteRequest.AsObject; static toObject(includeInstance: boolean, msg: ServerLoopOutQuoteRequest): ServerLoopOutQuoteRequest.AsObject; @@ -119,6 +122,7 @@ export namespace ServerLoopOutQuoteRequest { swapPublicationDeadline: string, protocolVersion: ProtocolVersionMap[keyof ProtocolVersionMap], expiry: number, + userAgent: string, } } @@ -170,6 +174,9 @@ export class ServerLoopOutTermsRequest extends jspb.Message { getProtocolVersion(): ProtocolVersionMap[keyof ProtocolVersionMap]; setProtocolVersion(value: ProtocolVersionMap[keyof ProtocolVersionMap]): void; + getUserAgent(): string; + setUserAgent(value: string): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): ServerLoopOutTermsRequest.AsObject; static toObject(includeInstance: boolean, msg: ServerLoopOutTermsRequest): ServerLoopOutTermsRequest.AsObject; @@ -183,6 +190,7 @@ export class ServerLoopOutTermsRequest extends jspb.Message { export namespace ServerLoopOutTermsRequest { export type AsObject = { protocolVersion: ProtocolVersionMap[keyof ProtocolVersionMap], + userAgent: string, } } @@ -336,6 +344,9 @@ export class ServerLoopInQuoteRequest extends jspb.Message { getProtocolVersion(): ProtocolVersionMap[keyof ProtocolVersionMap]; setProtocolVersion(value: ProtocolVersionMap[keyof ProtocolVersionMap]): void; + getUserAgent(): string; + setUserAgent(value: string): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): ServerLoopInQuoteRequest.AsObject; static toObject(includeInstance: boolean, msg: ServerLoopInQuoteRequest): ServerLoopInQuoteRequest.AsObject; @@ -353,6 +364,7 @@ export namespace ServerLoopInQuoteRequest { lastHop: Uint8Array | string, routeHintsList: Array, protocolVersion: ProtocolVersionMap[keyof ProtocolVersionMap], + userAgent: string, } } @@ -396,6 +408,9 @@ export class ServerLoopInTermsRequest extends jspb.Message { getProtocolVersion(): ProtocolVersionMap[keyof ProtocolVersionMap]; setProtocolVersion(value: ProtocolVersionMap[keyof ProtocolVersionMap]): void; + getUserAgent(): string; + setUserAgent(value: string): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): ServerLoopInTermsRequest.AsObject; static toObject(includeInstance: boolean, msg: ServerLoopInTermsRequest): ServerLoopInTermsRequest.AsObject; @@ -409,6 +424,7 @@ export class ServerLoopInTermsRequest extends jspb.Message { export namespace ServerLoopInTermsRequest { export type AsObject = { protocolVersion: ProtocolVersionMap[keyof ProtocolVersionMap], + userAgent: string, } } diff --git a/app/src/types/generated/swapserverrpc/server_pb.js b/app/src/types/generated/swapserverrpc/server_pb.js index 0deffb261..2650f9fbe 100644 --- a/app/src/types/generated/swapserverrpc/server_pb.js +++ b/app/src/types/generated/swapserverrpc/server_pb.js @@ -727,7 +727,8 @@ proto.looprpc.ServerLoopOutQuoteRequest.toObject = function(includeInstance, msg amt: jspb.Message.getFieldWithDefault(msg, 1, "0"), swapPublicationDeadline: jspb.Message.getFieldWithDefault(msg, 2, "0"), protocolVersion: jspb.Message.getFieldWithDefault(msg, 3, 0), - expiry: jspb.Message.getFieldWithDefault(msg, 4, 0) + expiry: jspb.Message.getFieldWithDefault(msg, 4, 0), + userAgent: jspb.Message.getFieldWithDefault(msg, 5, "") }; if (includeInstance) { @@ -780,6 +781,10 @@ proto.looprpc.ServerLoopOutQuoteRequest.deserializeBinaryFromReader = function(m var value = /** @type {number} */ (reader.readInt32()); msg.setExpiry(value); break; + case 5: + var value = /** @type {string} */ (reader.readString()); + msg.setUserAgent(value); + break; default: reader.skipField(); break; @@ -837,6 +842,13 @@ proto.looprpc.ServerLoopOutQuoteRequest.serializeBinaryToWriter = function(messa f ); } + f = message.getUserAgent(); + if (f.length > 0) { + writer.writeString( + 5, + f + ); + } }; @@ -900,6 +912,21 @@ proto.looprpc.ServerLoopOutQuoteRequest.prototype.setExpiry = function(value) { }; +/** + * optional string user_agent = 5; + * @return {string} + */ +proto.looprpc.ServerLoopOutQuoteRequest.prototype.getUserAgent = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, "")); +}; + + +/** @param {string} value */ +proto.looprpc.ServerLoopOutQuoteRequest.prototype.setUserAgent = function(value) { + jspb.Message.setProto3StringField(this, 5, value); +}; + + /** * Generated by JsPbCodeGenerator. @@ -1251,7 +1278,8 @@ proto.looprpc.ServerLoopOutTermsRequest.prototype.toObject = function(opt_includ */ proto.looprpc.ServerLoopOutTermsRequest.toObject = function(includeInstance, msg) { var f, obj = { - protocolVersion: jspb.Message.getFieldWithDefault(msg, 1, 0) + protocolVersion: jspb.Message.getFieldWithDefault(msg, 1, 0), + userAgent: jspb.Message.getFieldWithDefault(msg, 2, "") }; if (includeInstance) { @@ -1292,6 +1320,10 @@ proto.looprpc.ServerLoopOutTermsRequest.deserializeBinaryFromReader = function(m var value = /** @type {!proto.looprpc.ProtocolVersion} */ (reader.readEnum()); msg.setProtocolVersion(value); break; + case 2: + var value = /** @type {string} */ (reader.readString()); + msg.setUserAgent(value); + break; default: reader.skipField(); break; @@ -1328,6 +1360,13 @@ proto.looprpc.ServerLoopOutTermsRequest.serializeBinaryToWriter = function(messa f ); } + f = message.getUserAgent(); + if (f.length > 0) { + writer.writeString( + 2, + f + ); + } }; @@ -1346,6 +1385,21 @@ proto.looprpc.ServerLoopOutTermsRequest.prototype.setProtocolVersion = function( }; +/** + * optional string user_agent = 2; + * @return {string} + */ +proto.looprpc.ServerLoopOutTermsRequest.prototype.getUserAgent = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, "")); +}; + + +/** @param {string} value */ +proto.looprpc.ServerLoopOutTermsRequest.prototype.setUserAgent = function(value) { + jspb.Message.setProto3StringField(this, 2, value); +}; + + /** * Generated by JsPbCodeGenerator. @@ -2353,7 +2407,8 @@ proto.looprpc.ServerLoopInQuoteRequest.toObject = function(includeInstance, msg) lastHop: msg.getLastHop_asB64(), routeHintsList: jspb.Message.toObjectList(msg.getRouteHintsList(), swapserverrpc_common_pb.RouteHint.toObject, includeInstance), - protocolVersion: jspb.Message.getFieldWithDefault(msg, 2, 0) + protocolVersion: jspb.Message.getFieldWithDefault(msg, 2, 0), + userAgent: jspb.Message.getFieldWithDefault(msg, 6, "") }; if (includeInstance) { @@ -2411,6 +2466,10 @@ proto.looprpc.ServerLoopInQuoteRequest.deserializeBinaryFromReader = function(ms var value = /** @type {!proto.looprpc.ProtocolVersion} */ (reader.readEnum()); msg.setProtocolVersion(value); break; + case 6: + var value = /** @type {string} */ (reader.readString()); + msg.setUserAgent(value); + break; default: reader.skipField(); break; @@ -2476,6 +2535,13 @@ proto.looprpc.ServerLoopInQuoteRequest.serializeBinaryToWriter = function(messag f ); } + f = message.getUserAgent(); + if (f.length > 0) { + writer.writeString( + 6, + f + ); + } }; @@ -2618,6 +2684,21 @@ proto.looprpc.ServerLoopInQuoteRequest.prototype.setProtocolVersion = function(v }; +/** + * optional string user_agent = 6; + * @return {string} + */ +proto.looprpc.ServerLoopInQuoteRequest.prototype.getUserAgent = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, "")); +}; + + +/** @param {string} value */ +proto.looprpc.ServerLoopInQuoteRequest.prototype.setUserAgent = function(value) { + jspb.Message.setProto3StringField(this, 6, value); +}; + + /** * Generated by JsPbCodeGenerator. @@ -2915,7 +2996,8 @@ proto.looprpc.ServerLoopInTermsRequest.prototype.toObject = function(opt_include */ proto.looprpc.ServerLoopInTermsRequest.toObject = function(includeInstance, msg) { var f, obj = { - protocolVersion: jspb.Message.getFieldWithDefault(msg, 1, 0) + protocolVersion: jspb.Message.getFieldWithDefault(msg, 1, 0), + userAgent: jspb.Message.getFieldWithDefault(msg, 2, "") }; if (includeInstance) { @@ -2956,6 +3038,10 @@ proto.looprpc.ServerLoopInTermsRequest.deserializeBinaryFromReader = function(ms var value = /** @type {!proto.looprpc.ProtocolVersion} */ (reader.readEnum()); msg.setProtocolVersion(value); break; + case 2: + var value = /** @type {string} */ (reader.readString()); + msg.setUserAgent(value); + break; default: reader.skipField(); break; @@ -2992,6 +3078,13 @@ proto.looprpc.ServerLoopInTermsRequest.serializeBinaryToWriter = function(messag f ); } + f = message.getUserAgent(); + if (f.length > 0) { + writer.writeString( + 2, + f + ); + } }; @@ -3010,6 +3103,21 @@ proto.looprpc.ServerLoopInTermsRequest.prototype.setProtocolVersion = function(v }; +/** + * optional string user_agent = 2; + * @return {string} + */ +proto.looprpc.ServerLoopInTermsRequest.prototype.getUserAgent = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, "")); +}; + + +/** @param {string} value */ +proto.looprpc.ServerLoopInTermsRequest.prototype.setUserAgent = function(value) { + jspb.Message.setProto3StringField(this, 2, value); +}; + + /** * Generated by JsPbCodeGenerator. diff --git a/go.mod b/go.mod index d67502f99..54bd64792 100644 --- a/go.mod +++ b/go.mod @@ -17,8 +17,8 @@ require ( github.com/lightninglabs/lightning-node-connect v0.1.12-alpha github.com/lightninglabs/lightning-terminal/autopilotserverrpc v0.0.1 github.com/lightninglabs/lndclient v0.16.0-14 - github.com/lightninglabs/loop v0.25.2-beta - github.com/lightninglabs/loop/swapserverrpc v1.0.4 + github.com/lightninglabs/loop v0.26.2-beta + github.com/lightninglabs/loop/swapserverrpc v1.0.5 github.com/lightninglabs/pool v0.6.4-beta github.com/lightninglabs/pool/auctioneerrpc v1.1.0 github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display diff --git a/go.sum b/go.sum index 31b7627d2..bd363da8e 100644 --- a/go.sum +++ b/go.sum @@ -1036,10 +1036,10 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:ant github.com/lightninglabs/lndclient v0.15.0-0/go.mod h1:ORS/YFe9hAXlzN/Uj+gvTmrnXEml6yD6dWwzCjpTJyQ= github.com/lightninglabs/lndclient v0.16.0-14 h1:8NpqbitVIqOoSjjXT0G/Tksmu0QzRpocvAsIDS8xKtQ= github.com/lightninglabs/lndclient v0.16.0-14/go.mod h1:mqY0znSNa+M40HZowwKfno29RyZnmxoqo++BlYP82EY= -github.com/lightninglabs/loop v0.25.2-beta h1:v4eP/34Qho1Pw90LlAwZAjGN217NsvM1SpcienTF5ps= -github.com/lightninglabs/loop v0.25.2-beta/go.mod h1:GwY3pDrM6DWXhK0eEG7mSD30EEy9kmn1WQkW5YKf1qA= -github.com/lightninglabs/loop/swapserverrpc v1.0.4 h1:cEX+mt7xmQlEbmuQ52vOBT7l+a471v94ofdJbB6MmXs= -github.com/lightninglabs/loop/swapserverrpc v1.0.4/go.mod h1:imy1/sqnb70EEyBKMo4pHwwLBPW8uYahWZ8s+1Xcq1o= +github.com/lightninglabs/loop v0.26.2-beta h1:aUPD+jj5BTW7Kwc45I2UzTN9sS2kFB5rlVVaUGA0t2w= +github.com/lightninglabs/loop v0.26.2-beta/go.mod h1:ajgWPGeG4eGLA12eNnxoZ5s+AFL8ijM4E+j005CZl1Q= +github.com/lightninglabs/loop/swapserverrpc v1.0.5 h1:wxgAnxO8d20+t8AppNfdoZZY69++9dvx9mkuWST4nxE= +github.com/lightninglabs/loop/swapserverrpc v1.0.5/go.mod h1:vrUYQjRLzV7fZZkM8I1AlmwTdPjCtKPCzeBeKemMGa4= github.com/lightninglabs/neutrino v0.13.2/go.mod h1:Cv/v8oHiPhuGiGvGgO+rIMhwCwEdsQFu6as840i2afw= github.com/lightninglabs/neutrino v0.14.1/go.mod h1:SV9ccrw2m6t6UvJX8xB//W0Dv+LEwMTbjg4V/Fb5KwU= github.com/lightninglabs/neutrino v0.15.0 h1:yr3uz36fLAq8hyM0TRUVlef1TRNoWAqpmmNlVtKUDtI= diff --git a/proto/loop.proto b/proto/loop.proto index a882a9f57..49be6c087 100644 --- a/proto/loop.proto +++ b/proto/loop.proto @@ -212,6 +212,29 @@ message LoopOutRequest { triggering the swap (loop CLI, autolooper, LiT UI, other 3rd party UI). */ string initiator = 14; + + /* + An alternative destination address source for the swap. This field + represents the name of the account in the backing lnd instance. + Refer to lnd's wallet import functions for reference. + */ + string account = 15; + + /* + The address type of the account specified in the account field. + */ + AddressType account_addr_type = 16; +} + +/* +`AddressType` has to be one of: + +- `unknown`: Unknown address type +- `p2tr`: Pay to taproot pubkey (`TAPROOT_PUBKEY` = 1) +*/ +enum AddressType { + ADDRESS_TYPE_UNKNOWN = 0; + TAPROOT_PUBKEY = 1; } message LoopInRequest { @@ -970,6 +993,18 @@ message LiquidityParameters { autoloop to determine how much liquidity should be maintained in channels. */ uint64 easy_autoloop_local_target_sat = 22 [jstype = JS_STRING]; + + /* + An alternative destination address source for the swap. This field + represents the name of the account in the backing lnd instance. + Refer to lnd's wallet import functions for reference. + */ + string account = 23; + + /* + The address type of the account specified in the account field. + */ + AddressType account_addr_type = 24; } enum LiquidityRuleType { diff --git a/proto/swapserverrpc/server.proto b/proto/swapserverrpc/server.proto index cf66547ce..14b7ab320 100644 --- a/proto/swapserverrpc/server.proto +++ b/proto/swapserverrpc/server.proto @@ -89,8 +89,8 @@ enum ProtocolVersion { // The client supports loop out swap cancelation. LOOP_OUT_CANCEL = 7; - // The client is able to ask the server to probe to test inbound - // liquidity. + // The client is able to ask the server to probe to test inbound liquidity + // and provide more accurate loop-in fees. PROBE = 8; // The client may ask the server to use a custom routing helper plugin in @@ -161,6 +161,15 @@ message ServerLoopOutQuoteRequest { // subjected to min and max constraints as reported in the LoopOutTerms // response. int32 expiry = 4; + + // The user agent string that identifies the software running on the user's + // side. This can be changed in the user's client software but it _SHOULD_ + // conform to the following pattern: + // Agent-Name/semver-version(/additional-info) + // Examples: + // loopd/v0.10.0-beta/commit=3b635821 + // litd/v0.2.0-alpha/commit=326d754 + string user_agent = 5; } message ServerLoopOutQuote { @@ -186,6 +195,15 @@ message ServerLoopOutQuote { message ServerLoopOutTermsRequest { /// The protocol version that the client adheres to. ProtocolVersion protocol_version = 1; + + // The user agent string that identifies the software running on the user's + // side. This can be changed in the user's client software but it _SHOULD_ + // conform to the following pattern: + // Agent-Name/semver-version(/additional-info) + // Examples: + // loopd/v0.10.0-beta/commit=3b635821 + // litd/v0.2.0-alpha/commit=326d754 + string user_agent = 2; } message ServerLoopOutTerms { @@ -243,11 +261,10 @@ message ServerLoopInQuoteRequest { /// The swap amount. If zero, a quote for a maximum amt swap will be given. uint64 amt = 1 [jstype = JS_STRING]; - // The destination pubkey. Will be used to retrieve cached probed routing - // fee. + // The destination pubkey. bytes pubkey = 3; - // The last hop to use. Will be used to retrieve cached probed routing fee. + // Optional last hop to use. bytes last_hop = 4; // Optional route hints to reach the destination through private channels. @@ -255,6 +272,15 @@ message ServerLoopInQuoteRequest { /// The protocol version that the client adheres to. ProtocolVersion protocol_version = 2; + + // The user agent string that identifies the software running on the user's + // side. This can be changed in the user's client software but it _SHOULD_ + // conform to the following pattern: + // Agent-Name/semver-version(/additional-info) + // Examples: + // loopd/v0.10.0-beta/commit=3b635821 + // litd/v0.2.0-alpha/commit=326d754 + string user_agent = 6; } message ServerLoopInQuoteResponse { @@ -268,6 +294,15 @@ message ServerLoopInQuoteResponse { message ServerLoopInTermsRequest { /// The protocol version that the client adheres to. ProtocolVersion protocol_version = 1; + + // The user agent string that identifies the software running on the user's + // side. This can be changed in the user's client software but it _SHOULD_ + // conform to the following pattern: + // Agent-Name/semver-version(/additional-info) + // Examples: + // loopd/v0.10.0-beta/commit=3b635821 + // litd/v0.2.0-alpha/commit=326d754 + string user_agent = 2; } message ServerLoopInTerms { diff --git a/version.go b/version.go index 2ccf25754..9f9d6934b 100644 --- a/version.go +++ b/version.go @@ -23,7 +23,7 @@ const semanticAlphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr const ( appMajor uint = 0 appMinor uint = 10 - appPatch uint = 4 + appPatch uint = 5 // appPreRelease MUST only contain characters from semanticAlphabet per // the semantic versioning spec.