Merge release v4.8.1 test case

protocol/src/main/protos/api/api.proto

@@ -505,6 +505,8 @@ service Wallet {
     };
   };
 
+  rpc GetPaginatedNowWitnessList (PaginatedMessage) returns (WitnessList) {
+  };
 
   rpc GetDelegatedResource (DelegatedResourceMessage) returns (DelegatedResourceList) {
   };
@@ -880,6 +882,10 @@ service WalletSolidity {
       }
     };
   };
+
+  rpc GetPaginatedNowWitnessList (PaginatedMessage) returns (WitnessList) {
+  };
+
   rpc GetAssetIssueList (EmptyMessage) returns (AssetIssueList) {
     option (google.api.http) = {
       post: "/walletsolidity/getassetissuelist"

testcase/build.gradle

@@ -188,7 +188,7 @@ task replaceConfig(type: Test){
 
 task dailyBuild(type: Test, dependsOn: replaceConfig ) {
     doFirst{
-        maxHeapSize = "3072m"
+        maxHeapSize = "2048m"
         useTestNG {
             suites(file('src/test/resources/daily-build.xml'))
             parallel 'tests'

testcase/src/test/java/stest/tron/wallet/common/client/utils/DailyBuildReport.java

@@ -17,6 +17,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import lombok.extern.slf4j.Slf4j;
+import org.testng.Assert;
 import org.testng.ITestContext;
 import org.testng.ITestResult;
 import org.testng.TestListenerAdapter;
@@ -49,6 +50,10 @@ public class DailyBuildReport extends TestListenerAdapter {
   private String slack = Configuration.getByPath("testng.conf")
       .getString("defaultParameter.slack");
 
+  private final String witnessKey03 =
+      Configuration.getByPath("testng.conf").getString("witness.key3");
+  private final byte[] witnessAddress03 = PublicMethed.getFinalAddress(witnessKey03);
+
   @Override
   public void onConfigurationFailure(ITestResult itr) {
     super.onConfigurationFailure(itr);
@@ -131,8 +136,13 @@ public void onFinish(ITestContext testContext) {
       sb.append("Total: " + (passedNum.get() + failedNum.get() + skippedNum.get()) + ",  " + "Passed: " + passedNum
           + ",  " + "Failed: " + failedNum + ",  " + "Skipped: " + skippedNum + "\n");
       sb.append("------------------------------------------------------------------------------\n");
-      List<Map.Entry<String, Integer>> list = calculateAfterDailyBuild();
-      sb.append("Total transaction number:" + totalTransactionNum.get() + "\n");
+        List<Map.Entry<String, Integer>> list = null;
+        try {
+            list = calculateAfterDailyBuild();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        sb.append("Total transaction number:" + totalTransactionNum.get() + "\n");
       sb.append("Transaction type list:" + "\n");
       for (Map.Entry<String, Integer> entry : list) {
         sb.append(entry.getKey());
@@ -170,7 +180,7 @@ public void onFinish(ITestContext testContext) {
   /**
    * calculate transaction num and transaction type After DailyBuild.
    */
-  public List<Map.Entry<String, Integer>> calculateAfterDailyBuild() {
+  public List<Map.Entry<String, Integer>> calculateAfterDailyBuild() throws InterruptedException {
     channelFull = ManagedChannelBuilder.forTarget(fullnode)
             .usePlaintext()
             .build();
@@ -202,6 +212,14 @@ public List<Map.Entry<String, Integer>> calculateAfterDailyBuild() {
         }
       }
     }
+
+    boolean sr3Status = checkSRStatus();
+    if(!sr3Status){
+      String cmd = slack + " " + "3rd witness not produce block";
+      PublicMethed.exec(cmd);
+    }
+    Assert.assertTrue(sr3Status,"3rd witness not produce block");
+
     try {
       if (channelFull != null) {
         channelFull.shutdown().awaitTermination(5, TimeUnit.SECONDS);
@@ -220,5 +238,26 @@ public int compare(Map.Entry<String, Integer> o1, Map.Entry<String, Integer> o2)
     return list;
   }
 
+  public boolean checkSRStatus(){
+    String add41 = ByteArray.toHexString(witnessAddress03);
+    Long beginNum = blockingStubFull.getNowBlock(GrpcAPI.EmptyMessage.newBuilder().build())
+        .getBlockHeader().getRawData().getNumber();
+    Long nowNum = beginNum;
+    while (nowNum - beginNum < 210) {
+      List<Protocol.Witness> list =
+          PublicMethed.listWitnesses(blockingStubFull).get().getWitnessesList();
+      for (Protocol.Witness tem: list) {
+        if ((add41.equalsIgnoreCase(ByteArray.toHexString(tem.getAddress().toByteArray())))
+            && (tem.getTotalProduced() > 3)) {
+          return true;
+        }
+      }
+      PublicMethed.waitProduceNextBlock(blockingStubFull);
+      nowNum = blockingStubFull.getNowBlock(GrpcAPI.EmptyMessage.newBuilder().build())
+          .getBlockHeader().getRawData().getNumber();
+    }
+    return false;
+  }
+
 }
 

testcase/src/test/java/stest/tron/wallet/common/client/utils/HttpMethed.java

@@ -6127,6 +6127,40 @@ public static HttpResponse getEstimateEnergyDeployContract(
     return  response;
   }
 
+  public static HttpResponse getPaginatedNowWitnessList(String httpNode, Long offset, Long limit, boolean visible){
+    HttpResponse response = null;
+    final String requestUrl = "http://" + httpNode + "/wallet/getpaginatednowwitnesslist";
+    JsonObject requestParam = new JsonObject();
+    requestParam.addProperty("offset", offset);
+    requestParam.addProperty("limit", limit);
+    requestParam.addProperty("visible", visible);
+    try {
+    response = createConnect(requestUrl, requestParam);
+    } catch (Exception e) {
+      e.printStackTrace();
+      httppost.releaseConnection();
+    }
+    return  response;
+
+  }
+
+  public static HttpResponse getPaginatedNowWitnessListSolidity(String httpNodeSolidity, Long offset, Long limit, boolean visible){
+    HttpResponse response = null;
+    final String requestUrl = "http://" + httpNodeSolidity + "/walletsolidity/getpaginatednowwitnesslist";
+    JsonObject requestParam = new JsonObject();
+    requestParam.addProperty("offset", offset);
+    requestParam.addProperty("limit", limit);
+    requestParam.addProperty("visible", visible);
+    try {
+      response = createConnect(requestUrl, requestParam);
+    } catch (Exception e) {
+      e.printStackTrace();
+      httppost.releaseConnection();
+    }
+    return  response;
+  }
+
+
 
 
 }

testcase/src/test/java/stest/tron/wallet/common/client/utils/JsonRpcBase.java

@@ -67,6 +67,9 @@ public class JsonRpcBase {
   public String fullnode =
       Configuration.getByPath("testng.conf").getStringList("fullnode.ip.list").get(0);
 
+  public String solidityNode =
+      Configuration.getByPath("testng.conf").getStringList("solidityNode.ip.list").get(1);
+
   public static long maxFeeLimit = 0L;
   public static String trc20AddressByteString;
   public static String trc20AddressHex;
@@ -113,6 +116,10 @@ public void deployJsonRpcUseResource() throws Exception {
     // Wallet.setAddressPreFixByte(CommonConstant.ADD_PRE_FIX_BYTE_MAINNET);
     channelFull = ManagedChannelBuilder.forTarget(fullnode).usePlaintext().build();
     blockingStubFull = WalletGrpc.newBlockingStub(channelFull);
+
+    channelSolidity = ManagedChannelBuilder.forTarget(solidityNode).usePlaintext().build();
+    blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelSolidity);
+
     freezeBeforeAllTest();
     Assert.assertTrue(
         PublicMethed.sendcoin(

testcase/src/test/java/stest/tron/wallet/common/client/utils/ProposalEnum.java

@@ -2,6 +2,7 @@
 
 public enum ProposalEnum {
 
+  GetAllowTvmSelfdestructRestriction("getAllowTvmSelfdestructRestriction"),
   GetAllowNewResourceModel("getAllowNewResourceModel"),
   GetUnfreezeDelayDays("getUnfreezeDelayDays"),
   GetAllowDynamicEnergy("getAllowDynamicEnergy"),

testcase/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java

@@ -5,7 +5,6 @@
 import com.google.common.primitives.Longs;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
@@ -24,10 +23,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpResponse;
 import org.bouncycastle.util.encoders.Hex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.tron.api.GrpcAPI;
 import org.tron.api.GrpcAPI.AccountNetMessage;
@@ -73,7 +69,6 @@
 import org.tron.protos.Protocol.Account;
 
 import org.tron.protos.Protocol.Account.FreezeV2;
-import org.tron.protos.Protocol.Account.Frozen;
 import org.tron.protos.Protocol.Block;
 import org.tron.protos.Protocol.ChainParameters;
 import org.tron.protos.Protocol.DelegatedResourceAccountIndex;
@@ -158,6 +153,7 @@ public class PublicMethed {
   public static String code;
 
   public static AtomicInteger randomFreezeAmount = new AtomicInteger(1);
+  public static AtomicInteger randomTimeOffset = new AtomicInteger(1);
 
   private static final String fullnode2 = Configuration.getByPath("testng.conf")
           .getStringList("fullnode.ip.list").get(1);
@@ -1139,6 +1135,10 @@ public static Boolean freezeV2ProposalIsOpen(WalletGrpc.WalletBlockingStub block
         .getProposalName(), blockingStubFull) > 0;
   }
 
+  public static Boolean allowTvmSelfdestructRestrictionIsActive(WalletGrpc.WalletBlockingStub blockingStubFull) {
+    return PublicMethed.getChainParametersValue(ProposalEnum.GetAllowTvmSelfdestructRestriction.getProposalName(),
+            blockingStubFull) == 1;
+  }
 
   public static Boolean tronPowerProposalIsOpen(WalletGrpc.WalletBlockingStub blockingStubFull) {
     return PublicMethed.getChainParametersValue(ProposalEnum.GetAllowNewResourceModel
@@ -5740,7 +5740,7 @@ public synchronized static HashMap<String, String> getBycodeAbi(String solFile,
     logger.debug("outputPath: " + outputPath);
     String cmd =
         compile
-            + " --optimize  --evm-version cancun --bin --abi --overwrite "
+            + " --optimize --bin --abi --overwrite "
             + absolutePath
             + "/"
             + solFile
@@ -5798,7 +5798,7 @@ public synchronized static HashMap<String, String> getBycodeAbiWithParam(String
     logger.debug("outputPath: " + outputPath);
     String cmd =
             compile
-                    + " --optimize " + param +" --evm-version cancun --bin --abi --overwrite "
+                    + " --optimize " + param +" --bin --abi --overwrite "
                     + absolutePath
                     + "/"
                     + solFile
@@ -8461,8 +8461,12 @@ public static String gRPCurlRequest(String data, String requestUrl, String node)
     return null;
   }
 
+  public static GrpcAPI.WitnessList getPaginatedNowWitnessList(Long offset, Long limit, WalletBlockingStub blockingStubFull){
+    return blockingStubFull.getPaginatedNowWitnessList(GrpcAPI.PaginatedMessage.newBuilder().setLimit(limit).setOffset(offset).build());
+  }
 
-
-
+  public static GrpcAPI.WitnessList getPaginatedNowWitnessListSolidity(Long offset, Long limit, WalletSolidityGrpc.WalletSolidityBlockingStub blockingStubSolidity){
+    return blockingStubSolidity.getPaginatedNowWitnessList(GrpcAPI.PaginatedMessage.newBuilder().setLimit(limit).setOffset(offset).build());
+  }
 
 }

testcase/src/test/java/stest/tron/wallet/common/client/utils/TransactionUtils.java

@@ -447,7 +447,7 @@ public static String getTransactionSign(String transaction, String priKey,
    */
 
   public static Transaction setTimestamp(Transaction transaction) {
-    long currentTime = System.currentTimeMillis();//*1000000 + System.nanoTime()%1000000;
+    long currentTime = System.currentTimeMillis() + PublicMethed.randomTimeOffset.getAndAdd(1);//*1000000 + System.nanoTime()%1000000;
     Transaction.Builder builder = transaction.toBuilder();
     org.tron.protos.Protocol.Transaction.raw.Builder rowBuilder = transaction.getRawData()
         .toBuilder();

testcase/src/test/java/stest/tron/wallet/dailybuild/assetissue/WalletExchange001.java

@@ -280,7 +280,7 @@ public void test5WithdrawExchange() {
 
   }
 
-  @Test(enabled = true,description = "Test exchange transaction")
+  @Test(enabled = false,description = "Test exchange transaction")
   public void test6TransactionExchange() {
     exchangeIdInfo = PublicMethed.getExchange(exchangeId.toString(), blockingStubFull);
     final Long beforeExchangeToken1Balance = exchangeIdInfo.get().getFirstTokenBalance();

testcase/src/test/java/stest/tron/wallet/dailybuild/assetissue/grammar/ContractGrammar002.java

@@ -19,6 +19,7 @@
 import stest.tron.wallet.common.client.utils.ECKey;
 import stest.tron.wallet.common.client.utils.PublicMethed;
 import stest.tron.wallet.common.client.utils.Utils;
+import stest.tron.wallet.common.client.utils.ProposalEnum;
 
 @Slf4j
 public class ContractGrammar002 {
@@ -309,9 +310,15 @@ public void test6Grammar013() {
         "getCount()", "#", false,
         0, maxFeeLimit, grammarAddress2, testKeyForGrammarAddress2, blockingStubFull);
     PublicMethed.waitProduceNextBlock(blockingStubFull);
-    Assert.assertTrue(txid4 == null);
-
-
+    if(PublicMethed.allowTvmSelfdestructRestrictionIsActive(blockingStubFull)) {
+      infoById4 = PublicMethed.getTransactionInfoById(txid4, blockingStubFull);
+      Assert.assertTrue(infoById4.get().getResultValue() == 0);
+      returnnumber1 = ByteArray.toLong(ByteArray
+              .fromHexString(ByteArray.toHexString(infoById2.get().getContractResult(0).toByteArray())));
+      Assert.assertTrue(returnnumber1 == 10);
+    }else {
+      Assert.assertTrue(txid4 == null);
+    }
   }
 
   /**