Skip to content
This repository was archived by the owner on Oct 24, 2022. It is now read-only.

LND 0.13 #22

Merged
merged 6 commits into from
Jul 6, 2021
Merged

LND 0.13 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70c0a0c
Updated Lndmobile to 0.13
Jasonvdb Jun 30, 2021
22d879a
Updated protobuf files and remove unnecessary native code
Jasonvdb Jul 1, 2021
b59a0d6
Using LND's new state service instead
Jasonvdb Jul 2, 2021
f693e0e
Removed the need for native code for seed generation, unlocking and c…
Jasonvdb Jul 2, 2021
f525198
Update README.md
Jasonvdb Jul 2, 2021
9ccf3d9
Version bump
Jasonvdb Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ yarn android
import lnd, {
ENetworks,
LndConf,
TCurrentLndState,
ss_lnrpc
} from '@synonymdev/react-native-lightning';

const lndConf = new LndConf(ENetworks.regtest);
Expand All @@ -59,11 +59,16 @@ if (res.isErr()) {
}

//LND state changes
lnd.subscribeToCurrentState(({lndRunning, walletUnlocked, grpcReady}) => {
console.log(`lndRunning: ${lndRunning}`);
console.log(`walletUnlocked: ${walletUnlocked}`);
console.log(`grpcReady: ${grpcReady}`);
});
lnd.stateService.subscribeToStateChanges(
(res: Result<ss_lnrpc.WalletState>) => {
if (res.isOk()) {
setLndState(res.value);
}
},
() => {
//Subscription has ended
},
);


//Subscribe to LND logs
Expand Down
Binary file modified android/libs/Lndmobile.aar
View file
Open in desktop
Binary file not shown.
172 changes: 1 addition & 171 deletions android/src/main/java/com/reactnativelightning/ReactNativeLightningModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ public class ReactNativeLightningModule extends ReactContextBaseJavaModule {

private FileObserver logObserver;

private static LndState state = new LndState();

public ReactNativeLightningModule(ReactApplicationContext reactContext) {
super(reactContext);
}
Expand Down Expand Up @@ -173,142 +171,19 @@ public void onError(Exception e) {
public void onResponse(byte[] bytes) {
Log.i(TAG, "Wallet ready to be unlocked");
Log.d(TAG, "Wallet ready to be unlocked");
state.setLndRunning(true, getReactApplicationContext());
promise.resolve("LND started");
}
}
class RPCCallback implements Callback {
@Override
public void onError(Exception e) {
Log.i(TAG, "RPC start err: " + e.getMessage());
Log.d(TAG, "RPC start err: " + e.getMessage());
}
@Override
public void onResponse(byte[] bytes) {
Log.i(TAG, "RPC ready for requests");
Log.d(TAG, "RPC ready for requests");
state.setGrpcReady(true, getReactApplicationContext());
}
}

Runnable startLnd = new Runnable() {
@Override
public void run() {
Lndmobile.start(args, new StartedCallback(), new RPCCallback());
Lndmobile.start(args, new StartedCallback());
}
};
new Thread(startLnd).start();
}

@ReactMethod
public void genSeed(final Promise promise) {
Log.i("LndNativeModule", "Generating seed...");

class SeedCallback implements Callback {
@Override
public void onError(Exception e) {
Log.i(TAG, "Seed err: " + e.getMessage());
Log.d(TAG, "Seed err: " + e.getMessage());
promise.reject(e);
}
@Override
public void onResponse(byte[] bytes) {
Log.i(TAG, "Seed generated successfully");
Log.d(TAG, "Seed generated successfully");

String b64 = "";
if (bytes != null && bytes.length > 0) {
b64 = Base64.encodeToString(bytes, Base64.NO_WRAP);
}

WritableMap params = Arguments.createMap();
params.putString(respB64DataKey, b64);

promise.resolve(params);
}
}

class GenSeedTask implements Runnable {
byte[] request;
GenSeedTask(byte[] r) { request = r;}
public void run() {
Lndmobile.genSeed(request, new SeedCallback());
}
}

Thread t = new Thread(new GenSeedTask(new byte[0]));
t.start();
}

@ReactMethod
public void createWallet(String msg, final Promise promise) {
Log.i("LndNativeModule", "Initializing wallet...");

class InitializeWalletCallback implements Callback {
@Override
public void onError(Exception e) {
Log.i(TAG, "init err: " + e.getMessage());
Log.d(TAG, "init err: " + e.getMessage());
promise.reject(e);
}
@Override
public void onResponse(byte[] bytes) {
Log.i(TAG, "Wallet successfully initialized");
Log.d(TAG, "Wallet successfully initialized");
state.setWalletUnlocked(true, getReactApplicationContext());
promise.resolve("initialized");
}
}

class InitWalletTask implements Runnable {
byte[] request;
InitWalletTask(byte[] r) { request = r;}
public void run() {
Lndmobile.initWallet(request, new InitializeWalletCallback());
}
}
Thread t = new Thread(new InitWalletTask(Base64.decode(msg, Base64.NO_WRAP)));
t.start();
}

@ReactMethod
public void unlockWallet(String msg, final Promise promise) {
Log.i("LndNativeModule", "Unlocking wallet...");

class UnlockWalletCallback implements Callback {
@Override
public void onError(Exception e) {
Log.i(TAG, "Unlock err: " + e.getMessage());
Log.d(TAG, "Unlock err: " + e.getMessage());
e.printStackTrace();

//TODO wallet still unlocked but sometimes returns an error. Error needs some investigation.
if (e.getMessage().contains("transport is closing")) {
promise.resolve("unlocked");
} else {
promise.reject(e);
}
}
@Override
public void onResponse(byte[] bytes) {
Log.i(TAG, "Wallet successfully unlocked");
Log.d(TAG, "Wallet successfully unlocked");
state.setWalletUnlocked(true, getReactApplicationContext());
promise.resolve("unlocked");
}
}

class UnlockWalletTask implements Runnable {
byte[] request;
UnlockWalletTask(byte[] r) { request = r;}
public void run() {
Lndmobile.unlockWallet(request, new UnlockWalletCallback());
}
}
Thread t = new Thread(new UnlockWalletTask(Base64.decode(msg, Base64.NO_WRAP)));
t.start();
}

@ReactMethod
public void walletExists(String network, final Promise promise) {
File directory = new File(getReactApplicationContext().getFilesDir().toString() + "/lnd/data/chain/bitcoin/" + network + "/wallet.db");
Expand All @@ -317,11 +192,6 @@ public void walletExists(String network, final Promise promise) {
promise.resolve(exists);
}

@ReactMethod
public void currentState(final Promise promise) {
promise.resolve(state.formatted());
}

@ReactMethod
public void logFileContent(String network, Integer limit, final Promise promise) {
File appDir = getReactApplicationContext().getFilesDir();
Expand Down Expand Up @@ -433,13 +303,6 @@ public void onResponse(byte[] bytes) {

try {
m.invoke(null, Base64.decode(msg, Base64.NO_WRAP), new NativeCallback(promise));

//If LND was stopped reset state
if (method.equals("StopDaemon")) {
state.setLndRunning(false, getReactApplicationContext());
state.setGrpcReady(false, getReactApplicationContext());
state.setWalletUnlocked(false, getReactApplicationContext());
}
} catch (IllegalAccessException | InvocationTargetException e) {
e.printStackTrace();
promise.reject("LndNativeModule", e);
Expand Down Expand Up @@ -519,36 +382,3 @@ public void sendStreamWrite(String streamId, String msg) {
}
}
}

class LndState {
private Boolean lndRunning = false;
private Boolean walletUnlocked = false;
private Boolean grpcReady = false;

public void setLndRunning(Boolean lndRunning, ReactApplicationContext context) {
this.lndRunning = lndRunning;
updateStateStream(context);
}

public void setWalletUnlocked(Boolean walletUnlocked, ReactApplicationContext context) {
this.walletUnlocked = walletUnlocked;
updateStateStream(context);
}

public void setGrpcReady(Boolean grpcReady, ReactApplicationContext context) {
this.grpcReady = grpcReady;
updateStateStream(context);
}

WritableMap formatted() {
WritableMap params = Arguments.createMap();
params.putBoolean("lndRunning", lndRunning);
params.putBoolean("walletUnlocked", walletUnlocked);
params.putBoolean("grpcReady", grpcReady);
return params;
}

private void updateStateStream(ReactApplicationContext context) {
context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("lndStateUpdate", formatted());
}
}
Loading