Qortal/qortal
Qortal/qortal
3
0
Fork 3
mirror of https://github.com/Qortal/qortal.git synced 2025-02-13 02:35:50 +00:00
Code Issues Projects Releases Wiki Activity

Improvements and fixes to PirateWallet

Browse Source
This commit is contained in:
CalDescent 2022-05-14 12:10:35 +01:00
parent e552994f68
commit e1e1a66a0b
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/org/qortal/crosschain/PirateWallet.java
View File

@ -29,6 +29,7 @@ public class PirateWallet {
protected static final Logger LOGGER = LogManager.getLogger(PirateWallet.class); protected static final Logger LOGGER = LogManager.getLogger(PirateWallet.class);
private byte[] entropyBytes; private byte[] entropyBytes;
private String seedPhrase;
private boolean ready = false; private boolean ready = false;
private final String params; private final String params;
@ -59,21 +60,21 @@ public class PirateWallet {
try { try {
LiteWalletJni.initlogging(); LiteWalletJni.initlogging();
// Pirate library uses base64 encoding
String entropy64 = Base64.toBase64String(this.entropyBytes);
// Derive seed phrase from entropy bytes
String inputSeedResponse = LiteWalletJni.getseedphrasefromentropyb64(entropy64);
JSONObject inputSeedJson = new JSONObject(inputSeedResponse);
String inputSeedPhrase = null;
if (inputSeedJson.has("seedPhrase")) {
inputSeedPhrase = inputSeedJson.getString("seedPhrase");
}
String wallet = this.load(); String wallet = this.load();
if (wallet == null) { if (wallet == null) {
// Wallet doesn't exist, so create a new one // Wallet doesn't exist, so create a new one
// Pirate library uses base64 encoding
String entropy64 = Base64.toBase64String(this.entropyBytes);
// Derive seed phrase from entropy bytes
String inputSeedResponse = LiteWalletJni.getseedphrasefromentropyb64(entropy64);
JSONObject inputSeedJson = new JSONObject(inputSeedResponse);
String inputSeedPhrase = null;
if (inputSeedJson.has("seedPhrase")) {
inputSeedPhrase = inputSeedJson.getString("seedPhrase");
}
// Initialize new wallet // Initialize new wallet
String outputSeedResponse = LiteWalletJni.initfromseed(SERVER_URI, this.params, inputSeedPhrase, "1886500", this.saplingOutput64, this.saplingSpend64); // Thread-safe. String outputSeedResponse = LiteWalletJni.initfromseed(SERVER_URI, this.params, inputSeedPhrase, "1886500", this.saplingOutput64, this.saplingSpend64); // Thread-safe.
JSONObject outputSeedJson = new JSONObject(outputSeedResponse); JSONObject outputSeedJson = new JSONObject(outputSeedResponse);
@ -88,9 +89,12 @@ public class PirateWallet {
return false; return false;
} }
this.seedPhrase = outputSeedPhrase;
} else { } else {
// Restore existing wallet // Restore existing wallet
String walletSeed = LiteWalletJni.initfromb64(SERVER_URI, params, wallet, saplingOutput64, saplingSpend64); LiteWalletJni.initfromb64(SERVER_URI, params, wallet, saplingOutput64, saplingSpend64);
this.seedPhrase = inputSeedPhrase;
} }
// Check that we're able to communicate with the library // Check that we're able to communicate with the library
@ -214,6 +218,10 @@ public class PirateWallet {
return Base58.encode(entropyHash); return Base58.encode(entropyHash);
} }
public String getSeedPhrase() {
return this.seedPhrase;
}
private String getEncryptionKey() { private String getEncryptionKey() {
if (this.entropyBytes == null) { if (this.entropyBytes == null) {
return null; return null;
@ -336,4 +344,20 @@ public class PirateWallet {
return address; return address;
} }
public String getPrivateKey() {
String response = LiteWalletJni.execute("export", "");
JSONArray addressesJson = new JSONArray(response);
if (!addressesJson.isEmpty()) {
JSONObject addressJson = addressesJson.getJSONObject(0);
if (addressJson.has("private_key")) {
//String address = addressJson.getString("address");
String privateKey = addressJson.getString("private_key");
//String viewingKey = addressJson.getString("viewing_key");
return privateKey;
}
}
return null;
}
} }