Merge pull request #430 from tronprotocol/release_4.2

Release 4.2

Author: 317787106

src/main/java/org/tron/walletcli/Client.java

@@ -118,7 +118,6 @@ public class Client {
       "GetContract contractAddress",
       "GetContractInfo contractAddress",
       "GetDelegatedResource",
-      "GetDelegatedResourceAccountIndex",
       "GetDiversifier",
       "GetExchange",
       "GetExpandedSpendingKey",
@@ -1255,7 +1254,9 @@ private void unfreezeBalance(String[] parameters)
     byte[] ownerAddress = null;
     int resourceCode = 0;
     byte[] receiverAddress = null;
-    if (parameters.length == 2) {
+    if (parameters.length == 1) {
+      resourceCode = Integer.parseInt(parameters[index++]);
+    } else if (parameters.length == 2) {
       ownerAddress = getAddressBytes(parameters[index]);
       if (ownerAddress != null) {
         index++;
@@ -1387,7 +1388,6 @@ private void deleteProposal(String[] parameters)
     }
   }
 
-
   private void listProposals() {
     Optional<ProposalList> result = walletApiWrapper.getProposalsList();
     if (result.isPresent()) {
@@ -1433,22 +1433,6 @@ private void getDelegatedResource(String[] parameters) {
     }
   }
 
-  private void getDelegatedResourceAccountIndex(String[] parameters) {
-    if (parameters == null || parameters.length != 1) {
-      System.out.println("Using getDelegatedResourceAccountIndex command needs 1 parameter like: ");
-      System.out.println("getDelegatedResourceAccountIndex address");
-      return;
-    }
-    String address = parameters[0];
-    Optional<DelegatedResourceAccountIndex> result = WalletApi
-        .getDelegatedResourceAccountIndex(address);
-    if (result.isPresent()) {
-      DelegatedResourceAccountIndex delegatedResourceAccountIndex = result.get();
-      System.out.println(Utils.formatMessageString(delegatedResourceAccountIndex));
-    } else {
-      System.out.println("GetDelegatedResourceAccountIndex failed !!");
-    }
-  }
 
 
   private void exchangeCreate(String[] parameters)
@@ -3962,10 +3946,6 @@ private void run() {
               getDelegatedResource(parameters);
               break;
             }
-            case "getdelegatedresourceaccountindex": {
-              getDelegatedResourceAccountIndex(parameters);
-              break;
-            }
             case "exchangecreate": {
               exchangeCreate(parameters);
               break;

src/main/java/org/tron/walletserver/GrpcClient.java

@@ -360,21 +360,6 @@ public Optional<DelegatedResourceList> getDelegatedResource(String fromAddress,
     return Optional.ofNullable(delegatedResource);
   }
 
-  public Optional<DelegatedResourceAccountIndex> getDelegatedResourceAccountIndex(String address) {
-
-    ByteString addressBS = ByteString.copyFrom(
-        Objects.requireNonNull(WalletApi.decodeFromBase58Check(address)));
-
-    BytesMessage bytesMessage = BytesMessage.newBuilder().setValue(addressBS).build();
-    DelegatedResourceAccountIndex accountIndex;
-    if (blockingStubSolidity != null) {
-      accountIndex = blockingStubSolidity.getDelegatedResourceAccountIndex(bytesMessage);
-    } else {
-      accountIndex = blockingStubFull.getDelegatedResourceAccountIndex(bytesMessage);
-    }
-    return Optional.ofNullable(accountIndex);
-  }
-
 
   public Optional<ExchangeList> listExchanges() {
     ExchangeList exchangeList;

src/main/java/org/tron/walletserver/WalletApi.java

@@ -1504,12 +1504,6 @@ public static Optional<DelegatedResourceList> getDelegatedResource(
     return rpcCli.getDelegatedResource(fromAddress, toAddress);
   }
 
-  public static Optional<DelegatedResourceAccountIndex> getDelegatedResourceAccountIndex
-      (
-          String address) {
-    return rpcCli.getDelegatedResourceAccountIndex(address);
-  }
-
   public static Optional<ExchangeList> listExchanges() {
     return rpcCli.listExchanges();
   }

src/main/protos/api/api.proto

@@ -459,9 +459,6 @@ service Wallet {
   rpc GetDelegatedResource (DelegatedResourceMessage) returns (DelegatedResourceList) {
   };
 
-  rpc GetDelegatedResourceAccountIndex (BytesMessage) returns (DelegatedResourceAccountIndex) {
-  };
-
   rpc ListProposals (EmptyMessage) returns (ProposalList) {
     option (google.api.http) = {
       post: "/wallet/listproposals"

src/main/protos/core/Tron.proto

@@ -413,6 +413,7 @@ message BlockHeader {
     bytes witness_address = 9;
     int32 version = 10;
     bytes accountStateRoot = 11;
+    bytes receiptsRoot = 12;
   }
   raw raw_data = 1;
   bytes witness_signature = 2;