Skip to content

Commit 9d26e9e

Browse files
lvs007lvs007
committed
fix conflict
2 parents 0fde1b9 + 624e411 commit 9d26e9e

16 files changed

Lines changed: 185 additions & 179 deletions

File tree

‎common/src/main/java/org/tron/common/parameter/CommonParameter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,9 @@ public class CommonParameter {
293293
@Getter
294294
@Setter
295295
public int minEffectiveConnection;
296-
@Getter
297-
@Setter
298-
public long allowShieldedTransaction; //committee parameter
296+
// @Getter
297+
// @Setter
298+
// public long allowShieldedTransaction; //committee parameter
299299
// full node used this parameter to close shielded transaction
300300
@Getter
301301
@Setter

‎common/src/main/java/org/tron/core/Constant.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public class Constant {
168168

169169
public static final String VM_SAVE_INTERNAL_TX = "vm.saveInternalTx";
170170

171-
public static final String COMMITTEE_ALLOW_SHIELDED_TRANSACTION = "committee.allowShieldedTransaction";
171+
// public static final String COMMITTEE_ALLOW_SHIELDED_TRANSACTION = "committee.allowShieldedTransaction";
172172

173173
public static final String COMMITTEE_ALLOW_SHIELDED_TRC20_TRANSACTION = "committee"
174174
+ ".allowShieldedTRC20Transaction";

‎framework/src/main/java/org/tron/core/config/args/Args.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public static void clearParam() {
155155
PARAMETER.minTimeRatio = 0.0;
156156
PARAMETER.maxTimeRatio = 5.0;
157157
PARAMETER.longRunningTime = 10;
158-
PARAMETER.allowShieldedTransaction = 0;
158+
// PARAMETER.allowShieldedTransaction = 0;
159159
PARAMETER.maxHttpConnectNumber = 50;
160160
PARAMETER.allowMultiSign = 0;
161161
PARAMETER.trxExpirationTimeInMilliseconds = 0;
@@ -628,9 +628,9 @@ public static void setParam(final String[] args, final String confFileName) {
628628
config.hasPath(Constant.VM_SAVE_INTERNAL_TX)
629629
&& config.getBoolean(Constant.VM_SAVE_INTERNAL_TX);
630630

631-
PARAMETER.allowShieldedTransaction =
632-
config.hasPath(Constant.COMMITTEE_ALLOW_SHIELDED_TRANSACTION) ? config
633-
.getInt(Constant.COMMITTEE_ALLOW_SHIELDED_TRANSACTION) : 0;
631+
// PARAMETER.allowShieldedTransaction =
632+
// config.hasPath(Constant.COMMITTEE_ALLOW_SHIELDED_TRANSACTION) ? config
633+
// .getInt(Constant.COMMITTEE_ALLOW_SHIELDED_TRANSACTION) : 0;
634634

635635
PARAMETER.allowShieldedTRC20Transaction =
636636
config.hasPath(Constant.COMMITTEE_ALLOW_SHIELDED_TRC20_TRANSACTION) ? config

‎framework/src/test/java/org/tron/common/runtime/vm/PrecompiledContractsVerifyProofTest.java‎

Lines changed: 66 additions & 90 deletions
Large diffs are not rendered by default.

‎framework/src/test/java/org/tron/core/ShieldedTRC20BuilderTest.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public void createShieldedContractParametersForTransfer1v1()
164164
PaymentAddress senderPaymentAddress1 = senderIvk.address(DiversifierT.random()).get();
165165
String senderPaymentAddressStr = KeyIo.encodePaymentAddress(senderPaymentAddress1);
166166

167-
{//for mint1
167+
{ //for mint1
168168
GrpcAPI.Note note = getNote(100, senderPaymentAddressStr, rcm1, new byte[512]);
169169
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
170170
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -196,7 +196,7 @@ public void createShieldedContractParametersForTransfer1v1()
196196
leafCount++;
197197
}
198198

199-
{//for transfer
199+
{ //for transfer
200200
GrpcAPI.PrivateShieldedTRC20Parameters.Builder privateTRC20Builder = GrpcAPI
201201
.PrivateShieldedTRC20Parameters.newBuilder();
202202
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -293,7 +293,7 @@ public void createShieldedContractParametersForTransfer1v2()
293293
PaymentAddress senderPaymentAddress1 = senderIvk.address(DiversifierT.random()).get();
294294
String senderPaymentAddressStr = KeyIo.encodePaymentAddress(senderPaymentAddress1);
295295

296-
{//for mint1
296+
{ //for mint1
297297
GrpcAPI.Note note = getNote(100, senderPaymentAddressStr, rcm1, new byte[512]);
298298
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
299299
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -325,7 +325,7 @@ public void createShieldedContractParametersForTransfer1v2()
325325
leafCount++;
326326
}
327327

328-
{//for transfer
328+
{ //for transfer
329329
GrpcAPI.PrivateShieldedTRC20Parameters.Builder privateTRC20Builder = GrpcAPI
330330
.PrivateShieldedTRC20Parameters.newBuilder();
331331
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -443,7 +443,7 @@ public void createShieldedContractParametersForTransfer2v1()
443443
String senderPaymentAddressStr1 = KeyIo.encodePaymentAddress(senderPaymentAddress1);
444444
String senderPaymentAddressStr2 = KeyIo.encodePaymentAddress(senderPaymentAddress2);
445445

446-
{//for mint1
446+
{ //for mint1
447447
GrpcAPI.Note note = getNote(30, senderPaymentAddressStr1, rcm1, new byte[512]);
448448
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
449449
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -475,7 +475,7 @@ public void createShieldedContractParametersForTransfer2v1()
475475
leafCount++;
476476
}
477477

478-
{//for mint2
478+
{ //for mint2
479479
GrpcAPI.Note note = getNote(70, senderPaymentAddressStr2, rcm2, new byte[512]);
480480
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
481481
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -507,7 +507,7 @@ public void createShieldedContractParametersForTransfer2v1()
507507
leafCount++;
508508
}
509509

510-
{//for transfer
510+
{ //for transfer
511511
GrpcAPI.PrivateShieldedTRC20Parameters.Builder privateTRC20Builder = GrpcAPI
512512
.PrivateShieldedTRC20Parameters.newBuilder();
513513
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder1 = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -628,7 +628,7 @@ public void createShieldedContractParametersForTransfer2v2()
628628
String senderPaymentAddressStr1 = KeyIo.encodePaymentAddress(senderPaymentAddress1);
629629
String senderPaymentAddressStr2 = KeyIo.encodePaymentAddress(senderPaymentAddress2);
630630

631-
{//for mint1
631+
{ //for mint1
632632
GrpcAPI.Note note = getNote(30, senderPaymentAddressStr1, rcm1, new byte[512]);
633633
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
634634
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -660,7 +660,7 @@ public void createShieldedContractParametersForTransfer2v2()
660660
leafCount++;
661661
}
662662

663-
{//for mint2
663+
{ //for mint2
664664
GrpcAPI.Note note = getNote(70, senderPaymentAddressStr2, rcm2, new byte[512]);
665665
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
666666
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -692,7 +692,7 @@ public void createShieldedContractParametersForTransfer2v2()
692692
leafCount++;
693693
}
694694

695-
{//for transfer
695+
{ //for transfer
696696
GrpcAPI.PrivateShieldedTRC20Parameters.Builder privateTRC20Builder = GrpcAPI
697697
.PrivateShieldedTRC20Parameters.newBuilder();
698698
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder1 = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -825,7 +825,7 @@ public void createShieldedContractParametersForBurn()
825825
PaymentAddress senderPaymentAddress = senderIvk.address(DiversifierT.random()).get();
826826
String senderPaymentAddressStr = KeyIo.encodePaymentAddress(senderPaymentAddress);
827827

828-
{//for mint1
828+
{ //for mint1
829829
GrpcAPI.Note note = getNote(value, senderPaymentAddressStr, rcm, new byte[512]);
830830
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
831831
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -857,7 +857,7 @@ public void createShieldedContractParametersForBurn()
857857
leafCount++;
858858
}
859859

860-
{//for burn
860+
{ //for burn
861861
GrpcAPI.PrivateShieldedTRC20Parameters.Builder privateTRC20Builder = GrpcAPI
862862
.PrivateShieldedTRC20Parameters.newBuilder();
863863
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -918,7 +918,7 @@ public void createShieldedContractParametersForBurn1v2()
918918
PaymentAddress senderPaymentAddress = senderIvk.address(DiversifierT.random()).get();
919919
String senderPaymentAddressStr = KeyIo.encodePaymentAddress(senderPaymentAddress);
920920

921-
{//for mint1
921+
{ //for mint1
922922
GrpcAPI.Note note = getNote(value, senderPaymentAddressStr, rcm, new byte[512]);
923923
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
924924
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -950,7 +950,7 @@ public void createShieldedContractParametersForBurn1v2()
950950
leafCount++;
951951
}
952952

953-
{//for burn
953+
{ //for burn
954954
GrpcAPI.PrivateShieldedTRC20Parameters.Builder privateTRC20Builder = GrpcAPI
955955
.PrivateShieldedTRC20Parameters.newBuilder();
956956
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -1037,7 +1037,7 @@ public void createShieldedContractParametersWithouAskForTransfer1v1()
10371037
PaymentAddress senderPaymentAddress1 = senderIvk.address(DiversifierT.random()).get();
10381038
String senderPaymentAddressStr1 = KeyIo.encodePaymentAddress(senderPaymentAddress1);
10391039

1040-
{//for mint1
1040+
{ //for mint1
10411041
GrpcAPI.Note note = getNote(30, senderPaymentAddressStr1, rcm1, new byte[512]);
10421042
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
10431043
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -1069,7 +1069,7 @@ public void createShieldedContractParametersWithouAskForTransfer1v1()
10691069
leafCount++;
10701070
}
10711071

1072-
{//for transfer
1072+
{ //for transfer
10731073
GrpcAPI.PrivateShieldedTRC20ParametersWithoutAsk.Builder privateTRC20Builder = GrpcAPI
10741074
.PrivateShieldedTRC20ParametersWithoutAsk.newBuilder();
10751075
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder1 = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -1206,7 +1206,7 @@ public void createShieldedContractParametersWithouAskForTransfer1v2()
12061206
PaymentAddress senderPaymentAddress1 = senderIvk.address(DiversifierT.random()).get();
12071207
String senderPaymentAddressStr1 = KeyIo.encodePaymentAddress(senderPaymentAddress1);
12081208

1209-
{//for mint1
1209+
{ //for mint1
12101210
GrpcAPI.Note note = getNote(100, senderPaymentAddressStr1, rcm1, new byte[512]);
12111211
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
12121212
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -1238,7 +1238,7 @@ public void createShieldedContractParametersWithouAskForTransfer1v2()
12381238
leafCount++;
12391239
}
12401240

1241-
{//for transfer
1241+
{ //for transfer
12421242
GrpcAPI.PrivateShieldedTRC20ParametersWithoutAsk.Builder privateTRC20Builder = GrpcAPI
12431243
.PrivateShieldedTRC20ParametersWithoutAsk.newBuilder();
12441244
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder1 = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -1395,7 +1395,7 @@ public void createShieldedContractParametersWithouAskForTransfer2v1()
13951395
String senderPaymentAddressStr1 = KeyIo.encodePaymentAddress(senderPaymentAddress1);
13961396
String senderPaymentAddressStr2 = KeyIo.encodePaymentAddress(senderPaymentAddress2);
13971397

1398-
{//for mint1
1398+
{ //for mint1
13991399
GrpcAPI.Note note = getNote(30, senderPaymentAddressStr1, rcm1, new byte[512]);
14001400
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
14011401
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -1427,7 +1427,7 @@ public void createShieldedContractParametersWithouAskForTransfer2v1()
14271427
leafCount++;
14281428
}
14291429

1430-
{//for mint2
1430+
{ //for mint2
14311431
GrpcAPI.Note note = getNote(70, senderPaymentAddressStr2, rcm2, new byte[512]);
14321432
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
14331433
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -1459,7 +1459,7 @@ public void createShieldedContractParametersWithouAskForTransfer2v1()
14591459
leafCount++;
14601460
}
14611461

1462-
{//for transfer
1462+
{ //for transfer
14631463
GrpcAPI.PrivateShieldedTRC20ParametersWithoutAsk.Builder privateTRC20Builder = GrpcAPI
14641464
.PrivateShieldedTRC20ParametersWithoutAsk.newBuilder();
14651465
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder1 = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -1634,7 +1634,7 @@ public void createShieldedContractParametersWithouAskForTransfer2v2()
16341634
String senderPaymentAddressStr1 = KeyIo.encodePaymentAddress(senderPaymentAddress1);
16351635
String senderPaymentAddressStr2 = KeyIo.encodePaymentAddress(senderPaymentAddress2);
16361636

1637-
{//for mint1
1637+
{ //for mint1
16381638
GrpcAPI.Note note = getNote(30, senderPaymentAddressStr1, rcm1, new byte[512]);
16391639
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
16401640
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -1666,7 +1666,7 @@ public void createShieldedContractParametersWithouAskForTransfer2v2()
16661666
leafCount++;
16671667
}
16681668

1669-
{//for mint2
1669+
{ //for mint2
16701670
GrpcAPI.Note note = getNote(70, senderPaymentAddressStr2, rcm2, new byte[512]);
16711671
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
16721672
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -1698,7 +1698,7 @@ public void createShieldedContractParametersWithouAskForTransfer2v2()
16981698
leafCount++;
16991699
}
17001700

1701-
{//for transfer
1701+
{ //for transfer
17021702
GrpcAPI.PrivateShieldedTRC20ParametersWithoutAsk.Builder privateTRC20Builder = GrpcAPI
17031703
.PrivateShieldedTRC20ParametersWithoutAsk.newBuilder();
17041704
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder1 = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -1887,7 +1887,7 @@ public void createShieldedContractParametersWithoutAskForBurn()
18871887
PaymentAddress senderPaymentAddress = senderIvk.address(DiversifierT.random()).get();
18881888
String senderPaymentAddressStr = KeyIo.encodePaymentAddress(senderPaymentAddress);
18891889

1890-
{//for mint1
1890+
{ //for mint1
18911891
GrpcAPI.Note note = getNote(value, senderPaymentAddressStr, rcm, new byte[512]);
18921892
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
18931893
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -1919,7 +1919,7 @@ public void createShieldedContractParametersWithoutAskForBurn()
19191919
leafCount++;
19201920
}
19211921

1922-
{//for burn
1922+
{ //for burn
19231923
GrpcAPI.PrivateShieldedTRC20ParametersWithoutAsk.Builder privateTRC20Builder = GrpcAPI
19241924
.PrivateShieldedTRC20ParametersWithoutAsk.newBuilder();
19251925
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder = GrpcAPI.SpendNoteTRC20.newBuilder();
@@ -2019,7 +2019,7 @@ public void createShieldedContractParametersWithoutAskForBurn1v2()
20192019
PaymentAddress senderPaymentAddress = senderIvk.address(DiversifierT.random()).get();
20202020
String senderPaymentAddressStr = KeyIo.encodePaymentAddress(senderPaymentAddress);
20212021

2022-
{//for mint1
2022+
{ //for mint1
20232023
GrpcAPI.Note note = getNote(value, senderPaymentAddressStr, rcm, new byte[512]);
20242024
GrpcAPI.ReceiveNote.Builder revNoteBuilder = GrpcAPI.ReceiveNote.newBuilder();
20252025
GrpcAPI.PrivateShieldedTRC20Parameters.Builder paramBuilder = GrpcAPI
@@ -2051,7 +2051,7 @@ public void createShieldedContractParametersWithoutAskForBurn1v2()
20512051
leafCount++;
20522052
}
20532053

2054-
{//for burn
2054+
{ //for burn
20552055
GrpcAPI.PrivateShieldedTRC20ParametersWithoutAsk.Builder privateTRC20Builder = GrpcAPI
20562056
.PrivateShieldedTRC20ParametersWithoutAsk.newBuilder();
20572057
GrpcAPI.SpendNoteTRC20.Builder spendNoteBuilder = GrpcAPI.SpendNoteTRC20.newBuilder();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void init() {
6161
dbManager = context.getBean(Manager.class);
6262
//give a big value for pool, avoid for
6363
dbManager.getDynamicPropertiesStore().saveTotalShieldedPoolValue(10_000_000_000L);
64-
Args.getInstance().setAllowShieldedTransaction(1);
64+
// Args.getInstance().setAllowShieldedTransaction(1);
6565
}
6666

6767
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class SaplingNoteTest {
2020
@BeforeClass
2121
public static void init() {
2222
Args.setFullNodeAllowShieldedTransaction(true);
23-
Args.getInstance().setAllowShieldedTransaction(1);
23+
// Args.getInstance().setAllowShieldedTransaction(1);
2424
FullNodeHttpApiService.librustzcashInitZksnarkParams();
2525
}
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public static void init() {
150150
consensusService.start();
151151
//give a big value for pool, avoid for
152152
chainBaseManager.getDynamicPropertiesStore().saveTotalShieldedPoolValue(10_000_000_000L);
153-
Args.getInstance().setAllowShieldedTransaction(1);
153+
// Args.getInstance().setAllowShieldedTransaction(1);
154154
}
155155

156156
/**

0 commit comments

Comments
 (0)