Skip to content
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.

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

feat(api): Optimize error handling of shielded transaction api #6

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions framework/src/main/java/org/tron/core/Wallet.java
Original file line number Diff line number Diff line change
Expand Up @@ -3438,6 +3438,9 @@ private void checkShieldedTRC20NoteValue(
if (spendNote.getNote().getValue() < 0) {
throw new ContractValidateException("The value in SpendNoteTRC20 must >= 0");
}
if (StringUtils.isEmpty(spendNote.getNote().getPaymentAddress())) {
throw new ContractValidateException("Payment Address in SpendNote should not be empty");
}
}
}

Expand All @@ -3446,6 +3449,9 @@ private void checkShieldedTRC20NoteValue(
if (receiveNote.getNote().getValue() < 0) {
throw new ContractValidateException("The value in ReceiveNote must >= 0");
}
if (StringUtils.isEmpty(receiveNote.getNote().getPaymentAddress())) {
throw new ContractValidateException("Payment Address in ReceiveNote should not be empty");
}
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions framework/src/main/java/org/tron/core/zen/address/KeyIo.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.io.ByteArrayOutputStream;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.tron.common.utils.Bech32;
import org.tron.common.utils.Bech32.Bech32Data;

Expand All @@ -29,6 +30,9 @@ public class KeyIo {
private static String SAPLING_PAYMENT_ADDRESS = "ztron";

public static PaymentAddress decodePaymentAddress(String str) {
if (StringUtils.isEmpty(str)) {
return null;
}
byte[] data;
Bech32Data bech = Bech32.decode(str);
if (bech.hrp.equals(SAPLING_PAYMENT_ADDRESS)
Expand Down
43 changes: 43 additions & 0 deletions framework/src/test/java/org/tron/core/ShieldWalletTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.tron.core.capsule.TransactionCapsule;
import org.tron.core.config.args.Args;
import org.tron.core.exception.ContractExeException;
import org.tron.core.exception.ContractValidateException;
import org.tron.core.services.http.JsonFormat;
import org.tron.core.services.http.JsonFormat.ParseException;

Expand Down Expand Up @@ -337,6 +338,48 @@ public void testCreateShieldedContractParameters() throws ContractExeException {
}
}

@Test
public void testCreateShieldedContractParameters2() throws ContractExeException {
librustzcashInitZksnarkParams();
Args.getInstance().setFullNodeAllowShieldedTransactionArgs(true);
Wallet wallet1 = spy(new Wallet());

doReturn(BigInteger.valueOf(1).toByteArray())
.when(wallet1).getShieldedContractScalingFactor(
ByteArray.fromHexString("4144007979359ECAC395BBD3CEF8060D3DF2DC3F01"));
String parameter = new String(ByteArray.fromHexString(
"7b0a202020202261736b223a2263323531336539653330383439343933326264383265306365353336"
+ "363264313734323164393062373261383437316130613132623835353261333336653032222c0a202"
+ "02020226e736b223a2234633662663364643461303634336432306236323866376534353938306335"
+ "653138376630376135316436663365383661616631616239313663303765623064222c0a202020202"
+ "26f766b223a2231376135386439613530353864613665343263613132636432383964306136616131"
+ "363962393236633138653139626361353138623864366638363734653433222c0a202020202266726"
+ "f6d5f616d6f756e74223a22313030222c0a2020202022736869656c6465645f726563656976657322"
+ "3a5b0a20202020202020207b0a202020202020202020202020226e6f7465223a7b0a2020202020202"
+ "02020202020202020202276616c7565223a3130302c0a202020202020202020202020202020202270"
+ "61796d656e745f61646472657373223a22222c0a202020202020202020202020202020202272636d2"
+ "23a223136623666356534303434346162376565616231316165363631336332376633353131373937"
+ "3165666138376237313536306235383133383239633933393064220a2020202020202020202020207"
+ "d0a20202020202020207d0a202020205d2c0a2020202022736869656c6465645f54524332305f636f"
+ "6e74726163745f61646472657373223a2234313434303037393739333539454341433339354242443"
+ "3434546383036304433444632444333463031220a7d"));
PrivateShieldedTRC20Parameters.Builder builder = PrivateShieldedTRC20Parameters.newBuilder();
try {
JsonFormat.merge(parameter, builder, false);
} catch (ParseException e) {
Assert.fail();
}

try {
wallet1.createShieldedContractParameters(builder.build());
Assert.fail();
} catch (Exception e) {
Assert.assertTrue(e instanceof ContractValidateException);
Assert.assertEquals("Payment Address in ReceiveNote should not be empty",
e.getMessage());
}
}

@Test
public void testCreateShieldedContractParametersWithoutAsk() throws ContractExeException {
librustzcashInitZksnarkParams();
Expand Down
Loading