Skip to content

fix(crypto): throw exception if system shielded tx is not supported. #6514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuny0707 merged 2 commits into from
Jan 21, 2026
+4 −6
Merged

fix(crypto): throw exception if system shielded tx is not supported. #6514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f0638e
fix: throw exception if system shielded tx is not supported.
Federico2014 Jan 20, 2026
81cacd6
update the exception msg.
Federico2014 Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions framework/src/main/java/org/tron/core/db/Manager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,14 +874,13 @@ public boolean pushTransaction(final TransactionCapsule trx)

if (isShieldedTransaction(trx.getInstance()) && !chainBaseManager.getDynamicPropertiesStore()
.supportShieldedTransaction()) {
return false;
throw new ContractValidateException("ShieldedTransferContract is not supported.");
}

if (isExchangeTransaction(trx.getInstance())) {
throw new ContractValidateException("ExchangeTransactionContract is rejected");
}


pushTransactionQueue.add(trx);
Metrics.gaugeInc(MetricKeys.Gauge.MANAGER_QUEUE, 1,
MetricLabels.Gauge.QUEUE_QUEUED);
Expand Down
2 changes: 1 addition & 1 deletion framework/src/test/java/org/tron/core/db/ManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public void transactionTest() {
dbManager.pushTransaction(trans0);
dbManager.pushTransaction(trans);
} catch (Exception e) {
Assert.assertTrue(e instanceof TaposException);
Assert.assertTrue(e instanceof ContractValidateException);
}
dbManager.rePush(trans0);
ReflectUtils.invokeMethod(dbManager,"filterOwnerAddress",
Expand Down
5 changes: 2 additions & 3 deletions framework/src/test/java/org/tron/core/zksnark/ShieldedReceiveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,9 @@ public void testBroadcastBeforeAllowZksnark()
transactionCap = TransactionUtils.addTransactionSign(transactionCap.getInstance(),
ADDRESS_ONE_PRIVATE_KEY, chainBaseManager.getAccountStore());
try {
boolean res = dbManager.pushTransaction(transactionCap);
Assert.assertFalse(res);
dbManager.pushTransaction(transactionCap);
} catch (Exception e) {
Assert.fail(e.getMessage());
Assert.assertTrue(e instanceof ContractValidateException);
}
}

Expand Down