Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.

Commit 3fad372

Browse files
authored
Merge pull request #1274 from lightninglabs/dev/upgrade-to-lnd-0.7.1
Dev/upgrade to lnd 0.7.1
2 parents 91aad11 + 07da4b7 commit 3fad372

File tree

5 files changed

+67
-9
lines changed

5 files changed

+67
-9
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ matrix:
1313

1414
env:
1515
global:
16-
- LND_TAG=36983214e8f7d24042fda61b048bb41daf6061da
16+
- LND_TAG=add905d17f7bbb11d0df2761cdf8accf2fef2b00
1717
- BTCD_TAG=16327141da8ce4b46b5bac57ba01352943465d9e
18-
- GO_TAG=1.12.1
18+
- GO_TAG=1.12.7
1919
- GOROOT=$HOME/go
2020
- GOPATH=$HOME/gocode
2121
- PATH=$GOPATH/bin:$GOROOT/bin:$PATH

assets/rpc.proto

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,9 @@ message Transaction {
814814

815815
/// Addresses that received funds for this transaction
816816
repeated string dest_addresses = 8 [ json_name = "dest_addresses" ];
817+
818+
/// The raw transaction hex.
819+
string raw_tx_hex = 9 [ json_name = "raw_tx_hex" ];
817820
}
818821
message GetTransactionsRequest {
819822
}
@@ -1158,6 +1161,14 @@ message Channel {
11581161

11591162
/// A set of flags showing the current state of the channel.
11601163
string chan_status_flags = 19 [json_name = "chan_status_flags"];
1164+
1165+
/// The minimum satoshis this node is required to reserve in its balance.
1166+
int64 local_chan_reserve_sat = 20 [json_name = "local_chan_reserve_sat"];
1167+
1168+
/**
1169+
The minimum satoshis the other node is required to reserve in its balance.
1170+
*/
1171+
int64 remote_chan_reserve_sat = 21 [json_name = "remote_chan_reserve_sat"];
11611172
}
11621173

11631174

@@ -1465,6 +1476,15 @@ message PendingChannelsResponse {
14651476

14661477
int64 local_balance = 4 [ json_name = "local_balance" ];
14671478
int64 remote_balance = 5 [ json_name = "remote_balance" ];
1479+
1480+
/// The minimum satoshis this node is required to reserve in its balance.
1481+
int64 local_chan_reserve_sat = 6 [json_name = "local_chan_reserve_sat"];
1482+
1483+
/**
1484+
The minimum satoshis the other node is required to reserve in its
1485+
balance.
1486+
*/
1487+
int64 remote_chan_reserve_sat = 7 [json_name = "remote_chan_reserve_sat"];
14681488
}
14691489

14701490
message PendingOpenChannel {
@@ -1631,6 +1651,12 @@ message QueryRoutesRequest {
16311651
self is assumed.
16321652
*/
16331653
string source_pub_key = 8;
1654+
1655+
/**
1656+
If set to true, edge probabilities from mission control will be used to get
1657+
the optimal route.
1658+
*/
1659+
bool use_mission_control = 9;
16341660
}
16351661

16361662
message EdgeLocator {
@@ -1723,6 +1749,9 @@ message Route {
17231749
message NodeInfoRequest {
17241750
/// The 33-byte hex-encoded compressed public of the target node
17251751
string pub_key = 1;
1752+
1753+
/// If true, will include all known channels associated with the node.
1754+
bool include_channels = 2;
17261755
}
17271756

17281757
message NodeInfo {
@@ -1771,6 +1800,7 @@ message RoutingPolicy {
17711800
int64 fee_rate_milli_msat = 4 [json_name = "fee_rate_milli_msat"];
17721801
bool disabled = 5 [json_name = "disabled"];
17731802
uint64 max_htlc_msat = 6 [json_name = "max_htlc_msat"];
1803+
uint32 last_update = 7 [json_name = "last_update"];
17741804
}
17751805

17761806
/**
@@ -1790,7 +1820,7 @@ message ChannelEdge {
17901820
uint64 channel_id = 1 [json_name = "channel_id"];
17911821
string chan_point = 2 [json_name = "chan_point"];
17921822

1793-
uint32 last_update = 3 [json_name = "last_update"];
1823+
uint32 last_update = 3 [json_name = "last_update", deprecated = true];
17941824

17951825
string node1_pub = 4 [json_name = "node1_pub"];
17961826
string node2_pub = 5 [json_name = "node2_pub"];
@@ -1845,6 +1875,9 @@ message NetworkInfo {
18451875
int64 max_channel_size = 9 [json_name = "max_channel_size"];
18461876
int64 median_channel_size_sat = 10 [json_name = "median_channel_size_sat"];
18471877

1878+
// The number of edges marked as zombies.
1879+
uint64 num_zombie_chans = 11 [json_name = "num_zombie_chans"];
1880+
18481881
// TODO(roasbeef): fee rate info, expiry
18491882
// * also additional RPC for tracking fee info once in
18501883
}
@@ -2141,8 +2174,8 @@ message Payment {
21412174
/// The path this payment took
21422175
repeated string path = 4 [ json_name = "path" ];
21432176

2144-
/// The fee paid for this payment in satoshis
2145-
int64 fee = 5 [json_name = "fee"];
2177+
/// Deprecated, use fee_sat or fee_msat.
2178+
int64 fee = 5 [json_name = "fee", deprecated = true];
21462179

21472180
/// The payment preimage
21482181
string payment_preimage = 6 [json_name = "payment_preimage"];
@@ -2155,9 +2188,31 @@ message Payment {
21552188

21562189
/// The optional payment request being fulfilled.
21572190
string payment_request = 9 [json_name = "payment_request"];
2191+
2192+
enum PaymentStatus {
2193+
UNKNOWN = 0;
2194+
IN_FLIGHT = 1;
2195+
SUCCEEDED = 2;
2196+
FAILED = 3;
2197+
}
2198+
2199+
// The status of the payment.
2200+
PaymentStatus status = 10 [json_name = "status"];
2201+
2202+
/// The fee paid for this payment in satoshis
2203+
int64 fee_sat = 11 [json_name = "fee_sat"];
2204+
2205+
/// The fee paid for this payment in milli-satoshis
2206+
int64 fee_msat = 12 [json_name = "fee_msat"];
21582207
}
21592208

21602209
message ListPaymentsRequest {
2210+
/**
2211+
If true, then return payments that have not yet fully completed. This means
2212+
that pending payments, as well as failed payments will show up if this
2213+
field is set to True.
2214+
*/
2215+
bool include_incomplete = 1;
21612216
}
21622217

21632218
message ListPaymentsResponse {

mobile/README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ This project was bootstrapped using [Expo CLI as a bare project](https://blog.ex
1414
* watchman (brew install watchman)
1515
* Xcode
1616
* cocoapods 1.7.2 (brew install cocoapods)
17-
* go 1.11.6 (brew install go@1.11)
18-
* [gomobile](https://github.com/golang/go/wiki/Mobile)
17+
* go 1.12.7 (brew install go)
18+
* protoc (brew install protobuf)
19+
* [gomobile](https://github.com/golang/go/wiki/Mobile) (go get -u golang.org/x/mobile/cmd/gomobile)
20+
* falafel (go get -u github.com/halseth/falafel)
1921
* [lnd mobile build tools](https://github.com/lightninglabs/lnd/tree/mobile-autopilot-100)
2022
* [Java](https://www.oracle.com/technetwork/java/javase/downloads/index.html)
2123
* [Android Studio](https://developer.android.com/studio)
@@ -24,7 +26,6 @@ This project was bootstrapped using [Expo CLI as a bare project](https://blog.ex
2426
### Building
2527

2628
```
27-
go get golang.org/x/mobile/cmd/gomobile
2829
cd lnd
2930
make clean
3031
gomobile init

mobile/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,4 +280,4 @@ SPEC CHECKSUMS:
280280

281281
PODFILE CHECKSUM: 6ba37724914ffcea4e9e5176c7d6adc64f69901d
282282

283-
COCOAPODS: 1.7.4
283+
COCOAPODS: 1.7.5

test/integration/action/action-integration.spec.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ describe('Action Integration Tests', function() {
115115

116116
lndProcess1 = await lndProcess1Promise;
117117
lndProcess2 = await lndProcess2Promise;
118+
await nap(NAP_TIME);
118119
};
119120

120121
before(async () => {
@@ -556,6 +557,7 @@ describe('Action Integration Tests', function() {
556557
};
557558

558559
const updateBalances = async () => {
560+
await nap(NAP_TIME);
559561
await wallet1.getBalance();
560562
await wallet1.getChannelBalance();
561563
await wallet2.getBalance();

0 commit comments

Comments
 (0)