From 73de96e253f3a68cdc43d3d66f6bb51ee16d4396 Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Thu, 25 Aug 2022 10:00:16 +0200 Subject: [PATCH 1/3] app/src: run make protos and update sampleData To prepare for the next Lit release, we run `make protos` and make sure that `make build` runs without error by updating the sampleData.ts with the new createdAt field. --- app/src/types/generated/lit-sessions_pb.d.ts | 4 +++ app/src/types/generated/lit-sessions_pb.js | 29 +++++++++++++++++++- app/src/util/tests/sampleData.ts | 2 ++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/src/types/generated/lit-sessions_pb.d.ts b/app/src/types/generated/lit-sessions_pb.d.ts index bb2dbd7b5..bcb25cd54 100644 --- a/app/src/types/generated/lit-sessions_pb.d.ts +++ b/app/src/types/generated/lit-sessions_pb.d.ts @@ -128,6 +128,9 @@ export class Session extends jspb.Message { getRemotePublicKey_asB64(): string; setRemotePublicKey(value: Uint8Array | string): void; + getCreatedAt(): string; + setCreatedAt(value: string): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): Session.AsObject; static toObject(includeInstance: boolean, msg: Session): Session.AsObject; @@ -150,6 +153,7 @@ export namespace Session { pairingSecretMnemonic: string, localPublicKey: Uint8Array | string, remotePublicKey: Uint8Array | string, + createdAt: string, } } diff --git a/app/src/types/generated/lit-sessions_pb.js b/app/src/types/generated/lit-sessions_pb.js index affa48e59..7e66b4b75 100644 --- a/app/src/types/generated/lit-sessions_pb.js +++ b/app/src/types/generated/lit-sessions_pb.js @@ -713,7 +713,8 @@ proto.litrpc.Session.toObject = function(includeInstance, msg) { pairingSecret: msg.getPairingSecret_asB64(), pairingSecretMnemonic: jspb.Message.getFieldWithDefault(msg, 8, ""), localPublicKey: msg.getLocalPublicKey_asB64(), - remotePublicKey: msg.getRemotePublicKey_asB64() + remotePublicKey: msg.getRemotePublicKey_asB64(), + createdAt: jspb.Message.getFieldWithDefault(msg, 11, "0") }; if (includeInstance) { @@ -790,6 +791,10 @@ proto.litrpc.Session.deserializeBinaryFromReader = function(msg, reader) { var value = /** @type {!Uint8Array} */ (reader.readBytes()); msg.setRemotePublicKey(value); break; + case 11: + var value = /** @type {string} */ (reader.readUint64String()); + msg.setCreatedAt(value); + break; default: reader.skipField(); break; @@ -889,6 +894,13 @@ proto.litrpc.Session.serializeBinaryToWriter = function(message, writer) { f ); } + f = message.getCreatedAt(); + if (parseInt(f, 10) !== 0) { + writer.writeUint64String( + 11, + f + ); + } }; @@ -1116,6 +1128,21 @@ proto.litrpc.Session.prototype.setRemotePublicKey = function(value) { }; +/** + * optional uint64 created_at = 11; + * @return {string} + */ +proto.litrpc.Session.prototype.getCreatedAt = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, "0")); +}; + + +/** @param {string} value */ +proto.litrpc.Session.prototype.setCreatedAt = function(value) { + jspb.Message.setProto3StringIntField(this, 11, value); +}; + + /** * Generated by JsPbCodeGenerator. diff --git a/app/src/util/tests/sampleData.ts b/app/src/util/tests/sampleData.ts index 893c8c0ba..4e878af18 100644 --- a/app/src/util/tests/sampleData.ts +++ b/app/src/util/tests/sampleData.ts @@ -864,6 +864,7 @@ export const litListSessions: LIT.ListSessionsResponse.AsObject = { remotePublicKey: '', sessionState: LIT.SessionState.STATE_CREATED, sessionType: LIT.SessionType.TYPE_UI_PASSWORD, + createdAt: '253300000000', }, { devServer: true, @@ -876,6 +877,7 @@ export const litListSessions: LIT.ListSessionsResponse.AsObject = { remotePublicKey: '', sessionState: LIT.SessionState.STATE_EXPIRED, sessionType: LIT.SessionType.TYPE_UI_PASSWORD, + createdAt: '253300000000', }, ], }; From e749d2f6bb4d29bc2b98f67ad307b63a6b31db75 Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Thu, 25 Aug 2022 10:01:59 +0200 Subject: [PATCH 2/3] version+README: prepare for release of v0.7.1-alpha --- README.md | 2 ++ version.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d0557d119..afac59f4d 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ Lightning Terminal is backwards compatible with `lnd` back to version v0.14.3-be | LiT | LND | |------------------|--------------| +| **v0.7.1-alpha** | v0.14.3-beta | | **v0.7.0-alpha** | v0.14.3-beta | | **v0.6.7-alpha** | v0.13.3-beta | | **v0.6.6-alpha** | v0.13.3-beta | @@ -118,6 +119,7 @@ The following table shows the supported combinations: | LiT | LND | Loop | Faraday | Pool | |------------------|--------------|--------------|--------------|--------------| +| **v0.7.1-alpha** | v0.15.0-beta | v0.19.1-beta | v0.2.8-alpha | v0.5.7-alpha | | **v0.7.0-alpha** | v0.15.0-beta | v0.19.1-beta | v0.2.8-alpha | v0.5.7-alpha | | **v0.6.7-alpha** | v0.14.3-beta | v0.18.0-beta | v0.2.7-alpha | v0.5.6-alpha | | **v0.6.6-alpha** | v0.14.3-beta | v0.18.0-beta | v0.2.7-alpha | v0.5.6-alpha | diff --git a/version.go b/version.go index 02386c9d9..6c9b73539 100644 --- a/version.go +++ b/version.go @@ -23,7 +23,7 @@ const semanticAlphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqr const ( appMajor uint = 0 appMinor uint = 7 - appPatch uint = 0 + appPatch uint = 1 // appPreRelease MUST only contain characters from semanticAlphabet per // the semantic versioning spec. From bfdbb9f39708cfe8f361cc8b8e4b4bab2e9ff87e Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Thu, 25 Aug 2022 10:44:38 +0200 Subject: [PATCH 3/3] go.mod: use new LNC tag --- go.mod | 4 ++-- go.sum | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 219569641..509f2af41 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,9 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0 github.com/improbable-eng/grpc-web v0.12.0 github.com/jessevdk/go-flags v1.4.0 + github.com/lightninglabs/aperture v0.1.18-beta github.com/lightninglabs/faraday v0.2.8-alpha.0.20220624141723-ddd3cd123e62 - github.com/lightninglabs/lightning-node-connect v0.1.11-alpha.0.20220822151854-c072f70315d8 + github.com/lightninglabs/lightning-node-connect v0.1.12-alpha github.com/lightninglabs/lndclient v0.15.0-10 github.com/lightninglabs/loop v0.19.1-beta.0.20220623090540-08209f61e304 github.com/lightninglabs/loop/swapserverrpc v1.0.1 @@ -98,7 +99,6 @@ require ( github.com/klauspost/compress v1.13.6 // indirect github.com/klauspost/pgzip v1.2.5 // indirect github.com/lib/pq v1.10.3 // indirect - github.com/lightninglabs/aperture v0.1.18-beta // indirect github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 // indirect github.com/lightninglabs/neutrino v0.14.2 // indirect diff --git a/go.sum b/go.sum index c1ff6c5eb..3c127f28b 100644 --- a/go.sum +++ b/go.sum @@ -541,8 +541,8 @@ github.com/lightninglabs/faraday v0.2.8-alpha.0.20220624141723-ddd3cd123e62 h1:t github.com/lightninglabs/faraday v0.2.8-alpha.0.20220624141723-ddd3cd123e62/go.mod h1:9kcDuyINNf4RB6vrmPLAMGZmYgN0oPxhdt3IicL9sQY= 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/lightning-node-connect v0.1.11-alpha.0.20220822151854-c072f70315d8 h1:FYZ63sERRC2RjVbsAeO55uF7kTIYCClHmd59dZSsyx0= -github.com/lightninglabs/lightning-node-connect v0.1.11-alpha.0.20220822151854-c072f70315d8/go.mod h1:dgyhE+O4GpWBhS7yIzKCm8LqFHX8/QRwJ6OWFrN+WnA= +github.com/lightninglabs/lightning-node-connect v0.1.12-alpha h1:S/S2EmOoTsa6cCDcJjnHGvzkhf69XH7qJ4nMYBVpqwc= +github.com/lightninglabs/lightning-node-connect v0.1.12-alpha/go.mod h1:dgyhE+O4GpWBhS7yIzKCm8LqFHX8/QRwJ6OWFrN+WnA= github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2XZwcfE4xoS5AILqP1mj7kqnhbBSxW9BDxY= github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4= github.com/lightninglabs/lndclient v0.15.0-0/go.mod h1:ORS/YFe9hAXlzN/Uj+gvTmrnXEml6yD6dWwzCjpTJyQ=