From bbf7193c51cc7923f88aad3a0b08c971281d8688 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sun, 8 May 2022 08:24:54 +0100 Subject: [PATCH] Fixed bugs in wallet initialization --- .../qortal/controller/PirateChainWalletController.java | 3 +++ src/main/java/org/qortal/crosschain/PirateWallet.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/qortal/controller/PirateChainWalletController.java b/src/main/java/org/qortal/controller/PirateChainWalletController.java index b01e7438..62c81dba 100644 --- a/src/main/java/org/qortal/controller/PirateChainWalletController.java +++ b/src/main/java/org/qortal/controller/PirateChainWalletController.java @@ -106,6 +106,9 @@ public class PirateChainWalletController extends Thread { try { this.currentWallet = new PirateWallet(entropyBytes); + if (!this.currentWallet.isReady()) { + this.currentWallet = null; + } return true; } catch (IOException e) { LOGGER.info("Unable to initialize wallet: {}", e.getMessage()); diff --git a/src/main/java/org/qortal/crosschain/PirateWallet.java b/src/main/java/org/qortal/crosschain/PirateWallet.java index 9565347f..55184241 100644 --- a/src/main/java/org/qortal/crosschain/PirateWallet.java +++ b/src/main/java/org/qortal/crosschain/PirateWallet.java @@ -78,8 +78,8 @@ public class PirateWallet { String outputSeedResponse = LiteWalletJni.initfromseed(SERVER_URI, this.params, inputSeedPhrase, "1886500", this.saplingOutput64, this.saplingSpend64); // Thread-safe. JSONObject outputSeedJson = new JSONObject(outputSeedResponse); String outputSeedPhrase = null; - if (outputSeedJson.has("seedPhrase")) { - outputSeedJson.getString("seedPhrase"); + if (outputSeedJson.has("seed")) { + outputSeedPhrase = outputSeedJson.getString("seed"); } // Ensure seed phrase in response matches supplied seed phrase @@ -104,6 +104,10 @@ public class PirateWallet { return false; } + public boolean isReady() { + return this.ready; + } + public void setReady(boolean ready) { this.ready = ready; }