Skip to content

Commit fd231d4

Browse files
Federico2014Federico2014
committed
feat(rpc): remove redundant toggle check
1 parent 3cca6fb commit fd231d4

File tree

3 files changed

+2
-81
lines changed

3 files changed

+2
-81
lines changed

‎framework/src/main/java/org/tron/core/db/Manager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ public boolean pushTransaction(final TransactionCapsule trx)
870870

871871
if (isShieldedTransaction(trx.getInstance()) && !chainBaseManager.getDynamicPropertiesStore()
872872
.supportShieldedTransaction()) {
873-
return true;
873+
return false;
874874
}
875875

876876
pushTransactionQueue.add(trx);

‎framework/src/main/java/org/tron/core/services/RpcApiService.java‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -291,22 +291,6 @@ private StatusRuntimeException getRunTimeException(Exception e) {
291291
}
292292
}
293293

294-
private void checkSupportShieldedTransaction() throws ZksnarkException {
295-
String msg = "Not support Shielded Transaction API, need to configure "
296-
+ "node.fullNodeAllowShieldedTransaction = true";
297-
if (!Args.getInstance().isFullNodeAllowShieldedTransactionArgs()) {
298-
throw new ZksnarkException(msg);
299-
}
300-
}
301-
302-
private void checkSupportShieldedTRC20Transaction() throws ZksnarkException {
303-
String msg = "Not support Shielded Transaction API, need to configure "
304-
+ "node.fullNodeAllowShieldedTransaction = true";
305-
if (!Args.getInstance().isFullNodeAllowShieldedTransactionArgs()) {
306-
throw new ZksnarkException(msg);
307-
}
308-
}
309-
310294
/**
311295
* DatabaseApi.
312296
*/
@@ -653,8 +637,6 @@ public void getMerkleTreeVoucherInfo(OutputPointInfo request,
653637
StreamObserver<IncrementalMerkleVoucherInfo> responseObserver) {
654638

655639
try {
656-
checkSupportShieldedTransaction();
657-
658640
IncrementalMerkleVoucherInfo witnessInfo = wallet
659641
.getMerkleTreeVoucherInfo(request);
660642
responseObserver.onNext(witnessInfo);
@@ -671,8 +653,6 @@ public void scanNoteByIvk(GrpcAPI.IvkDecryptParameters request,
671653
long endNum = request.getEndBlockIndex();
672654

673655
try {
674-
checkSupportShieldedTransaction();
675-
676656
DecryptNotes decryptNotes = wallet
677657
.scanNoteByIvk(startNum, endNum, request.getIvk().toByteArray());
678658
responseObserver.onNext(decryptNotes);
@@ -689,8 +669,6 @@ public void scanAndMarkNoteByIvk(GrpcAPI.IvkDecryptAndMarkParameters request,
689669
long endNum = request.getEndBlockIndex();
690670

691671
try {
692-
checkSupportShieldedTransaction();
693-
694672
DecryptNotesMarked decryptNotes = wallet.scanAndMarkNoteByIvk(startNum, endNum,
695673
request.getIvk().toByteArray(),
696674
request.getAk().toByteArray(),
@@ -709,8 +687,6 @@ public void scanNoteByOvk(GrpcAPI.OvkDecryptParameters request,
709687
long startNum = request.getStartBlockIndex();
710688
long endNum = request.getEndBlockIndex();
711689
try {
712-
checkSupportShieldedTransaction();
713-
714690
DecryptNotes decryptNotes = wallet
715691
.scanNoteByOvk(startNum, endNum, request.getOvk().toByteArray());
716692
responseObserver.onNext(decryptNotes);
@@ -723,8 +699,6 @@ public void scanNoteByOvk(GrpcAPI.OvkDecryptParameters request,
723699
@Override
724700
public void isSpend(NoteParameters request, StreamObserver<SpendResult> responseObserver) {
725701
try {
726-
checkSupportShieldedTransaction();
727-
728702
responseObserver.onNext(wallet.isSpend(request));
729703
} catch (Exception e) {
730704
responseObserver.onError(getRunTimeException(e));
@@ -744,7 +718,6 @@ public void scanShieldedTRC20NotesByIvk(IvkDecryptTRC20Parameters request,
744718
ProtocolStringList topicsList = request.getEventsList();
745719

746720
try {
747-
checkSupportShieldedTRC20Transaction();
748721
responseObserver.onNext(
749722
wallet.scanShieldedTRC20NotesByIvk(startNum, endNum, contractAddress, ivk, ak, nk,
750723
topicsList));
@@ -764,7 +737,6 @@ public void scanShieldedTRC20NotesByOvk(OvkDecryptTRC20Parameters request,
764737
byte[] ovk = request.getOvk().toByteArray();
765738
ProtocolStringList topicList = request.getEventsList();
766739
try {
767-
checkSupportShieldedTRC20Transaction();
768740
responseObserver
769741
.onNext(wallet
770742
.scanShieldedTRC20NotesByOvk(startNum, endNum, ovk, contractAddress, topicList));
@@ -778,7 +750,6 @@ public void scanShieldedTRC20NotesByOvk(OvkDecryptTRC20Parameters request,
778750
public void isShieldedTRC20ContractNoteSpent(NfTRC20Parameters request,
779751
StreamObserver<GrpcAPI.NullifierResult> responseObserver) {
780752
try {
781-
checkSupportShieldedTRC20Transaction();
782753
responseObserver.onNext(wallet.isShieldedTRC20ContractNoteSpent(request));
783754
} catch (Exception e) {
784755
responseObserver.onError(getRunTimeException(e));
@@ -2068,8 +2039,6 @@ public void getMerkleTreeVoucherInfo(OutputPointInfo request,
20682039
StreamObserver<IncrementalMerkleVoucherInfo> responseObserver) {
20692040

20702041
try {
2071-
checkSupportShieldedTransaction();
2072-
20732042
IncrementalMerkleVoucherInfo witnessInfo = wallet
20742043
.getMerkleTreeVoucherInfo(request);
20752044
responseObserver.onNext(witnessInfo);
@@ -2089,8 +2058,6 @@ public void createShieldedTransaction(PrivateParameters request,
20892058
Return.Builder retBuilder = Return.newBuilder();
20902059

20912060
try {
2092-
checkSupportShieldedTransaction();
2093-
20942061
TransactionCapsule trx = wallet.createShieldedTransaction(request);
20952062
trxExtBuilder.setTransaction(trx.getInstance());
20962063
trxExtBuilder.setTxid(trx.getTransactionId().getByteString());
@@ -2120,8 +2087,6 @@ public void createShieldedTransactionWithoutSpendAuthSig(PrivateParametersWithou
21202087
Return.Builder retBuilder = Return.newBuilder();
21212088

21222089
try {
2123-
checkSupportShieldedTransaction();
2124-
21252090
TransactionCapsule trx = wallet.createShieldedTransactionWithoutSpendAuthSig(request);
21262091
trxExtBuilder.setTransaction(trx.getInstance());
21272092
trxExtBuilder.setTxid(trx.getTransactionId().getByteString());
@@ -2149,8 +2114,6 @@ public void getNewShieldedAddress(EmptyMessage request,
21492114
StreamObserver<ShieldedAddressInfo> responseObserver) {
21502115

21512116
try {
2152-
checkSupportShieldedTRC20Transaction();
2153-
21542117
responseObserver.onNext(wallet.getNewShieldedAddress());
21552118
} catch (Exception e) {
21562119
responseObserver.onError(getRunTimeException(e));
@@ -2163,8 +2126,6 @@ public void getNewShieldedAddress(EmptyMessage request,
21632126
public void getSpendingKey(EmptyMessage request,
21642127
StreamObserver<BytesMessage> responseObserver) {
21652128
try {
2166-
checkSupportShieldedTRC20Transaction();
2167-
21682129
responseObserver.onNext(wallet.getSpendingKey());
21692130
} catch (Exception e) {
21702131
responseObserver.onError(getRunTimeException(e));
@@ -2177,8 +2138,6 @@ public void getSpendingKey(EmptyMessage request,
21772138
public void getRcm(EmptyMessage request,
21782139
StreamObserver<BytesMessage> responseObserver) {
21792140
try {
2180-
checkSupportShieldedTRC20Transaction();
2181-
21822141
responseObserver.onNext(wallet.getRcm());
21832142
} catch (Exception e) {
21842143
responseObserver.onError(getRunTimeException(e));
@@ -2193,8 +2152,6 @@ public void getExpandedSpendingKey(BytesMessage request,
21932152
ByteString spendingKey = request.getValue();
21942153

21952154
try {
2196-
checkSupportShieldedTRC20Transaction();
2197-
21982155
ExpandedSpendingKeyMessage response = wallet.getExpandedSpendingKey(spendingKey);
21992156
responseObserver.onNext(response);
22002157
} catch (BadItemException | ZksnarkException e) {
@@ -2210,8 +2167,6 @@ public void getAkFromAsk(BytesMessage request, StreamObserver<BytesMessage> resp
22102167
ByteString ak = request.getValue();
22112168

22122169
try {
2213-
checkSupportShieldedTRC20Transaction();
2214-
22152170
responseObserver.onNext(wallet.getAkFromAsk(ak));
22162171
} catch (BadItemException | ZksnarkException e) {
22172172
responseObserver.onError(getRunTimeException(e));
@@ -2226,8 +2181,6 @@ public void getNkFromNsk(BytesMessage request, StreamObserver<BytesMessage> resp
22262181
ByteString nk = request.getValue();
22272182

22282183
try {
2229-
checkSupportShieldedTRC20Transaction();
2230-
22312184
responseObserver.onNext(wallet.getNkFromNsk(nk));
22322185
} catch (BadItemException | ZksnarkException e) {
22332186
responseObserver.onError(getRunTimeException(e));
@@ -2244,8 +2197,6 @@ public void getIncomingViewingKey(ViewingKeyMessage request,
22442197
ByteString nk = request.getNk();
22452198

22462199
try {
2247-
checkSupportShieldedTRC20Transaction();
2248-
22492200
responseObserver.onNext(wallet.getIncomingViewingKey(ak.toByteArray(), nk.toByteArray()));
22502201
} catch (ZksnarkException e) {
22512202
responseObserver.onError(getRunTimeException(e));
@@ -2259,8 +2210,6 @@ public void getIncomingViewingKey(ViewingKeyMessage request,
22592210
public void getDiversifier(EmptyMessage request,
22602211
StreamObserver<DiversifierMessage> responseObserver) {
22612212
try {
2262-
checkSupportShieldedTRC20Transaction();
2263-
22642213
DiversifierMessage d = wallet.getDiversifier();
22652214
responseObserver.onNext(d);
22662215
} catch (ZksnarkException e) {
@@ -2278,8 +2227,6 @@ public void getZenPaymentAddress(IncomingViewingKeyDiversifierMessage request,
22782227
DiversifierMessage d = request.getD();
22792228

22802229
try {
2281-
checkSupportShieldedTRC20Transaction();
2282-
22832230
PaymentAddressMessage saplingPaymentAddressMessage =
22842231
wallet.getPaymentAddress(new IncomingViewingKey(ivk.getIvk().toByteArray()),
22852232
new DiversifierT(d.getD().toByteArray()));
@@ -2300,8 +2247,6 @@ public void scanNoteByIvk(GrpcAPI.IvkDecryptParameters request,
23002247
long endNum = request.getEndBlockIndex();
23012248

23022249
try {
2303-
checkSupportShieldedTransaction();
2304-
23052250
DecryptNotes decryptNotes = wallet
23062251
.scanNoteByIvk(startNum, endNum, request.getIvk().toByteArray());
23072252
responseObserver.onNext(decryptNotes);
@@ -2320,8 +2265,6 @@ public void scanAndMarkNoteByIvk(GrpcAPI.IvkDecryptAndMarkParameters request,
23202265
long endNum = request.getEndBlockIndex();
23212266

23222267
try {
2323-
checkSupportShieldedTransaction();
2324-
23252268
DecryptNotesMarked decryptNotes = wallet.scanAndMarkNoteByIvk(startNum, endNum,
23262269
request.getIvk().toByteArray(),
23272270
request.getAk().toByteArray(),
@@ -2342,8 +2285,6 @@ public void scanNoteByOvk(GrpcAPI.OvkDecryptParameters request,
23422285
long endNum = request.getEndBlockIndex();
23432286

23442287
try {
2345-
checkSupportShieldedTransaction();
2346-
23472288
DecryptNotes decryptNotes = wallet
23482289
.scanNoteByOvk(startNum, endNum, request.getOvk().toByteArray());
23492290
responseObserver.onNext(decryptNotes);
@@ -2357,8 +2298,6 @@ public void scanNoteByOvk(GrpcAPI.OvkDecryptParameters request,
23572298
@Override
23582299
public void isSpend(NoteParameters request, StreamObserver<SpendResult> responseObserver) {
23592300
try {
2360-
checkSupportShieldedTransaction();
2361-
23622301
responseObserver.onNext(wallet.isSpend(request));
23632302
} catch (Exception e) {
23642303
responseObserver.onError(getRunTimeException(e));
@@ -2371,8 +2310,6 @@ public void isSpend(NoteParameters request, StreamObserver<SpendResult> response
23712310
public void createShieldNullifier(GrpcAPI.NfParameters request,
23722311
StreamObserver<GrpcAPI.BytesMessage> responseObserver) {
23732312
try {
2374-
checkSupportShieldedTransaction();
2375-
23762313
BytesMessage nf = wallet
23772314
.createShieldNullifier(request);
23782315
responseObserver.onNext(nf);
@@ -2387,8 +2324,6 @@ public void createShieldNullifier(GrpcAPI.NfParameters request,
23872324
public void createSpendAuthSig(SpendAuthSigParameters request,
23882325
StreamObserver<GrpcAPI.BytesMessage> responseObserver) {
23892326
try {
2390-
checkSupportShieldedTRC20Transaction();
2391-
23922327
BytesMessage spendAuthSig = wallet.createSpendAuthSig(request);
23932328
responseObserver.onNext(spendAuthSig);
23942329
} catch (Exception e) {
@@ -2402,8 +2337,6 @@ public void createSpendAuthSig(SpendAuthSigParameters request,
24022337
public void getShieldTransactionHash(Transaction request,
24032338
StreamObserver<GrpcAPI.BytesMessage> responseObserver) {
24042339
try {
2405-
checkSupportShieldedTransaction();
2406-
24072340
BytesMessage transactionHash = wallet.getShieldTransactionHash(request);
24082341
responseObserver.onNext(transactionHash);
24092342
} catch (Exception e) {
@@ -2418,8 +2351,6 @@ public void createShieldedContractParameters(
24182351
PrivateShieldedTRC20Parameters request,
24192352
StreamObserver<org.tron.api.GrpcAPI.ShieldedTRC20Parameters> responseObserver) {
24202353
try {
2421-
checkSupportShieldedTRC20Transaction();
2422-
24232354
ShieldedTRC20Parameters shieldedTRC20Parameters = wallet
24242355
.createShieldedContractParameters(request);
24252356
responseObserver.onNext(shieldedTRC20Parameters);
@@ -2440,8 +2371,6 @@ public void createShieldedContractParametersWithoutAsk(
24402371
PrivateShieldedTRC20ParametersWithoutAsk request,
24412372
StreamObserver<org.tron.api.GrpcAPI.ShieldedTRC20Parameters> responseObserver) {
24422373
try {
2443-
checkSupportShieldedTRC20Transaction();
2444-
24452374
ShieldedTRC20Parameters shieldedTRC20Parameters = wallet
24462375
.createShieldedContractParametersWithoutAsk(request);
24472376
responseObserver.onNext(shieldedTRC20Parameters);
@@ -2461,8 +2390,6 @@ public void scanShieldedTRC20NotesByIvk(
24612390
long startNum = request.getStartBlockIndex();
24622391
long endNum = request.getEndBlockIndex();
24632392
try {
2464-
checkSupportShieldedTRC20Transaction();
2465-
24662393
DecryptNotesTRC20 decryptNotes = wallet.scanShieldedTRC20NotesByIvk(startNum, endNum,
24672394
request.getShieldedTRC20ContractAddress().toByteArray(),
24682395
request.getIvk().toByteArray(),
@@ -2489,8 +2416,6 @@ public void scanShieldedTRC20NotesByOvk(
24892416
long startNum = request.getStartBlockIndex();
24902417
long endNum = request.getEndBlockIndex();
24912418
try {
2492-
checkSupportShieldedTRC20Transaction();
2493-
24942419
DecryptNotesTRC20 decryptNotes = wallet.scanShieldedTRC20NotesByOvk(startNum, endNum,
24952420
request.getOvk().toByteArray(),
24962421
request.getShieldedTRC20ContractAddress().toByteArray(),
@@ -2508,8 +2433,6 @@ public void scanShieldedTRC20NotesByOvk(
25082433
public void isShieldedTRC20ContractNoteSpent(NfTRC20Parameters request,
25092434
StreamObserver<GrpcAPI.NullifierResult> responseObserver) {
25102435
try {
2511-
checkSupportShieldedTRC20Transaction();
2512-
25132436
GrpcAPI.NullifierResult nf = wallet
25142437
.isShieldedTRC20ContractNoteSpent(request);
25152438
responseObserver.onNext(nf);
@@ -2525,8 +2448,6 @@ public void getTriggerInputForShieldedTRC20Contract(
25252448
ShieldedTRC20TriggerContractParameters request,
25262449
StreamObserver<org.tron.api.GrpcAPI.BytesMessage> responseObserver) {
25272450
try {
2528-
checkSupportShieldedTRC20Transaction();
2529-
25302451
responseObserver.onNext(wallet.getTriggerInputForShieldedTRC20Contract(request));
25312452
} catch (Exception e) {
25322453
responseObserver.onError(e);

‎framework/src/test/java/org/tron/core/zksnark/ShieldedReceiveTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public void testBroadcastBeforeAllowZksnark()
310310
ADDRESS_ONE_PRIVATE_KEY, chainBaseManager.getAccountStore());
311311
try {
312312
boolean res = dbManager.pushTransaction(transactionCap);
313-
Assert.assertTrue(res);
313+
Assert.assertFalse(res);
314314
} catch (Exception e) {
315315
Assert.assertFalse(true);
316316
}

0 commit comments

Comments
 (0)