Skip to content

Commit 54faa67

Browse files
authored
Merge pull request #404 from tronprotocol/feature/shielded_TRC20_add_demo
remove redundant mint params code
2 parents a469299 + 1507e21 commit 54faa67

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/main/java/org/tron/demo/ShieldedTRC20Demo.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private static String triggerMint(byte[] contractAddress,
200200
"mint(uint256,bytes32[9],bytes32[2],bytes32[21])",
201201
input,
202202
true,
203-
0L, 10000000L,
203+
0L, 50000000L,
204204
"0", 0,
205205
callerAddress, privateKey);
206206
}
@@ -212,7 +212,7 @@ private static String triggerTransfer(
212212
"transfer(bytes32[10][],bytes32[2][],bytes32[9][],bytes32[2],bytes32[21][])",
213213
input,
214214
true,
215-
0L, 1000000000L,
215+
0L, 50000000L,
216216
"0",
217217
0,
218218
callerAddress, privateKey);
@@ -227,7 +227,7 @@ private static String triggerBurn(byte[] contractAddress,
227227
+ "bytes32[21][])",
228228
input,
229229
true,
230-
0L, 1000000000L,
230+
0L, 50000000L,
231231
"0",
232232
0,
233233
callerAddress, privateKey);
@@ -399,8 +399,6 @@ private static GrpcAPI.PrivateShieldedTRC20Parameters mintParams(String privKey,
399399
BigInteger fromAmount = BigInteger.valueOf(value).multiply(scalingFactorBi);
400400
SpendingKey sk = new SpendingKey(ByteArray.fromHexString(spendingKey));
401401
ExpandedSpendingKey expsk = sk.expandedSpendingKey();
402-
byte[] ask = expsk.getAsk();
403-
byte[] nsk = expsk.getNsk();
404402
byte[] ovk = expsk.getOvk();
405403

406404
// ReceiveNote
@@ -418,8 +416,6 @@ private static GrpcAPI.PrivateShieldedTRC20Parameters mintParams(String privKey,
418416

419417
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
420418
.PrivateShieldedTRC20Parameters.newBuilder();
421-
paramBuilder.setAsk(ByteString.copyFrom(ask));
422-
paramBuilder.setNsk(ByteString.copyFrom(nsk));
423419
paramBuilder.setOvk(ByteString.copyFrom(ovk));
424420
paramBuilder.setFromAmount(fromAmount.toString());
425421
paramBuilder.addShieldedReceives(revNoteBuilder.build());
@@ -452,9 +448,9 @@ private static Optional<TransactionInfo> waitToGetTransactionInfo(String txid)
452448
while (infoById.get().getLogList().size() < 2) {
453449
logger.info("Can not get transaction info, please wait....");
454450
Thread.sleep(5000);
455-
return WalletApi.getTransactionInfoById(txid);
451+
infoById = WalletApi.getTransactionInfoById(txid);
456452
}
457-
return null;
453+
return infoById;
458454
}
459455

460456
private static SpendNoteTRC20 getSpendNote(TransactionInfo txInfo,

0 commit comments

Comments
 (0)