multi: updates for release v0.8.5-alpha

multi: updates for release v0.8.5-alpha
This commit is contained in:
Elle Mouton 2022-12-02 15:26:24 +02:00
parent e3df3478bc
commit cfc0de1a9e
No known key found for this signature in database
GPG key ID: D7D916376026F177
16 changed files with 1658 additions and 45 deletions

View file

@ -76,6 +76,8 @@ versioning](#daemon-versions-packaged-with-lit).
| LiT | LND |
|------------------|--------------|
| **v0.8.5-alpha** | v0.15.4-beta |
| **v0.8.4-alpha** | v0.15.1-beta |
| **v0.8.3-alpha** | v0.15.1-beta |
| **v0.8.2-alpha** | v0.15.1-beta |
| **v0.8.1-alpha** | v0.15.1-beta |
@ -129,6 +131,7 @@ The following table shows the supported combinations:
| LiT | LND | Loop | Faraday | Pool |
|------------------|--------------|--------------|--------------|--------------|
| **v0.8.5-alpha** | v0.15.5-beta | v0.20.2-beta | v0.2.9-alpha | v0.6.1-beta |
| **v0.8.4-alpha** | v0.15.5-beta | v0.20.1-beta | v0.2.9-alpha | v0.5.8-alpha |
| **v0.8.3-alpha** | v0.15.4-beta | v0.20.1-beta | v0.2.8-alpha | v0.5.8-alpha |
| **v0.8.2-alpha** | v0.15.3-beta | v0.20.1-beta | v0.2.8-alpha | v0.5.8-alpha |

View file

@ -13,7 +13,7 @@ const appPath = join(__dirname, '..');
*/
const LND_VERSION_PATTERN = /^\tgithub\.com\/lightningnetwork\/lnd (v[\d.]+-beta(?:\.rc\d)?)/ms;
const LOOP_VERSION_PATTERN = /^\tgithub\.com\/lightninglabs\/loop (v[\d.]+-beta)/ms;
const POOL_VERSION_PATTERN = /^\tgithub\.com\/lightninglabs\/pool (v[\d.]+-alpha)/ms;
const POOL_VERSION_PATTERN = /^\tgithub\.com\/lightninglabs\/pool (v[\d.]+-beta)/ms;
/** mapping of proto files to the github url to download each from */
const protoSources = async () => {

View file

@ -15,6 +15,9 @@ export class ReserveAccountRequest extends jspb.Message {
getTraderKey_asB64(): string;
setTraderKey(value: Uint8Array | string): void;
getVersion(): number;
setVersion(value: number): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ReserveAccountRequest.AsObject;
static toObject(includeInstance: boolean, msg: ReserveAccountRequest): ReserveAccountRequest.AsObject;
@ -30,6 +33,7 @@ export namespace ReserveAccountRequest {
accountValue: string,
accountExpiry: number,
traderKey: Uint8Array | string,
version: number,
}
}
@ -86,6 +90,9 @@ export class ServerInitAccountRequest extends jspb.Message {
getUserAgent(): string;
setUserAgent(value: string): void;
getVersion(): number;
setVersion(value: number): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ServerInitAccountRequest.AsObject;
static toObject(includeInstance: boolean, msg: ServerInitAccountRequest): ServerInitAccountRequest.AsObject;
@ -104,6 +111,7 @@ export namespace ServerInitAccountRequest {
accountExpiry: number,
traderKey: Uint8Array | string,
userAgent: string,
version: number,
}
}
@ -507,6 +515,8 @@ export class OrderMatchSign extends jspb.Message {
clearAccountSigsMap(): void;
getChannelInfosMap(): jspb.Map<string, ChannelInfo>;
clearChannelInfosMap(): void;
getTraderNoncesMap(): jspb.Map<string, Uint8Array | string>;
clearTraderNoncesMap(): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): OrderMatchSign.AsObject;
static toObject(includeInstance: boolean, msg: OrderMatchSign): OrderMatchSign.AsObject;
@ -522,6 +532,7 @@ export namespace OrderMatchSign {
batchId: Uint8Array | string,
accountSigsMap: Array<[string, Uint8Array | string]>,
channelInfosMap: Array<[string, ChannelInfo.AsObject]>,
traderNoncesMap: Array<[string, Uint8Array | string]>,
}
}
@ -756,12 +767,45 @@ export namespace OrderMatchPrepare {
}
}
export class TxOut extends jspb.Message {
getValue(): string;
setValue(value: string): void;
getPkScript(): Uint8Array | string;
getPkScript_asU8(): Uint8Array;
getPkScript_asB64(): string;
setPkScript(value: Uint8Array | string): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): TxOut.AsObject;
static toObject(includeInstance: boolean, msg: TxOut): TxOut.AsObject;
static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
static serializeBinaryToWriter(message: TxOut, writer: jspb.BinaryWriter): void;
static deserializeBinary(bytes: Uint8Array): TxOut;
static deserializeBinaryFromReader(message: TxOut, reader: jspb.BinaryReader): TxOut;
}
export namespace TxOut {
export type AsObject = {
value: string,
pkScript: Uint8Array | string,
}
}
export class OrderMatchSignBegin extends jspb.Message {
getBatchId(): Uint8Array | string;
getBatchId_asU8(): Uint8Array;
getBatchId_asB64(): string;
setBatchId(value: Uint8Array | string): void;
getServerNoncesMap(): jspb.Map<string, Uint8Array | string>;
clearServerNoncesMap(): void;
clearPrevOutputsList(): void;
getPrevOutputsList(): Array<TxOut>;
setPrevOutputsList(value: Array<TxOut>): void;
addPrevOutputs(value?: TxOut, index?: number): TxOut;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): OrderMatchSignBegin.AsObject;
static toObject(includeInstance: boolean, msg: OrderMatchSignBegin): OrderMatchSignBegin.AsObject;
@ -775,6 +819,8 @@ export class OrderMatchSignBegin extends jspb.Message {
export namespace OrderMatchSignBegin {
export type AsObject = {
batchId: Uint8Array | string,
serverNoncesMap: Array<[string, Uint8Array | string]>,
prevOutputsList: Array<TxOut.AsObject>,
}
}
@ -889,6 +935,9 @@ export class AuctionAccount extends jspb.Message {
getLatestTx_asB64(): string;
setLatestTx(value: Uint8Array | string): void;
getVersion(): number;
setVersion(value: number): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): AuctionAccount.AsObject;
static toObject(includeInstance: boolean, msg: AuctionAccount): AuctionAccount.AsObject;
@ -910,6 +959,7 @@ export namespace AuctionAccount {
heightHint: number,
outpoint?: OutPoint.AsObject,
latestTx: Uint8Array | string,
version: number,
}
}
@ -1011,6 +1061,9 @@ export class AccountDiff extends jspb.Message {
getNewExpiry(): number;
setNewExpiry(value: number): void;
getNewVersion(): number;
setNewVersion(value: number): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): AccountDiff.AsObject;
static toObject(includeInstance: boolean, msg: AccountDiff): AccountDiff.AsObject;
@ -1028,6 +1081,7 @@ export namespace AccountDiff {
outpointIndex: number,
traderKey: Uint8Array | string,
newExpiry: number,
newVersion: number,
}
export interface AccountStateMap {
@ -1100,6 +1154,12 @@ export class ServerOrder extends jspb.Message {
setNotAllowedNodeIdsList(value: Array<Uint8Array | string>): void;
addNotAllowedNodeIds(value: Uint8Array | string, index?: number): Uint8Array | string;
getAuctionType(): AuctionTypeMap[keyof AuctionTypeMap];
setAuctionType(value: AuctionTypeMap[keyof AuctionTypeMap]): void;
getIsPublic(): boolean;
setIsPublic(value: boolean): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ServerOrder.AsObject;
static toObject(includeInstance: boolean, msg: ServerOrder): ServerOrder.AsObject;
@ -1125,6 +1185,8 @@ export namespace ServerOrder {
maxBatchFeeRateSatPerKw: string,
allowedNodeIdsList: Array<Uint8Array | string>,
notAllowedNodeIdsList: Array<Uint8Array | string>,
auctionType: AuctionTypeMap[keyof AuctionTypeMap],
isPublic: boolean,
}
}
@ -1149,6 +1211,12 @@ export class ServerBid extends jspb.Message {
getIsSidecarChannel(): boolean;
setIsSidecarChannel(value: boolean): void;
getUnannouncedChannel(): boolean;
setUnannouncedChannel(value: boolean): void;
getZeroConfChannel(): boolean;
setZeroConfChannel(value: boolean): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ServerBid.AsObject;
static toObject(includeInstance: boolean, msg: ServerBid): ServerBid.AsObject;
@ -1167,6 +1235,8 @@ export namespace ServerBid {
minNodeTier: NodeTierMap[keyof NodeTierMap],
selfChanBalance: string,
isSidecarChannel: boolean,
unannouncedChannel: boolean,
zeroConfChannel: boolean,
}
}
@ -1182,6 +1252,12 @@ export class ServerAsk extends jspb.Message {
getVersion(): number;
setVersion(value: number): void;
getAnnouncementConstraints(): ChannelAnnouncementConstraintsMap[keyof ChannelAnnouncementConstraintsMap];
setAnnouncementConstraints(value: ChannelAnnouncementConstraintsMap[keyof ChannelAnnouncementConstraintsMap]): void;
getConfirmationConstraints(): ChannelConfirmationConstraintsMap[keyof ChannelConfirmationConstraintsMap];
setConfirmationConstraints(value: ChannelConfirmationConstraintsMap[keyof ChannelConfirmationConstraintsMap]): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ServerAsk.AsObject;
static toObject(includeInstance: boolean, msg: ServerAsk): ServerAsk.AsObject;
@ -1197,6 +1273,8 @@ export namespace ServerAsk {
details?: ServerOrder.AsObject,
leaseDurationBlocks: number,
version: number,
announcementConstraints: ChannelAnnouncementConstraintsMap[keyof ChannelAnnouncementConstraintsMap],
confirmationConstraints: ChannelConfirmationConstraintsMap[keyof ChannelConfirmationConstraintsMap],
}
}
@ -1333,6 +1411,16 @@ export class ServerModifyAccountRequest extends jspb.Message {
getNewParams(): ServerModifyAccountRequest.NewAccountParameters | undefined;
setNewParams(value?: ServerModifyAccountRequest.NewAccountParameters): void;
getTraderNonces(): Uint8Array | string;
getTraderNonces_asU8(): Uint8Array;
getTraderNonces_asB64(): string;
setTraderNonces(value: Uint8Array | string): void;
clearPrevOutputsList(): void;
getPrevOutputsList(): Array<TxOut>;
setPrevOutputsList(value: Array<TxOut>): void;
addPrevOutputs(value?: TxOut, index?: number): TxOut;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ServerModifyAccountRequest.AsObject;
static toObject(includeInstance: boolean, msg: ServerModifyAccountRequest): ServerModifyAccountRequest.AsObject;
@ -1349,6 +1437,8 @@ export namespace ServerModifyAccountRequest {
newInputsList: Array<ServerInput.AsObject>,
newOutputsList: Array<ServerOutput.AsObject>,
newParams?: ServerModifyAccountRequest.NewAccountParameters.AsObject,
traderNonces: Uint8Array | string,
prevOutputsList: Array<TxOut.AsObject>,
}
export class NewAccountParameters extends jspb.Message {
@ -1358,6 +1448,9 @@ export namespace ServerModifyAccountRequest {
getExpiry(): number;
setExpiry(value: number): void;
getVersion(): number;
setVersion(value: number): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): NewAccountParameters.AsObject;
static toObject(includeInstance: boolean, msg: NewAccountParameters): NewAccountParameters.AsObject;
@ -1372,6 +1465,7 @@ export namespace ServerModifyAccountRequest {
export type AsObject = {
value: string,
expiry: number,
version: number,
}
}
}
@ -1382,6 +1476,11 @@ export class ServerModifyAccountResponse extends jspb.Message {
getAccountSig_asB64(): string;
setAccountSig(value: Uint8Array | string): void;
getServerNonces(): Uint8Array | string;
getServerNonces_asU8(): Uint8Array;
getServerNonces_asB64(): string;
setServerNonces(value: Uint8Array | string): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ServerModifyAccountResponse.AsObject;
static toObject(includeInstance: boolean, msg: ServerModifyAccountResponse): ServerModifyAccountResponse.AsObject;
@ -1395,6 +1494,7 @@ export class ServerModifyAccountResponse extends jspb.Message {
export namespace ServerModifyAccountResponse {
export type AsObject = {
accountSig: Uint8Array | string,
serverNonces: Uint8Array | string,
}
}
@ -2140,6 +2240,13 @@ export interface OrderChannelTypeMap {
export const OrderChannelType: OrderChannelTypeMap;
export interface AuctionTypeMap {
AUCTION_TYPE_BTC_INBOUND_LIQUIDITY: 0;
AUCTION_TYPE_BTC_OUTBOUND_LIQUIDITY: 1;
}
export const AuctionType: AuctionTypeMap;
export interface NodeTierMap {
TIER_DEFAULT: 0;
TIER_0: 1;
@ -2148,6 +2255,22 @@ export interface NodeTierMap {
export const NodeTier: NodeTierMap;
export interface ChannelAnnouncementConstraintsMap {
ANNOUNCEMENT_NO_PREFERENCE: 0;
ONLY_ANNOUNCED: 1;
ONLY_UNANNOUNCED: 2;
}
export const ChannelAnnouncementConstraints: ChannelAnnouncementConstraintsMap;
export interface ChannelConfirmationConstraintsMap {
CONFIRMATION_NO_PREFERENCE: 0;
ONLY_CONFIRMED: 1;
ONLY_ZEROCONF: 2;
}
export const ChannelConfirmationConstraints: ChannelConfirmationConstraintsMap;
export interface OrderStateMap {
ORDER_SUBMITTED: 0;
ORDER_CLEARED: 1;

File diff suppressed because it is too large Load diff

View file

@ -6861,6 +6861,7 @@ export interface OutputScriptTypeMap {
SCRIPT_TYPE_NULLDATA: 6;
SCRIPT_TYPE_NON_STANDARD: 7;
SCRIPT_TYPE_WITNESS_UNKNOWN: 8;
SCRIPT_TYPE_WITNESS_V1_TAPROOT: 9;
}
export const OutputScriptType: OutputScriptTypeMap;

View file

@ -48917,7 +48917,8 @@ proto.lnrpc.OutputScriptType = {
SCRIPT_TYPE_MULTISIG: 5,
SCRIPT_TYPE_NULLDATA: 6,
SCRIPT_TYPE_NON_STANDARD: 7,
SCRIPT_TYPE_WITNESS_UNKNOWN: 8
SCRIPT_TYPE_WITNESS_UNKNOWN: 8,
SCRIPT_TYPE_WITNESS_V1_TAPROOT: 9
};
/**

View file

@ -31,6 +31,9 @@ export class InitAccountRequest extends jspb.Message {
getInitiator(): string;
setInitiator(value: string): void;
getVersion(): AccountVersionMap[keyof AccountVersionMap];
setVersion(value: AccountVersionMap[keyof AccountVersionMap]): void;
getAccountExpiryCase(): InitAccountRequest.AccountExpiryCase;
getFeesCase(): InitAccountRequest.FeesCase;
serializeBinary(): Uint8Array;
@ -51,6 +54,7 @@ export namespace InitAccountRequest {
confTarget: number,
feeRateSatPerKw: string,
initiator: string,
version: AccountVersionMap[keyof AccountVersionMap],
}
export enum AccountExpiryCase {
@ -336,6 +340,9 @@ export class WithdrawAccountRequest extends jspb.Message {
getRelativeExpiry(): number;
setRelativeExpiry(value: number): void;
getNewVersion(): AccountVersionMap[keyof AccountVersionMap];
setNewVersion(value: AccountVersionMap[keyof AccountVersionMap]): void;
getAccountExpiryCase(): WithdrawAccountRequest.AccountExpiryCase;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): WithdrawAccountRequest.AsObject;
@ -354,6 +361,7 @@ export namespace WithdrawAccountRequest {
feeRateSatPerKw: string,
absoluteExpiry: number,
relativeExpiry: number,
newVersion: AccountVersionMap[keyof AccountVersionMap],
}
export enum AccountExpiryCase {
@ -413,6 +421,9 @@ export class DepositAccountRequest extends jspb.Message {
getRelativeExpiry(): number;
setRelativeExpiry(value: number): void;
getNewVersion(): AccountVersionMap[keyof AccountVersionMap];
setNewVersion(value: AccountVersionMap[keyof AccountVersionMap]): void;
getAccountExpiryCase(): DepositAccountRequest.AccountExpiryCase;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): DepositAccountRequest.AsObject;
@ -431,6 +442,7 @@ export namespace DepositAccountRequest {
feeRateSatPerKw: string,
absoluteExpiry: number,
relativeExpiry: number,
newVersion: AccountVersionMap[keyof AccountVersionMap],
}
export enum AccountExpiryCase {
@ -487,6 +499,9 @@ export class RenewAccountRequest extends jspb.Message {
getFeeRateSatPerKw(): string;
setFeeRateSatPerKw(value: string): void;
getNewVersion(): AccountVersionMap[keyof AccountVersionMap];
setNewVersion(value: AccountVersionMap[keyof AccountVersionMap]): void;
getAccountExpiryCase(): RenewAccountRequest.AccountExpiryCase;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): RenewAccountRequest.AsObject;
@ -504,6 +519,7 @@ export namespace RenewAccountRequest {
absoluteExpiry: number,
relativeExpiry: number,
feeRateSatPerKw: string,
newVersion: AccountVersionMap[keyof AccountVersionMap],
}
export enum AccountExpiryCase {
@ -611,6 +627,9 @@ export class Account extends jspb.Message {
getLatestTxid_asB64(): string;
setLatestTxid(value: Uint8Array | string): void;
getVersion(): AccountVersionMap[keyof AccountVersionMap];
setVersion(value: AccountVersionMap[keyof AccountVersionMap]): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Account.AsObject;
static toObject(includeInstance: boolean, msg: Account): Account.AsObject;
@ -630,6 +649,7 @@ export namespace Account {
expirationHeight: number,
state: AccountStateMap[keyof AccountStateMap],
latestTxid: Uint8Array | string,
version: AccountVersionMap[keyof AccountVersionMap],
}
}
@ -863,6 +883,12 @@ export class Order extends jspb.Message {
setNotAllowedNodeIdsList(value: Array<Uint8Array | string>): void;
addNotAllowedNodeIds(value: Uint8Array | string, index?: number): Uint8Array | string;
getAuctionType(): auctioneerrpc_auctioneer_pb.AuctionTypeMap[keyof auctioneerrpc_auctioneer_pb.AuctionTypeMap];
setAuctionType(value: auctioneerrpc_auctioneer_pb.AuctionTypeMap[keyof auctioneerrpc_auctioneer_pb.AuctionTypeMap]): void;
getIsPublic(): boolean;
setIsPublic(value: boolean): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Order.AsObject;
static toObject(includeInstance: boolean, msg: Order): Order.AsObject;
@ -890,6 +916,8 @@ export namespace Order {
channelType: auctioneerrpc_auctioneer_pb.OrderChannelTypeMap[keyof auctioneerrpc_auctioneer_pb.OrderChannelTypeMap],
allowedNodeIdsList: Array<Uint8Array | string>,
notAllowedNodeIdsList: Array<Uint8Array | string>,
auctionType: auctioneerrpc_auctioneer_pb.AuctionTypeMap[keyof auctioneerrpc_auctioneer_pb.AuctionTypeMap],
isPublic: boolean,
}
}
@ -914,6 +942,12 @@ export class Bid extends jspb.Message {
getSidecarTicket(): string;
setSidecarTicket(value: string): void;
getUnannouncedChannel(): boolean;
setUnannouncedChannel(value: boolean): void;
getZeroConfChannel(): boolean;
setZeroConfChannel(value: boolean): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Bid.AsObject;
static toObject(includeInstance: boolean, msg: Bid): Bid.AsObject;
@ -932,6 +966,8 @@ export namespace Bid {
minNodeTier: auctioneerrpc_auctioneer_pb.NodeTierMap[keyof auctioneerrpc_auctioneer_pb.NodeTierMap],
selfChanBalance: string,
sidecarTicket: string,
unannouncedChannel: boolean,
zeroConfChannel: boolean,
}
}
@ -947,6 +983,12 @@ export class Ask extends jspb.Message {
getVersion(): number;
setVersion(value: number): void;
getAnnouncementConstraints(): auctioneerrpc_auctioneer_pb.ChannelAnnouncementConstraintsMap[keyof auctioneerrpc_auctioneer_pb.ChannelAnnouncementConstraintsMap];
setAnnouncementConstraints(value: auctioneerrpc_auctioneer_pb.ChannelAnnouncementConstraintsMap[keyof auctioneerrpc_auctioneer_pb.ChannelAnnouncementConstraintsMap]): void;
getConfirmationConstraints(): auctioneerrpc_auctioneer_pb.ChannelConfirmationConstraintsMap[keyof auctioneerrpc_auctioneer_pb.ChannelConfirmationConstraintsMap];
setConfirmationConstraints(value: auctioneerrpc_auctioneer_pb.ChannelConfirmationConstraintsMap[keyof auctioneerrpc_auctioneer_pb.ChannelConfirmationConstraintsMap]): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Ask.AsObject;
static toObject(includeInstance: boolean, msg: Ask): Ask.AsObject;
@ -962,6 +1004,8 @@ export namespace Ask {
details?: Order.AsObject,
leaseDurationBlocks: number,
version: number,
announcementConstraints: auctioneerrpc_auctioneer_pb.ChannelAnnouncementConstraintsMap[keyof auctioneerrpc_auctioneer_pb.ChannelAnnouncementConstraintsMap],
confirmationConstraints: auctioneerrpc_auctioneer_pb.ChannelConfirmationConstraintsMap[keyof auctioneerrpc_auctioneer_pb.ChannelConfirmationConstraintsMap],
}
}
@ -1863,6 +1907,12 @@ export class DecodedSidecarTicket extends jspb.Message {
getEncodedTicket(): string;
setEncodedTicket(value: string): void;
getOfferUnannouncedChannel(): boolean;
setOfferUnannouncedChannel(value: boolean): void;
getOfferZeroConfChannel(): boolean;
setOfferZeroConfChannel(value: boolean): void;
serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): DecodedSidecarTicket.AsObject;
static toObject(includeInstance: boolean, msg: DecodedSidecarTicket): DecodedSidecarTicket.AsObject;
@ -1891,6 +1941,8 @@ export namespace DecodedSidecarTicket {
orderSignature: Uint8Array | string,
executionPendingChannelId: Uint8Array | string,
encodedTicket: string,
offerUnannouncedChannel: boolean,
offerZeroConfChannel: boolean,
}
}
@ -2036,6 +2088,14 @@ export namespace CancelSidecarResponse {
}
}
export interface AccountVersionMap {
ACCOUNT_VERSION_LND_DEPENDENT: 0;
ACCOUNT_VERSION_LEGACY: 1;
ACCOUNT_VERSION_TAPROOT: 2;
}
export const AccountVersion: AccountVersionMap;
export interface AccountStateMap {
PENDING_OPEN: 0;
PENDING_UPDATE: 1;

View file

@ -17,6 +17,7 @@ var global = Function('return this')();
var auctioneerrpc_auctioneer_pb = require('./auctioneerrpc/auctioneer_pb.js');
goog.exportSymbol('proto.poolrpc.Account', null, global);
goog.exportSymbol('proto.poolrpc.AccountState', null, global);
goog.exportSymbol('proto.poolrpc.AccountVersion', null, global);
goog.exportSymbol('proto.poolrpc.Ask', null, global);
goog.exportSymbol('proto.poolrpc.AuctionFeeRequest', null, global);
goog.exportSymbol('proto.poolrpc.AuctionFeeResponse', null, global);
@ -175,7 +176,8 @@ proto.poolrpc.InitAccountRequest.toObject = function(includeInstance, msg) {
relativeHeight: jspb.Message.getFieldWithDefault(msg, 3, 0),
confTarget: jspb.Message.getFieldWithDefault(msg, 4, 0),
feeRateSatPerKw: jspb.Message.getFieldWithDefault(msg, 6, "0"),
initiator: jspb.Message.getFieldWithDefault(msg, 5, "")
initiator: jspb.Message.getFieldWithDefault(msg, 5, ""),
version: jspb.Message.getFieldWithDefault(msg, 7, 0)
};
if (includeInstance) {
@ -236,6 +238,10 @@ proto.poolrpc.InitAccountRequest.deserializeBinaryFromReader = function(msg, rea
var value = /** @type {string} */ (reader.readString());
msg.setInitiator(value);
break;
case 7:
var value = /** @type {!proto.poolrpc.AccountVersion} */ (reader.readEnum());
msg.setVersion(value);
break;
default:
reader.skipField();
break;
@ -307,6 +313,13 @@ proto.poolrpc.InitAccountRequest.serializeBinaryToWriter = function(message, wri
f
);
}
f = message.getVersion();
if (f !== 0.0) {
writer.writeEnum(
7,
f
);
}
};
@ -456,6 +469,21 @@ proto.poolrpc.InitAccountRequest.prototype.setInitiator = function(value) {
};
/**
* optional AccountVersion version = 7;
* @return {!proto.poolrpc.AccountVersion}
*/
proto.poolrpc.InitAccountRequest.prototype.getVersion = function() {
return /** @type {!proto.poolrpc.AccountVersion} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
};
/** @param {!proto.poolrpc.AccountVersion} value */
proto.poolrpc.InitAccountRequest.prototype.setVersion = function(value) {
jspb.Message.setProto3EnumField(this, 7, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -2263,7 +2291,8 @@ proto.poolrpc.WithdrawAccountRequest.toObject = function(includeInstance, msg) {
proto.poolrpc.Output.toObject, includeInstance),
feeRateSatPerKw: jspb.Message.getFieldWithDefault(msg, 3, "0"),
absoluteExpiry: jspb.Message.getFieldWithDefault(msg, 4, 0),
relativeExpiry: jspb.Message.getFieldWithDefault(msg, 5, 0)
relativeExpiry: jspb.Message.getFieldWithDefault(msg, 5, 0),
newVersion: jspb.Message.getFieldWithDefault(msg, 6, 0)
};
if (includeInstance) {
@ -2321,6 +2350,10 @@ proto.poolrpc.WithdrawAccountRequest.deserializeBinaryFromReader = function(msg,
var value = /** @type {number} */ (reader.readUint32());
msg.setRelativeExpiry(value);
break;
case 6:
var value = /** @type {!proto.poolrpc.AccountVersion} */ (reader.readEnum());
msg.setNewVersion(value);
break;
default:
reader.skipField();
break;
@ -2386,6 +2419,13 @@ proto.poolrpc.WithdrawAccountRequest.serializeBinaryToWriter = function(message,
f
);
}
f = message.getNewVersion();
if (f !== 0.0) {
writer.writeEnum(
6,
f
);
}
};
@ -2532,6 +2572,21 @@ proto.poolrpc.WithdrawAccountRequest.prototype.hasRelativeExpiry = function() {
};
/**
* optional AccountVersion new_version = 6;
* @return {!proto.poolrpc.AccountVersion}
*/
proto.poolrpc.WithdrawAccountRequest.prototype.getNewVersion = function() {
return /** @type {!proto.poolrpc.AccountVersion} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
};
/** @param {!proto.poolrpc.AccountVersion} value */
proto.poolrpc.WithdrawAccountRequest.prototype.setNewVersion = function(value) {
jspb.Message.setProto3EnumField(this, 6, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -2819,7 +2874,8 @@ proto.poolrpc.DepositAccountRequest.toObject = function(includeInstance, msg) {
amountSat: jspb.Message.getFieldWithDefault(msg, 2, "0"),
feeRateSatPerKw: jspb.Message.getFieldWithDefault(msg, 3, "0"),
absoluteExpiry: jspb.Message.getFieldWithDefault(msg, 4, 0),
relativeExpiry: jspb.Message.getFieldWithDefault(msg, 5, 0)
relativeExpiry: jspb.Message.getFieldWithDefault(msg, 5, 0),
newVersion: jspb.Message.getFieldWithDefault(msg, 6, 0)
};
if (includeInstance) {
@ -2876,6 +2932,10 @@ proto.poolrpc.DepositAccountRequest.deserializeBinaryFromReader = function(msg,
var value = /** @type {number} */ (reader.readUint32());
msg.setRelativeExpiry(value);
break;
case 6:
var value = /** @type {!proto.poolrpc.AccountVersion} */ (reader.readEnum());
msg.setNewVersion(value);
break;
default:
reader.skipField();
break;
@ -2940,6 +3000,13 @@ proto.poolrpc.DepositAccountRequest.serializeBinaryToWriter = function(message,
f
);
}
f = message.getNewVersion();
if (f !== 0.0) {
writer.writeEnum(
6,
f
);
}
};
@ -3070,6 +3137,21 @@ proto.poolrpc.DepositAccountRequest.prototype.hasRelativeExpiry = function() {
};
/**
* optional AccountVersion new_version = 6;
* @return {!proto.poolrpc.AccountVersion}
*/
proto.poolrpc.DepositAccountRequest.prototype.getNewVersion = function() {
return /** @type {!proto.poolrpc.AccountVersion} */ (jspb.Message.getFieldWithDefault(this, 6, 0));
};
/** @param {!proto.poolrpc.AccountVersion} value */
proto.poolrpc.DepositAccountRequest.prototype.setNewVersion = function(value) {
jspb.Message.setProto3EnumField(this, 6, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -3356,7 +3438,8 @@ proto.poolrpc.RenewAccountRequest.toObject = function(includeInstance, msg) {
accountKey: msg.getAccountKey_asB64(),
absoluteExpiry: jspb.Message.getFieldWithDefault(msg, 2, 0),
relativeExpiry: jspb.Message.getFieldWithDefault(msg, 3, 0),
feeRateSatPerKw: jspb.Message.getFieldWithDefault(msg, 4, "0")
feeRateSatPerKw: jspb.Message.getFieldWithDefault(msg, 4, "0"),
newVersion: jspb.Message.getFieldWithDefault(msg, 5, 0)
};
if (includeInstance) {
@ -3409,6 +3492,10 @@ proto.poolrpc.RenewAccountRequest.deserializeBinaryFromReader = function(msg, re
var value = /** @type {string} */ (reader.readUint64String());
msg.setFeeRateSatPerKw(value);
break;
case 5:
var value = /** @type {!proto.poolrpc.AccountVersion} */ (reader.readEnum());
msg.setNewVersion(value);
break;
default:
reader.skipField();
break;
@ -3466,6 +3553,13 @@ proto.poolrpc.RenewAccountRequest.serializeBinaryToWriter = function(message, wr
f
);
}
f = message.getNewVersion();
if (f !== 0.0) {
writer.writeEnum(
5,
f
);
}
};
@ -3581,6 +3675,21 @@ proto.poolrpc.RenewAccountRequest.prototype.setFeeRateSatPerKw = function(value)
};
/**
* optional AccountVersion new_version = 5;
* @return {!proto.poolrpc.AccountVersion}
*/
proto.poolrpc.RenewAccountRequest.prototype.getNewVersion = function() {
return /** @type {!proto.poolrpc.AccountVersion} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
};
/** @param {!proto.poolrpc.AccountVersion} value */
proto.poolrpc.RenewAccountRequest.prototype.setNewVersion = function(value) {
jspb.Message.setProto3EnumField(this, 5, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -4153,7 +4262,8 @@ proto.poolrpc.Account.toObject = function(includeInstance, msg) {
availableBalance: jspb.Message.getFieldWithDefault(msg, 4, "0"),
expirationHeight: jspb.Message.getFieldWithDefault(msg, 5, 0),
state: jspb.Message.getFieldWithDefault(msg, 6, 0),
latestTxid: msg.getLatestTxid_asB64()
latestTxid: msg.getLatestTxid_asB64(),
version: jspb.Message.getFieldWithDefault(msg, 8, 0)
};
if (includeInstance) {
@ -4219,6 +4329,10 @@ proto.poolrpc.Account.deserializeBinaryFromReader = function(msg, reader) {
var value = /** @type {!Uint8Array} */ (reader.readBytes());
msg.setLatestTxid(value);
break;
case 8:
var value = /** @type {!proto.poolrpc.AccountVersion} */ (reader.readEnum());
msg.setVersion(value);
break;
default:
reader.skipField();
break;
@ -4298,6 +4412,13 @@ proto.poolrpc.Account.serializeBinaryToWriter = function(message, writer) {
f
);
}
f = message.getVersion();
if (f !== 0.0) {
writer.writeEnum(
8,
f
);
}
};
@ -4469,6 +4590,21 @@ proto.poolrpc.Account.prototype.setLatestTxid = function(value) {
};
/**
* optional AccountVersion version = 8;
* @return {!proto.poolrpc.AccountVersion}
*/
proto.poolrpc.Account.prototype.getVersion = function() {
return /** @type {!proto.poolrpc.AccountVersion} */ (jspb.Message.getFieldWithDefault(this, 8, 0));
};
/** @param {!proto.poolrpc.AccountVersion} value */
proto.poolrpc.Account.prototype.setVersion = function(value) {
jspb.Message.setProto3EnumField(this, 8, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -5740,7 +5876,9 @@ proto.poolrpc.Order.toObject = function(includeInstance, msg) {
minUnitsMatch: jspb.Message.getFieldWithDefault(msg, 12, 0),
channelType: jspb.Message.getFieldWithDefault(msg, 13, 0),
allowedNodeIdsList: msg.getAllowedNodeIdsList_asB64(),
notAllowedNodeIdsList: msg.getNotAllowedNodeIdsList_asB64()
notAllowedNodeIdsList: msg.getNotAllowedNodeIdsList_asB64(),
auctionType: jspb.Message.getFieldWithDefault(msg, 16, 0),
isPublic: jspb.Message.getFieldWithDefault(msg, 17, false)
};
if (includeInstance) {
@ -5838,6 +5976,14 @@ proto.poolrpc.Order.deserializeBinaryFromReader = function(msg, reader) {
var value = /** @type {!Uint8Array} */ (reader.readBytes());
msg.addNotAllowedNodeIds(value);
break;
case 16:
var value = /** @type {!proto.poolrpc.AuctionType} */ (reader.readEnum());
msg.setAuctionType(value);
break;
case 17:
var value = /** @type {boolean} */ (reader.readBool());
msg.setIsPublic(value);
break;
default:
reader.skipField();
break;
@ -5973,6 +6119,20 @@ proto.poolrpc.Order.serializeBinaryToWriter = function(message, writer) {
f
);
}
f = message.getAuctionType();
if (f !== 0.0) {
writer.writeEnum(
16,
f
);
}
f = message.getIsPublic();
if (f) {
writer.writeBool(
17,
f
);
}
};
@ -6341,6 +6501,38 @@ proto.poolrpc.Order.prototype.clearNotAllowedNodeIdsList = function() {
};
/**
* optional AuctionType auction_type = 16;
* @return {!proto.poolrpc.AuctionType}
*/
proto.poolrpc.Order.prototype.getAuctionType = function() {
return /** @type {!proto.poolrpc.AuctionType} */ (jspb.Message.getFieldWithDefault(this, 16, 0));
};
/** @param {!proto.poolrpc.AuctionType} value */
proto.poolrpc.Order.prototype.setAuctionType = function(value) {
jspb.Message.setProto3EnumField(this, 16, value);
};
/**
* optional bool is_public = 17;
* Note that Boolean fields may be set to 0/1 when serialized from a Java server.
* You should avoid comparisons like {@code val === true/false} in those cases.
* @return {boolean}
*/
proto.poolrpc.Order.prototype.getIsPublic = function() {
return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 17, false));
};
/** @param {boolean} value */
proto.poolrpc.Order.prototype.setIsPublic = function(value) {
jspb.Message.setProto3BooleanField(this, 17, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -6393,7 +6585,9 @@ proto.poolrpc.Bid.toObject = function(includeInstance, msg) {
version: jspb.Message.getFieldWithDefault(msg, 3, 0),
minNodeTier: jspb.Message.getFieldWithDefault(msg, 4, 0),
selfChanBalance: jspb.Message.getFieldWithDefault(msg, 5, "0"),
sidecarTicket: jspb.Message.getFieldWithDefault(msg, 6, "")
sidecarTicket: jspb.Message.getFieldWithDefault(msg, 6, ""),
unannouncedChannel: jspb.Message.getFieldWithDefault(msg, 7, false),
zeroConfChannel: jspb.Message.getFieldWithDefault(msg, 8, false)
};
if (includeInstance) {
@ -6455,6 +6649,14 @@ proto.poolrpc.Bid.deserializeBinaryFromReader = function(msg, reader) {
var value = /** @type {string} */ (reader.readString());
msg.setSidecarTicket(value);
break;
case 7:
var value = /** @type {boolean} */ (reader.readBool());
msg.setUnannouncedChannel(value);
break;
case 8:
var value = /** @type {boolean} */ (reader.readBool());
msg.setZeroConfChannel(value);
break;
default:
reader.skipField();
break;
@ -6527,6 +6729,20 @@ proto.poolrpc.Bid.serializeBinaryToWriter = function(message, writer) {
f
);
}
f = message.getUnannouncedChannel();
if (f) {
writer.writeBool(
7,
f
);
}
f = message.getZeroConfChannel();
if (f) {
writer.writeBool(
8,
f
);
}
};
@ -6635,6 +6851,40 @@ proto.poolrpc.Bid.prototype.setSidecarTicket = function(value) {
};
/**
* optional bool unannounced_channel = 7;
* Note that Boolean fields may be set to 0/1 when serialized from a Java server.
* You should avoid comparisons like {@code val === true/false} in those cases.
* @return {boolean}
*/
proto.poolrpc.Bid.prototype.getUnannouncedChannel = function() {
return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 7, false));
};
/** @param {boolean} value */
proto.poolrpc.Bid.prototype.setUnannouncedChannel = function(value) {
jspb.Message.setProto3BooleanField(this, 7, value);
};
/**
* optional bool zero_conf_channel = 8;
* Note that Boolean fields may be set to 0/1 when serialized from a Java server.
* You should avoid comparisons like {@code val === true/false} in those cases.
* @return {boolean}
*/
proto.poolrpc.Bid.prototype.getZeroConfChannel = function() {
return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 8, false));
};
/** @param {boolean} value */
proto.poolrpc.Bid.prototype.setZeroConfChannel = function(value) {
jspb.Message.setProto3BooleanField(this, 8, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -6684,7 +6934,9 @@ proto.poolrpc.Ask.toObject = function(includeInstance, msg) {
var f, obj = {
details: (f = msg.getDetails()) && proto.poolrpc.Order.toObject(includeInstance, f),
leaseDurationBlocks: jspb.Message.getFieldWithDefault(msg, 2, 0),
version: jspb.Message.getFieldWithDefault(msg, 3, 0)
version: jspb.Message.getFieldWithDefault(msg, 3, 0),
announcementConstraints: jspb.Message.getFieldWithDefault(msg, 4, 0),
confirmationConstraints: jspb.Message.getFieldWithDefault(msg, 5, 0)
};
if (includeInstance) {
@ -6734,6 +6986,14 @@ proto.poolrpc.Ask.deserializeBinaryFromReader = function(msg, reader) {
var value = /** @type {number} */ (reader.readUint32());
msg.setVersion(value);
break;
case 4:
var value = /** @type {!proto.poolrpc.ChannelAnnouncementConstraints} */ (reader.readEnum());
msg.setAnnouncementConstraints(value);
break;
case 5:
var value = /** @type {!proto.poolrpc.ChannelConfirmationConstraints} */ (reader.readEnum());
msg.setConfirmationConstraints(value);
break;
default:
reader.skipField();
break;
@ -6785,6 +7045,20 @@ proto.poolrpc.Ask.serializeBinaryToWriter = function(message, writer) {
f
);
}
f = message.getAnnouncementConstraints();
if (f !== 0.0) {
writer.writeEnum(
4,
f
);
}
f = message.getConfirmationConstraints();
if (f !== 0.0) {
writer.writeEnum(
5,
f
);
}
};
@ -6848,6 +7122,36 @@ proto.poolrpc.Ask.prototype.setVersion = function(value) {
};
/**
* optional ChannelAnnouncementConstraints announcement_constraints = 4;
* @return {!proto.poolrpc.ChannelAnnouncementConstraints}
*/
proto.poolrpc.Ask.prototype.getAnnouncementConstraints = function() {
return /** @type {!proto.poolrpc.ChannelAnnouncementConstraints} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
};
/** @param {!proto.poolrpc.ChannelAnnouncementConstraints} value */
proto.poolrpc.Ask.prototype.setAnnouncementConstraints = function(value) {
jspb.Message.setProto3EnumField(this, 4, value);
};
/**
* optional ChannelConfirmationConstraints confirmation_constraints = 5;
* @return {!proto.poolrpc.ChannelConfirmationConstraints}
*/
proto.poolrpc.Ask.prototype.getConfirmationConstraints = function() {
return /** @type {!proto.poolrpc.ChannelConfirmationConstraints} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
};
/** @param {!proto.poolrpc.ChannelConfirmationConstraints} value */
proto.poolrpc.Ask.prototype.setConfirmationConstraints = function(value) {
jspb.Message.setProto3EnumField(this, 5, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -12922,7 +13226,9 @@ proto.poolrpc.DecodedSidecarTicket.toObject = function(includeInstance, msg) {
orderBidNonce: msg.getOrderBidNonce_asB64(),
orderSignature: msg.getOrderSignature_asB64(),
executionPendingChannelId: msg.getExecutionPendingChannelId_asB64(),
encodedTicket: jspb.Message.getFieldWithDefault(msg, 16, "")
encodedTicket: jspb.Message.getFieldWithDefault(msg, 16, ""),
offerUnannouncedChannel: jspb.Message.getFieldWithDefault(msg, 17, false),
offerZeroConfChannel: jspb.Message.getFieldWithDefault(msg, 18, false)
};
if (includeInstance) {
@ -13023,6 +13329,14 @@ proto.poolrpc.DecodedSidecarTicket.deserializeBinaryFromReader = function(msg, r
var value = /** @type {string} */ (reader.readString());
msg.setEncodedTicket(value);
break;
case 17:
var value = /** @type {boolean} */ (reader.readBool());
msg.setOfferUnannouncedChannel(value);
break;
case 18:
var value = /** @type {boolean} */ (reader.readBool());
msg.setOfferZeroConfChannel(value);
break;
default:
reader.skipField();
break;
@ -13164,6 +13478,20 @@ proto.poolrpc.DecodedSidecarTicket.serializeBinaryToWriter = function(message, w
f
);
}
f = message.getOfferUnannouncedChannel();
if (f) {
writer.writeBool(
17,
f
);
}
f = message.getOfferZeroConfChannel();
if (f) {
writer.writeBool(
18,
f
);
}
};
@ -13601,6 +13929,40 @@ proto.poolrpc.DecodedSidecarTicket.prototype.setEncodedTicket = function(value)
};
/**
* optional bool offer_unannounced_channel = 17;
* Note that Boolean fields may be set to 0/1 when serialized from a Java server.
* You should avoid comparisons like {@code val === true/false} in those cases.
* @return {boolean}
*/
proto.poolrpc.DecodedSidecarTicket.prototype.getOfferUnannouncedChannel = function() {
return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 17, false));
};
/** @param {boolean} value */
proto.poolrpc.DecodedSidecarTicket.prototype.setOfferUnannouncedChannel = function(value) {
jspb.Message.setProto3BooleanField(this, 17, value);
};
/**
* optional bool offer_zero_conf_channel = 18;
* Note that Boolean fields may be set to 0/1 when serialized from a Java server.
* You should avoid comparisons like {@code val === true/false} in those cases.
* @return {boolean}
*/
proto.poolrpc.DecodedSidecarTicket.prototype.getOfferZeroConfChannel = function() {
return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 18, false));
};
/** @param {boolean} value */
proto.poolrpc.DecodedSidecarTicket.prototype.setOfferZeroConfChannel = function(value) {
jspb.Message.setProto3BooleanField(this, 18, value);
};
/**
* Generated by JsPbCodeGenerator.
@ -14646,6 +15008,15 @@ proto.poolrpc.CancelSidecarResponse.serializeBinaryToWriter = function(message,
};
/**
* @enum {number}
*/
proto.poolrpc.AccountVersion = {
ACCOUNT_VERSION_LND_DEPENDENT: 0,
ACCOUNT_VERSION_LEGACY: 1,
ACCOUNT_VERSION_TAPROOT: 2
};
/**
* @enum {number}
*/

View file

@ -392,6 +392,7 @@ export const poolInitAccount: POOL.Account.AsObject = {
state: POOL.AccountState.OPEN,
traderKey: 'Ap+9XjK2X8EOrmAJvcvWS1B9jt3xLYka0S7aMru0Bude',
value: '30000000',
version: POOL.AccountVersion.ACCOUNT_VERSION_LEGACY,
};
export const poolQuoteAccount: POOL.QuoteAccountResponse.AsObject = {
@ -442,6 +443,7 @@ export const poolListAccounts: POOL.ListAccountsResponse.AsObject = {
state: POOL.AccountState.OPEN,
traderKey: 'A1XCKczWrUUjZg4rmtYoQnji2mGEyLxM8FvIPZ9ZnRCk',
value: '15000000',
version: POOL.AccountVersion.ACCOUNT_VERSION_LEGACY,
},
{
availableBalance: '7773185',
@ -454,6 +456,7 @@ export const poolListAccounts: POOL.ListAccountsResponse.AsObject = {
state: POOL.AccountState.OPEN,
traderKey: 'A9Mua6d2a+1NZZ8knxJ/XtE3VENxQO4erD9Y3igCmH9q',
value: '10000000',
version: POOL.AccountVersion.ACCOUNT_VERSION_LEGACY,
},
],
};
@ -495,9 +498,14 @@ export const poolListOrders: POOL.ListOrdersResponse.AsObject = {
channelType: 1,
allowedNodeIdsList: [],
notAllowedNodeIdsList: [],
auctionType: AUCT.AuctionType.AUCTION_TYPE_BTC_INBOUND_LIQUIDITY,
isPublic: true,
},
leaseDurationBlocks: 2016,
version: 1,
announcementConstraints: AUCT.ChannelAnnouncementConstraints.ONLY_ANNOUNCED,
confirmationConstraints:
AUCT.ChannelConfirmationConstraints.CONFIRMATION_NO_PREFERENCE,
},
],
bidsList: [
@ -518,12 +526,16 @@ export const poolListOrders: POOL.ListOrdersResponse.AsObject = {
channelType: 1,
allowedNodeIdsList: [],
notAllowedNodeIdsList: [],
auctionType: AUCT.AuctionType.AUCTION_TYPE_BTC_INBOUND_LIQUIDITY,
isPublic: false,
},
leaseDurationBlocks: 2016,
version: 1,
minNodeTier: 1,
selfChanBalance: '0',
sidecarTicket: '',
unannouncedChannel: true,
zeroConfChannel: true,
},
{
details: {
@ -542,12 +554,16 @@ export const poolListOrders: POOL.ListOrdersResponse.AsObject = {
channelType: 1,
allowedNodeIdsList: [],
notAllowedNodeIdsList: [],
auctionType: AUCT.AuctionType.AUCTION_TYPE_BTC_INBOUND_LIQUIDITY,
isPublic: true,
},
leaseDurationBlocks: 2016,
version: 1,
minNodeTier: 1,
selfChanBalance: '0',
sidecarTicket: '',
unannouncedChannel: false,
zeroConfChannel: false,
},
{
details: {
@ -566,12 +582,16 @@ export const poolListOrders: POOL.ListOrdersResponse.AsObject = {
channelType: 1,
allowedNodeIdsList: [],
notAllowedNodeIdsList: [],
auctionType: AUCT.AuctionType.AUCTION_TYPE_BTC_INBOUND_LIQUIDITY,
isPublic: true,
},
leaseDurationBlocks: 2016,
version: 1,
minNodeTier: 1,
selfChanBalance: '0',
sidecarTicket: '',
unannouncedChannel: false,
zeroConfChannel: false,
},
{
details: {
@ -590,12 +610,16 @@ export const poolListOrders: POOL.ListOrdersResponse.AsObject = {
channelType: 1,
allowedNodeIdsList: [],
notAllowedNodeIdsList: [],
auctionType: AUCT.AuctionType.AUCTION_TYPE_BTC_INBOUND_LIQUIDITY,
isPublic: true,
},
leaseDurationBlocks: 2016,
version: 1,
minNodeTier: 1,
selfChanBalance: '0',
sidecarTicket: '',
unannouncedChannel: false,
zeroConfChannel: false,
},
],
};

6
go.mod
View file

@ -15,10 +15,10 @@ require (
github.com/lightninglabs/faraday v0.2.9-alpha
github.com/lightninglabs/lightning-node-connect v0.1.12-alpha
github.com/lightninglabs/lndclient v0.15.4-0
github.com/lightninglabs/loop v0.20.1-beta.0.20221020162445-0d887ac17390
github.com/lightninglabs/loop v0.20.2-beta
github.com/lightninglabs/loop/swapserverrpc v1.0.3
github.com/lightninglabs/pool v0.5.8-alpha
github.com/lightninglabs/pool/auctioneerrpc v1.0.7
github.com/lightninglabs/pool v0.6.1-beta.0.20221202155747-aec0aee8d9a1
github.com/lightninglabs/pool/auctioneerrpc v1.1.0
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
github.com/lightningnetwork/lnd v0.15.5-beta
github.com/lightningnetwork/lnd/cert v1.1.1

12
go.sum
View file

@ -560,8 +560,8 @@ github.com/lightninglabs/lndclient v0.15.0-0/go.mod h1:ORS/YFe9hAXlzN/Uj+gvTmrnX
github.com/lightninglabs/lndclient v0.15.1-5/go.mod h1:6pymu+B4mYQDWQH1Beu51Pnrj556xNlqOe5j1ITsADE=
github.com/lightninglabs/lndclient v0.15.4-0 h1:K+Biu0V94VRLBmc+DQJcU0KrRQI7wOndIAFpV7qIGiQ=
github.com/lightninglabs/lndclient v0.15.4-0/go.mod h1:bCUgwozVk/5O99DajpJxUfaCbjSXgHuis5WT2iC7B5c=
github.com/lightninglabs/loop v0.20.1-beta.0.20221020162445-0d887ac17390 h1:vXJvZJ2rSTryUmh64n3mx/Yi6TDHS+UwKBpBo33y1f8=
github.com/lightninglabs/loop v0.20.1-beta.0.20221020162445-0d887ac17390/go.mod h1:2ZC0KRnPSp4QhQh5hMn63l50l9n3PxPh5TonYJX0wNo=
github.com/lightninglabs/loop v0.20.2-beta h1:cqWUL0MvWqwF8o8Ba/Ya7KAGhRwKgcE1svG0WireASU=
github.com/lightninglabs/loop v0.20.2-beta/go.mod h1:2ZC0KRnPSp4QhQh5hMn63l50l9n3PxPh5TonYJX0wNo=
github.com/lightninglabs/loop/swapserverrpc v1.0.1/go.mod h1:imy1/sqnb70EEyBKMo4pHwwLBPW8uYahWZ8s+1Xcq1o=
github.com/lightninglabs/loop/swapserverrpc v1.0.3 h1:Uslz7QZ2MWKo00JrEumCqDs9S4hR6Is4cA2GsoTbLd8=
github.com/lightninglabs/loop/swapserverrpc v1.0.3/go.mod h1:imy1/sqnb70EEyBKMo4pHwwLBPW8uYahWZ8s+1Xcq1o=
@ -569,10 +569,10 @@ github.com/lightninglabs/neutrino v0.13.2/go.mod h1:Cv/v8oHiPhuGiGvGgO+rIMhwCwEd
github.com/lightninglabs/neutrino v0.14.1/go.mod h1:SV9ccrw2m6t6UvJX8xB//W0Dv+LEwMTbjg4V/Fb5KwU=
github.com/lightninglabs/neutrino v0.14.2 h1:yrnZUCYMZ5ECtXhgDrzqPq2oX8awoAN2D/cgCewJcCo=
github.com/lightninglabs/neutrino v0.14.2/go.mod h1:OICUeTCn+4Tu27YRJIpWvvqySxx4oH4vgdP33Sw9RDc=
github.com/lightninglabs/pool v0.5.8-alpha h1:+sCYlzBpXe07ALsp1b6IavaMKnHbHsNZuB7/T15PFfI=
github.com/lightninglabs/pool v0.5.8-alpha/go.mod h1:0DMGQcDuAPheqzWZEv8ZE0Qptdpl1KPwM4ERGjybIX8=
github.com/lightninglabs/pool/auctioneerrpc v1.0.7 h1:+a1ynzXAHDlFT4pOeKeAfV38rlwRX3wVdKnGxggtDEQ=
github.com/lightninglabs/pool/auctioneerrpc v1.0.7/go.mod h1:F9uND5Kpj2eYeYe0RLi8IWQHsRjQ88FUp8itkYmX1Mo=
github.com/lightninglabs/pool v0.6.1-beta.0.20221202155747-aec0aee8d9a1 h1:MuvbpEhS+jV6NMB2jKjKagq3lUh2w5qZiOGxNuciK30=
github.com/lightninglabs/pool v0.6.1-beta.0.20221202155747-aec0aee8d9a1/go.mod h1:x7jWw8GelJKxLf0sAwArUPxbp4FzTalK3+eWjGY/b0g=
github.com/lightninglabs/pool/auctioneerrpc v1.1.0 h1:XOhmaFKRvQ1smwkY9SRTA0+FCloTExuhaQX4jgtrBB0=
github.com/lightninglabs/pool/auctioneerrpc v1.1.0/go.mod h1:F9uND5Kpj2eYeYe0RLi8IWQHsRjQ88FUp8itkYmX1Mo=
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display h1:RZJ8H4ueU/aQ9pFtx5wqsuD3B/DezrewJeVwDKKYY8E=
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display/go.mod h1:2oKOBU042GKFHrdbgGiKax4xVrFiZu51lhacUZQ9MnE=
github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5 h1:TkKwqFcQTGYoI+VEqyxA8rxpCin8qDaYX0AfVRinT3k=

View file

@ -59,12 +59,25 @@ message ReserveAccountRequest {
The trader's account key.
*/
bytes trader_key = 3;
/*
The account version. Must be set to 0 for legacy (non-taproot) accounts.
*/
uint32 version = 4;
}
message ReserveAccountResponse {
/*
The base key of the auctioneer. This key should be tweaked with the trader's
per-batch tweaked key to obtain the corresponding per-batch tweaked
auctioneer key.
auctioneer key. Or, in case of the version 1, Taproot enabled account, the
trader and auctioneer key will be combined into a MuSig2 combined key that
is static throughout the lifetime of the account. The on-chain uniqueness of
the generated output will be ensured by the merkle root hash that is applied
as a tweak to the MuSig2 combined internal key. The merkle root hash is
either the hash of the timeout script path (which uses the trader key
tweaked with the per-batch key) directly or the root of a tree with one leaf
that is the timeout script path and a leaf that is a Taro commitment (which
is a root hash by itself).
*/
bytes auctioneer_key = 1;
@ -86,7 +99,10 @@ message ServerInitAccountRequest {
OutPoint account_point = 1;
/*
The script used to create the account point.
The script used to create the account point. For version 1 (Taproot enabled)
accounts this represents the 32-byte (x-only) Taproot public key with the
combined MuSig2 key of the auctioneer's key and the trader's key with the
expiry script path applied as a single tapscript leaf.
*/
bytes account_script = 2;
@ -114,6 +130,11 @@ message ServerInitAccountRequest {
// poold/v0.4.2-beta/commit=3b635821,initiator=pool-cli
// litd/v0.4.0-alpha/commit=326d754,initiator=lit-ui
string user_agent = 6;
/*
The account version. Must be set to 0 for legacy (non-taproot) accounts.
*/
uint32 version = 7;
}
message ServerInitAccountResponse {
}
@ -388,6 +409,11 @@ message OrderMatchSign {
transaction. The map key corresponds to the trader's account key of the
account in the batch transaction. The account key/ID has to be hex encoded
into a string because protobuf doesn't allow bytes as a map key data type.
For version 1 (Taproot enabled) accounts, this merely represents a partial
MuSig2 signature that can be combined into a full signature by the auction
server by adding its own partial signature. A set of nonces will be provided
by the trader for each v1 account to allow finalizing the MuSig2 signing
session.
*/
map<string, bytes> account_sigs = 2;
@ -398,6 +424,14 @@ message OrderMatchSign {
outpoint.
*/
map<string, ChannelInfo> channel_infos = 3;
/*
A set of 66-byte nonces for each version 1 (Taproot enabled) account. The
nonces can be used to produce a MuSig2 partial signature to spend the
account using the key spend path, which is a MuSig2 combined key of the
auctioneer key and the trader key.
*/
map<string, bytes> trader_nonces = 4;
}
message AccountRecovery {
@ -561,11 +595,38 @@ message OrderMatchPrepare {
uint32 batch_height_hint = 11;
}
message TxOut {
/*
The value of the transaction output in satoshis.
*/
uint64 value = 1 [jstype = JS_STRING];
/*
The public key script of the output.
*/
bytes pk_script = 2;
}
message OrderMatchSignBegin {
/*
The 32 byte unique identifier of this batch.
*/
bytes batch_id = 1;
/*
A set of 66-byte nonces for each version 1 (Taproot enabled) account. The
nonces can be used to produce a MuSig2 partial signature to spend the
account using the key spend path, which is a MuSig2 combined key of the
auctioneer key and the trader key.
*/
map<string, bytes> server_nonces = 2;
/*
The full list of UTXO information for each of the inputs being spent. This
is required when spending one or more Taproot enabled (account version 1)
outputs.
*/
repeated TxOut prev_outputs = 3;
}
message OrderMatchFinalize {
@ -728,6 +789,11 @@ message AuctionAccount {
after the account has met its initial funding confirmation.
*/
bytes latest_tx = 9;
/*
The account version. Will be set to 0 for legacy (non-taproot) accounts.
*/
uint32 version = 10;
}
message MatchedOrder {
@ -806,6 +872,13 @@ message AccountDiff {
value.
*/
uint32 new_expiry = 5;
/*
The new account version used to verify the batch. If this is non-zero, it
means the account was automatically upgraded to the given version during the
batch execution.
*/
uint32 new_version = 6;
}
enum OrderChannelType {
@ -826,6 +899,20 @@ enum OrderChannelType {
ORDER_CHANNEL_TYPE_SCRIPT_ENFORCED = 2;
}
enum AuctionType {
/*
Default auction type where the bidder is paying for getting bitcoin inbound
liqiudity from the asker.
*/
AUCTION_TYPE_BTC_INBOUND_LIQUIDITY = 0;
/*
Auction type where the bidder is paying the asker to accept a channel
(bitcoin outbound liquidity) from the bidder.
*/
AUCTION_TYPE_BTC_OUTBOUND_LIQUIDITY = 1;
}
message ServerOrder {
/*
The trader's account key of the account to use for the order.
@ -901,6 +988,13 @@ message ServerOrder {
// List of nodes that won't be allowed to match with our order. Incompatible
// with the `allowed_node_ids` field.
repeated bytes not_allowed_node_ids = 15;
// Auction type where this order must be considered during the matching.
AuctionType auction_type = 16;
// Flag used to signal that this order can be shared in public market
// places.
bool is_public = 17;
}
enum NodeTier {
@ -920,6 +1014,20 @@ enum NodeTier {
TIER_1 = 2;
}
// Channel announcement constraints for matched channels.
enum ChannelAnnouncementConstraints {
ANNOUNCEMENT_NO_PREFERENCE = 0;
ONLY_ANNOUNCED = 1;
ONLY_UNANNOUNCED = 2;
}
// Channel confirmation constraints for matched channels.
enum ChannelConfirmationConstraints {
CONFIRMATION_NO_PREFERENCE = 0;
ONLY_CONFIRMED = 1;
ONLY_ZEROCONF = 2;
}
message ServerBid {
/*
The common fields shared between both ask and bid order types.
@ -952,9 +1060,9 @@ message ServerBid {
Give the incoming channel that results from this bid being matched an
initial outbound balance by adding additional funds from the taker's account
into the channel. As a simplification for the execution protocol and the
channel reserve calculations, the self_chan_balance can be at most the same
as the order amount and the min_chan_amt must be set to the full order
amount.
channel reserve calculations the min_chan_amt must be set to the full order
amount. For the inbound liquidity market the self_chan_balance can be at
most the same as the order amount.
*/
uint64 self_chan_balance = 6 [jstype = JS_STRING];
@ -965,6 +1073,16 @@ message ServerBid {
correspond to the recipient node's details.
*/
bool is_sidecar_channel = 7;
/*
Signals if this bid is interested in an announced or unannounced channel.
*/
bool unannounced_channel = 8;
/*
Signals if this bid is interested in a zero conf channel or not.
*/
bool zero_conf_channel = 9;
}
message ServerAsk {
@ -984,6 +1102,17 @@ message ServerAsk {
features are added.
*/
uint32 version = 5;
/*
The constraints for selling the liquidity based on channel discoverability.
*/
ChannelAnnouncementConstraints announcement_constraints = 6;
/*
The constraints for selling the liquidity based on the number of
blocks before considering the channel confirmed.
*/
ChannelConfirmationConstraints confirmation_constraints = 7;
}
message CancelOrder {
@ -1043,18 +1172,48 @@ message ServerModifyAccountRequest {
// The new expiry of the account as an absolute height.
uint32 expiry = 2;
// The new version of the account.
uint32 version = 3;
}
// The new parameters to apply for the account.
NewAccountParameters new_params = 4;
/*
A set of 66-byte nonces for each version 1 (Taproot enabled) account. The
nonces can be used to produce a MuSig2 partial signature to spend the
account using the key spend path, which is a MuSig2 combined key of the
auctioneer key and the trader key.
*/
bytes trader_nonces = 5;
/*
The full list of UTXO information for each of the inputs being spent. This
is required when spending a Taproot enabled (account version 1) output or
when adding additional Taproot inputs.
*/
repeated TxOut prev_outputs = 6;
}
message ServerModifyAccountResponse {
/*
The auctioneer's signature that allows a trader to broadcast a transaction
spending from an account output.
spending from an account output. For version 1 (Taproot enabled) accounts,
this merely represents a partial MuSig2 signature that can be combined into
a full signature by the trader daemon by adding its own partial signature. A
set of nonces will be provided by the server (in case this is a v1 account)
to allow finalizing the MuSig2 signing session.
*/
bytes account_sig = 1;
/*
An optional set of 66-byte nonces for a version 1 (Taproot enabled) account
spend. The nonces can be used to produce a MuSig2 partial signature to spend
the account using the key spend path, which is a MuSig2 combined key of the
auctioneer key and the trader key.
*/
bytes server_nonces = 2;
}
message ServerOrderStateRequest {

View file

@ -637,6 +637,7 @@ enum OutputScriptType {
SCRIPT_TYPE_NULLDATA = 6;
SCRIPT_TYPE_NON_STANDARD = 7;
SCRIPT_TYPE_WITNESS_UNKNOWN = 8;
SCRIPT_TYPE_WITNESS_V1_TAPROOT = 9;
}
message OutputDetail {

View file

@ -207,6 +207,26 @@ service Trader {
rpc CancelSidecar (CancelSidecarRequest) returns (CancelSidecarResponse);
}
enum AccountVersion {
/*
Let the version of lnd decide. If a version of lnd >= 0.15.0-beta is
detected then a Taproot account is created. For earlier versions a legacy
account is created.
*/
ACCOUNT_VERSION_LND_DEPENDENT = 0;
/*
A legacy SegWit v0 p2wsh account with a single script.
*/
ACCOUNT_VERSION_LEGACY = 1;
/*
A Taproot enabled account with MuSig2 combined internal key and the expiry
script as a single tap script leaf.
*/
ACCOUNT_VERSION_TAPROOT = 2;
}
message InitAccountRequest {
uint64 account_value = 1 [jstype = JS_STRING];
@ -236,6 +256,11 @@ message InitAccountRequest {
the account (pool CLI, LiT UI, other 3rd party UI).
*/
string initiator = 5;
/*
The version of account to create.
*/
AccountVersion version = 7;
}
message QuoteAccountRequest {
@ -346,6 +371,13 @@ message WithdrawAccountRequest {
// The new relative expiration height of the account.
uint32 relative_expiry = 5;
}
/*
The new version of the account. If this is set and is a valid version
greater than the account's current version, then the account is upgraded to
that version during the withdrawal.
*/
AccountVersion new_version = 6;
}
message WithdrawAccountResponse {
// The state of the account after processing the withdrawal.
@ -377,6 +409,13 @@ message DepositAccountRequest {
// The new relative expiration height of the account.
uint32 relative_expiry = 5;
}
/*
The new version of the account. If this is set and is a valid version
greater than the account's current version, then the account is upgraded to
that version during the deposit.
*/
AccountVersion new_version = 6;
}
message DepositAccountResponse {
// The state of the account after processing the deposit.
@ -400,6 +439,13 @@ message RenewAccountRequest {
// The fee rate, in satoshis per kw, to use for the renewal transaction.
uint64 fee_rate_sat_per_kw = 4 [jstype = JS_STRING];
/*
The new version of the account. If this is set and is a valid version
greater than the account's current version, then the account is upgraded to
that version during the renewal.
*/
AccountVersion new_version = 5;
}
message RenewAccountResponse {
// The state of the account after processing the renewal.
@ -498,6 +544,9 @@ message Account {
// The hash of the account's latest transaction.
bytes latest_txid = 7;
// The current version of the account.
AccountVersion version = 8;
}
message SubmitOrderRequest {
@ -628,6 +677,13 @@ message Order {
// List of nodes that won't be allowed to match with our order. Incompatible
// with the `allowed_node_ids` field.
repeated bytes not_allowed_node_ids = 15;
// Auction type where this order must be considered during the matching.
AuctionType auction_type = 16;
// Flag used to signal that this order can be shared in public market
// places.
bool is_public = 17;
}
message Bid {
@ -658,9 +714,9 @@ message Bid {
Give the incoming channel that results from this bid being matched an
initial outbound balance by adding additional funds from the taker's account
into the channel. As a simplification for the execution protocol and the
channel reserve calculations, the self_chan_balance can be at most the same
as the order amount and the min_chan_amt must be set to the full order
amount.
channel reserve calculations the min_chan_amt must be set to the full order
amount. For the inbound liquidity market the self_chan_balance can be at
most the same as the order amount.
*/
uint64 self_chan_balance = 5 [jstype = JS_STRING];
@ -671,6 +727,16 @@ message Bid {
the base58 encoded ticket, including the prefix and the checksum.
*/
string sidecar_ticket = 6;
/*
Signals if this bid is interested in an announced or unannounced channel.
*/
bool unannounced_channel = 7;
/*
Signals if this bid is interested in a zero conf channel or not.
*/
bool zero_conf_channel = 8;
}
message Ask {
@ -690,6 +756,17 @@ message Ask {
features are added.
*/
uint32 version = 3;
/*
The constraints for selling the liquidity based on channel discoverability.
*/
ChannelAnnouncementConstraints announcement_constraints = 4;
/*
The constraints for selling the liquidity based on the number of
blocks before considering the channel confirmed.
*/
ChannelConfirmationConstraints confirmation_constraints = 5;
}
message QuoteOrderRequest {
@ -1302,6 +1379,14 @@ message DecodedSidecarTicket {
// The original, base58 encoded ticket.
string encoded_ticket = 16;
// If true, the channel acceptor for this ticket will expect an unannounced
// channel.
bool offer_unannounced_channel = 17;
// If true, the channel acceptor for this ticket will expect a zero conf
// channel.
bool offer_zero_conf_channel = 18;
}
message RegisterSidecarRequest {

View file

@ -124,7 +124,7 @@ var (
minimalCompatibleVersion = &verrpc.Version{
AppMajor: 0,
AppMinor: 15,
AppPatch: 1,
AppPatch: 4,
BuildTags: []string{
"signrpc", "walletrpc", "chainrpc", "invoicesrpc",
},

View file

@ -23,7 +23,7 @@ const semanticAlphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr
const (
appMajor uint = 0
appMinor uint = 8
appPatch uint = 4
appPatch uint = 5
// appPreRelease MUST only contain characters from semanticAlphabet per
// the semantic versioning spec.