Skip to content

Commit b1f3e6d

Browse files
committed
remove the ovk in spendDescription
1 parent 9832dad commit b1f3e6d

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

framework/src/main/java/org/tron/core/Wallet.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2915,7 +2915,7 @@ public ShieldedTRC20Parameters createShieldedContractParameters(
29152915

29162916
private void buildShieldedTRC20InputWithAK(
29172917
ShieldedTRC20ParametersBuilder builder, GrpcAPI.SpendNoteTRC20 spendNote,
2918-
byte[] ak, byte[] nsk, byte[] ovk) throws ZksnarkException {
2918+
byte[] ak, byte[] nsk) throws ZksnarkException {
29192919
GrpcAPI.Note note = spendNote.getNote();
29202920
PaymentAddress paymentAddress = KeyIo.decodePaymentAddress(note.getPaymentAddress());
29212921
if (Objects.isNull(paymentAddress)) {
@@ -2926,7 +2926,6 @@ private void buildShieldedTRC20InputWithAK(
29262926
paymentAddress.getPkD(), note.getValue(), note.getRcm().toByteArray());
29272927
builder.addSpend(ak,
29282928
nsk,
2929-
ovk,
29302929
baseNote,
29312930
spendNote.getAlpha().toByteArray(),
29322931
spendNote.getRoot().toByteArray(),
@@ -2998,7 +2997,7 @@ public ShieldedTRC20Parameters createShieldedContractParametersWithoutAsk(
29982997
throw new ContractValidateException("No shielded TRC-20 ak, nsk or ovk");
29992998
}
30002999
for (GrpcAPI.SpendNoteTRC20 spendNote : shieldedSpends) {
3001-
buildShieldedTRC20InputWithAK(builder, spendNote, ak, nsk, ovk);
3000+
buildShieldedTRC20InputWithAK(builder, spendNote, ak, nsk);
30023001
}
30033002
for (ReceiveNote receiveNote : shieldedReceives) {
30043003
buildShieldedTRC20Output(builder, receiveNote, ovk);
@@ -3024,7 +3023,7 @@ public ShieldedTRC20Parameters createShieldedContractParametersWithoutAsk(
30243023
.encryptBurnMessageByOvk(ovk, toAmount, transparentToAddress);
30253024
cipher.ifPresent(builder::setBurnCiphertext);
30263025
GrpcAPI.SpendNoteTRC20 spendNote = shieldedSpends.get(0);
3027-
buildShieldedTRC20InputWithAK(builder, spendNote, ak, nsk, ovk);
3026+
buildShieldedTRC20InputWithAK(builder, spendNote, ak, nsk);
30283027
if (receiveSize == 1) {
30293028
buildShieldedTRC20Output(builder, shieldedReceives.get(0), ovk);
30303029
}

framework/src/main/java/org/tron/core/zen/ShieldedTRC20ParametersBuilder.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,13 +565,12 @@ public void addSpend(
565565
public void addSpend(
566566
byte[] ak,
567567
byte[] nsk,
568-
byte[] ovk,
569568
Note note,
570569
byte[] alpha,
571570
byte[] anchor,
572571
byte[] path,
573572
long position) {
574-
spends.add(new SpendDescriptionInfo(ak, nsk, ovk, note, alpha, anchor, path, position));
573+
spends.add(new SpendDescriptionInfo(ak, nsk, note, alpha, anchor, path, position));
575574
valueBalance += note.getValue();
576575
}
577576

@@ -634,7 +633,6 @@ private SpendDescriptionInfo(
634633
private SpendDescriptionInfo(
635634
byte[] ak,
636635
byte[] nsk,
637-
byte[] ovk,
638636
Note note,
639637
byte[] alpha,
640638
byte[] anchor,

0 commit comments

Comments
 (0)