Skip to content

Commit 2773328

Browse files
authored
Merge pull request #844 from lxcmyf/feature/gas_free
fix(Ledger): optimize terminal msg output
2 parents ff87a0b + d9bd061 commit 2773328

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

src/main/java/org/tron/ledger/listener/LedgerEventListener.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.tron.ledger.listener;
22

33
import static org.tron.common.utils.TransactionUtils.getTransactionId;
4+
import static org.tron.common.utils.Utils.greenBoldHighlight;
45
import static org.tron.ledger.console.ConsoleColor.ANSI_RED;
56
import static org.tron.ledger.console.ConsoleColor.ANSI_RESET;
67
import static org.tron.ledger.console.ConsoleColor.ANSI_YELLOW;
@@ -209,6 +210,7 @@ public void hidDataReceived(HidServicesEvent event) {
209210
doLedgerSignEnd();
210211
}
211212
}
213+
System.out.println(greenBoldHighlight("Enter") + " to continue...");
212214
}
213215

214216
private void doLedgerSignEnd() {

src/main/java/org/tron/walletserver/WalletApi.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,10 @@ private Transaction signTransaction(Transaction transaction)
810810
return transaction;
811811
}
812812
HidDevice hidDevice = HidServicesWrapper.getInstance().getHidDevice(wf.getAddress(), getPath());
813+
if (hidDevice == null) {
814+
TransactionSignManager.getInstance().setTransaction(null);
815+
return null;
816+
}
813817
Optional<String> state = LedgerSignResult.getLastTransactionState(hidDevice.getPath());
814818
boolean confirmed = state.isPresent() && LedgerSignResult.SIGN_RESULT_SUCCESS.equals(state.get());
815819
if (weight.getResult().getCode() == response_code.NOT_ENOUGH_PERMISSION && confirmed) {

0 commit comments

Comments
 (0)