@@ -49,6 +49,8 @@ public class Wallet {
4949 private HdKeyPair rootKeyPair ;
5050 private HdKeyPair stakeKeys ;
5151
52+ @ Getter
53+ @ Setter
5254 private boolean searchUtxoByAddrVkh ;
5355
5456 @ Getter
@@ -151,15 +153,15 @@ public static Wallet createFromAccountKey(Network network, byte[] accountKey) {
151153 /**
152154 * Create a Wallet object from given mnemonic or rootKey or accountKey
153155 * Only one of these value should be set : mnemonic or rootKey or accountKey
154- * @param network
155- * @param mnemonic
156- * @param rootKey
157- * @param accountKey
158- * @param account
156+ * @param network network
157+ * @param mnemonic mnemonic
158+ * @param rootKey root key
159+ * @param accountKey account level key
160+ * @param account account number
159161 */
160162 private Wallet (Network network , String mnemonic , byte [] rootKey , byte [] accountKey , int account ) {
161163 //check if more than one value set and throw exception
162- if ((mnemonic != null && mnemonic .trim (). length () > 0 ? 1 : 0 ) +
164+ if ((mnemonic != null && ! mnemonic .isEmpty () ? 1 : 0 ) +
163165 (rootKey != null && rootKey .length > 0 ? 1 : 0 ) +
164166 (accountKey != null && accountKey .length > 0 ? 1 : 0 ) > 1 ) {
165167 throw new WalletException ("Only one of mnemonic, rootKey, or accountKey should be set." );
@@ -168,7 +170,7 @@ private Wallet(Network network, String mnemonic, byte[] rootKey, byte[] accountK
168170 this .network = network ;
169171 this .cache = new HashMap <>();
170172
171- if (mnemonic != null && mnemonic .trim (). length () > 0 ) {
173+ if (mnemonic != null && ! mnemonic .isEmpty () ) {
172174 this .mnemonic = mnemonic ;
173175 this .accountNo = account ;
174176 MnemonicUtil .validateMnemonic (this .mnemonic );
@@ -192,65 +194,65 @@ private Wallet(Network network, String mnemonic, byte[] rootKey, byte[] accountK
192194
193195 /**
194196 * Get Enterprise address for current account. Account can be changed via the setter.
195- * @param index
196- * @return
197+ * @param index address index
198+ * @return Address object with enterprise address
197199 */
198200 public Address getEntAddress (int index ) {
199201 return getEntAddress (this .accountNo , index );
200202 }
201203
202204 /**
203205 * Get Enterprise address for derivation path m/1852'/1815'/{account}'/0/{index}
204- * @param account
205- * @param index
206- * @return
206+ * @param account account no
207+ * @param index address index
208+ * @return Address object with Enterprise address
207209 */
208210 private Address getEntAddress (int account , int index ) {
209211 return getAccountNo (account , index ).getEnterpriseAddress ();
210212 }
211213
212214 /**
213215 * Get Baseaddress for current account. Account can be changed via the setter.
214- * @param index
215- * @return
216+ * @param index address index
217+ * @return Address object for Base address
216218 */
217219 public Address getBaseAddress (int index ) {
218220 return getBaseAddress (this .accountNo , index );
219221 }
220222
221223 /**
222224 * Get Baseaddress for current account as String. Account can be changed via the setter.
223- * @param index
224- * @return
225+ * @param index address index
226+ * @return Base address as string
225227 */
226228 public String getBaseAddressString (int index ) {
227229 return getBaseAddress (index ).getAddress ();
228230 }
229231
230232 /**
231233 * Get Baseaddress for derivationpath m/1852'/1815'/{account}'/0/{index}
232- * @param account
233- * @param index
234- * @return
234+ * @param account account number
235+ * @param index address index
236+ * @return Address object for Base address
235237 */
236238 public Address getBaseAddress (int account , int index ) {
237239 return getAccountNo (account ,index ).getBaseAddress ();
238240 }
239241
240242 /**
241243 * Returns the Account object for the index and current account. Account can be changed via the setter.
242- * @param index
243- * @return
244+ * @param index address index
245+ * @return Account object
244246 */
245247 public Account getAccountAtIndex (int index ) {
246248 return getAccountNo (this .accountNo , index );
247249 }
248250
249251 /**
250252 * Returns the Account object for the index and account.
251- * @param account
252- * @param index
253- * @return
253+ * @param account account number
254+ * @param index address index
255+ * @return Account object
254256 */
255257 public Account getAccountNo (int account , int index ) {
256258 if (account != this .accountNo ) {
@@ -272,7 +274,7 @@ private Account deriveAccount(int account, int index) {
272274 DerivationPath derivationPath = DerivationPath .createExternalAddressDerivationPathForAccount (account );
273275 derivationPath .getIndex ().setValue (index );
274276
275- if (mnemonic != null && mnemonic .trim (). length () > 0 ) {
277+ if (mnemonic != null && ! mnemonic .isEmpty () ) {
276278 return Account .createFromMnemonic (this .network , this .mnemonic , derivationPath );
277279 } else if (rootKey != null && rootKey .length > 0 ) {
278280 return Account .createFromRootKey (this .network , this .rootKey , derivationPath );
@@ -286,7 +288,7 @@ private Account deriveAccount(int account, int index) {
286288 /**
287289 * Setting the current account for derivation path.
288290 * Setting the account will reset the cache.
289- * @param account
291+ * @param account account number which will be set in the wallet
290292 */
291293 public void setAccountNo (int account ) {
292294 this .accountNo = account ;
@@ -296,12 +298,12 @@ public void setAccountNo(int account) {
296298
297299 /**
298300 * Returns the RootkeyPair
299- * @return
301+ * @return Root key as HdKeyPair if non-empty else empty optional
300302 */
301303 @ JsonIgnore
302304 public Optional <HdKeyPair > getRootKeyPair () {
303305 if (rootKeyPair == null ) {
304- if (mnemonic != null && mnemonic .trim (). length () > 0 ) {
306+ if (mnemonic != null && ! mnemonic .isEmpty () ) {
305307 HdKeyGenerator hdKeyGenerator = new HdKeyGenerator ();
306308 try {
307309 byte [] entropy = MnemonicCode .INSTANCE .toEntropy (this .mnemonic );
@@ -326,7 +328,7 @@ public Optional<byte[]> getRootPvtKey() {
326328
327329 /**
328330 * Finds needed signers within wallet and signs the transaction with each one
329- * @param txToSign
331+ * @param txToSign transaction
330332 * @return signed Transaction
331333 */
332334 public Transaction sign (Transaction txToSign , Set <WalletUtxo > utxos ) {
@@ -400,7 +402,7 @@ public Transaction sign(Transaction txToSign, Set<WalletUtxo> utxos) {
400402
401403 /**
402404 * Returns the stake address of the wallet.
403- * @return
405+ * @return Stake address as string
404406 */
405407 public String getStakeAddress () {
406408 if (stakeAddress == null || stakeAddress .isEmpty ()) {
@@ -413,21 +415,13 @@ public String getStakeAddress() {
413415
414416 /**
415417 * Signs the transaction with stake key from wallet.
416- * @param transaction
417- * @return
418+ * @param transaction transaction object to sign
419+ * @return Signed transaction object
418420 */
419421 public Transaction signWithStakeKey (Transaction transaction ) {
420422 return TransactionSigner .INSTANCE .sign (transaction , getStakeKeyPair ());
421423 }
422424
423- public void setSearchUtxoByAddrVkh (boolean flag ) {
424- searchUtxoByAddrVkh = flag ;
425- }
426-
427- public boolean isSearchUtxoByAddrVkh () {
428- return searchUtxoByAddrVkh ;
429- }
430-
431425 private HdKeyPair getStakeKeyPair () {
432426 if (stakeKeys == null ) {
433427 DerivationPath stakeDerivationPath = DerivationPath .createStakeAddressDerivationPathForAccount (this .accountNo );
0 commit comments