<fix>(auth): fix auth bug, add auth interfaces.

kyonRay · kyonRay · commit 299f15d00a67 · 2021-11-29T02:20:17.000+08:00
diff --git a/sdk-core/src/main/java/org/fisco/bcos/sdk/model/TransactionReceipt.java b/sdk-core/src/main/java/org/fisco/bcos/sdk/model/TransactionReceipt.java
@@ -193,7 +193,7 @@ public void setGasUsed(String gasUsed) {
     }
 
     public String getContractAddress() {
-        if (!isWasm() && Objects.nonNull(contractAddress)) {
+        if (!isWasm() && Objects.nonNull(contractAddress) && !contractAddress.isEmpty()) {
             return "0x" + contractAddress;
         }
 
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/manager/AuthManager.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/manager/AuthManager.java
@@ -5,6 +5,8 @@
 import java.util.List;
 import org.fisco.bcos.sdk.client.Client;
 import org.fisco.bcos.sdk.codec.ABICodecException;
+import org.fisco.bcos.sdk.codec.datatypes.NumericType;
+import org.fisco.bcos.sdk.codec.datatypes.Type;
 import org.fisco.bcos.sdk.contract.auth.contracts.Committee;
 import org.fisco.bcos.sdk.contract.auth.contracts.CommitteeManager;
 import org.fisco.bcos.sdk.contract.auth.contracts.ContractAuthPrecompiled;
@@ -116,6 +118,15 @@ public BigInteger setDeployAuthType(AuthType deployAuthType)
         return getProposal(transactionResponse);
     }
 
+    /**
+     * get global deploy auth type
+     *
+     * @return deployAuthType
+     */
+    public BigInteger getDeployAuthType() throws ContractException {
+        return this.contractAuthPrecompiled.deployType();
+    }
+
     /**
      * submit a proposal of adding deploy contract auth for account, only governor can call it
      *
@@ -186,11 +197,17 @@ public BigInteger getProposal(TransactionResponse transactionResponse)
         if (transactionResponse == null) {
             throw new TransactionException("Decode transaction response error");
         }
-        List<Object> valuesList = transactionResponse.getValuesList();
+        if (transactionResponse.getTransactionReceipt().getStatus() != 0) {
+            throw new TransactionException(
+                    transactionResponse.getReceiptMessages(),
+                    transactionResponse.getTransactionReceipt().getStatus());
+        }
+        List<Type> valuesList = transactionResponse.getResults();
         if (valuesList == null || valuesList.isEmpty()) {
             throw new TransactionException("Decode transaction response error");
         }
-        return BigInteger.valueOf((long) valuesList.get(0));
+        NumericType value = (NumericType) valuesList.get(0);
+        return value.getValue();
     }
 
     /**
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/CommitteeInfo.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/CommitteeInfo.java
@@ -1,40 +1,66 @@
 package org.fisco.bcos.sdk.contract.auth.po;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 import org.fisco.bcos.sdk.codec.datatypes.generated.tuples.generated.Tuple4;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CommitteeInfo {
-    private List<String> governorList;
-    private List<BigInteger> weightList;
+    private final Logger logger = LoggerFactory.getLogger(CommitteeInfo.class);
+
+    class GovernorInfo {
+        String governorAddress;
+        BigInteger weight;
+
+        public GovernorInfo(String governorAddress, BigInteger weight) {
+            this.governorAddress = governorAddress;
+            this.weight = weight;
+        }
+
+        @Override
+        public String toString() {
+            return "GovernorInfo{"
+                    + "governorAddress='"
+                    + governorAddress
+                    + '\''
+                    + ", weight="
+                    + weight
+                    + '}';
+        }
+    }
+
+    private List<GovernorInfo> governorList = new ArrayList<>();
     private int participatesRate;
     private int winRate;
 
     public CommitteeInfo fromTuple(
             Tuple4<BigInteger, BigInteger, List<String>, List<BigInteger>> tuple) {
-        this.governorList = tuple.getValue3();
-        this.weightList = tuple.getValue4();
+        List<String> governorNameList = tuple.getValue3();
+        List<BigInteger> weightList = tuple.getValue4();
+        try {
+            for (int i = 0; i < governorNameList.size(); i++) {
+                this.governorList.add(new GovernorInfo(governorNameList.get(i), weightList.get(i)));
+            }
+        } catch (IndexOutOfBoundsException e) {
+            logger.error(
+                    "Governor list size not fit with weight list, you should check committee info. e:",
+                    e);
+        }
         this.participatesRate = tuple.getValue1().intValue();
         this.winRate = tuple.getValue2().intValue();
         return this;
     }
 
-    public List<String> getGovernorList() {
+    public List<GovernorInfo> getGovernorList() {
         return governorList;
     }
 
-    public void setGovernorList(List<String> governorList) {
+    public void setGovernorList(List<GovernorInfo> governorList) {
         this.governorList = governorList;
     }
 
-    public List<BigInteger> getWeightList() {
-        return weightList;
-    }
-
-    public void setWeightList(List<BigInteger> weightList) {
-        this.weightList = weightList;
-    }
-
     public int getParticipatesRate() {
         return participatesRate;
     }
@@ -56,8 +82,6 @@ public String toString() {
         return "CommitteeInfo{"
                 + "governorList="
                 + governorList
-                + ", weightList="
-                + weightList
                 + ", participatesRate="
                 + participatesRate
                 + ", winRate="
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalInfo.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalInfo.java
@@ -5,7 +5,7 @@
 import org.fisco.bcos.sdk.codec.datatypes.generated.tuples.generated.Tuple7;
 
 public class ProposalInfo {
-    private String id;
+    private String resourceId;
     private String proposer;
     private int proposalType;
     private long blockNumberInterval;
@@ -16,7 +16,7 @@ public class ProposalInfo {
     public ProposalInfo fromTuple(
             Tuple7<String, String, BigInteger, BigInteger, BigInteger, List<String>, List<String>>
                     tuple7) {
-        this.id = tuple7.getValue1();
+        this.resourceId = tuple7.getValue1();
         this.proposer = tuple7.getValue2();
         this.proposalType = tuple7.getValue3().intValue();
         this.blockNumberInterval = tuple7.getValue4().longValue();
@@ -26,12 +26,12 @@ public ProposalInfo fromTuple(
         return this;
     }
 
-    public String getId() {
-        return id;
+    public String getResourceId() {
+        return resourceId;
     }
 
-    public void setId(String id) {
-        this.id = id;
+    public void setResourceId(String resourceId) {
+        this.resourceId = resourceId;
     }
 
     public String getProposer() {
@@ -85,18 +85,18 @@ public void setAgainstVoters(List<String> againstVoters) {
     @Override
     public String toString() {
         return "ProposalInfo{"
-                + "id='"
-                + id
+                + "resourceId='"
+                + resourceId
                 + '\''
                 + ", proposer='"
                 + proposer
                 + '\''
                 + ", proposalType="
-                + proposalType
+                + ProposalType.fromInt(proposalType).getValue()
                 + ", blockNumberInterval="
                 + blockNumberInterval
                 + ", status="
-                + status
+                + ProposalStatus.fromInt(status).getValue()
                 + ", agreeVoters="
                 + agreeVoters
                 + ", againstVoters="
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalStatus.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalStatus.java
@@ -0,0 +1,34 @@
+package org.fisco.bcos.sdk.contract.auth.po;
+
+public enum ProposalStatus {
+    NOT_ENOUGH_VOTE("notEnoughVotes"),
+    SUCCESS("success"),
+    FAILED("failed"),
+    REVOKE("revoke"),
+    UNKNOWN("unknown");
+
+    private final String value;
+
+    ProposalStatus(String value) {
+        this.value = value;
+    }
+
+    public final String getValue() {
+        return value;
+    }
+
+    static ProposalStatus fromInt(int status) {
+        switch (status) {
+            case 1:
+                return NOT_ENOUGH_VOTE;
+            case 2:
+                return SUCCESS;
+            case 3:
+                return FAILED;
+            case 4:
+                return REVOKE;
+            default:
+                return UNKNOWN;
+        }
+    }
+}
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalType.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/ProposalType.java
@@ -0,0 +1,37 @@
+package org.fisco.bcos.sdk.contract.auth.po;
+
+public enum ProposalType {
+    SET_WEIGHT("setWeight"),
+    SET_RATE("setRate"),
+    SET_DEPLOY_AUTH_TYPE("setDeployAuthType"),
+    MODIFY_DEPLOY_AUTH("modifyDeployAuth"),
+    RESET_ADMIN("resetAdmin"),
+    UNKNOWN("unknown");
+
+    private final String value;
+
+    ProposalType(String value) {
+        this.value = value;
+    }
+
+    public final String getValue() {
+        return value;
+    }
+
+    static ProposalType fromInt(int type) {
+        switch (type) {
+            case 11:
+                return ProposalType.SET_WEIGHT;
+            case 12:
+                return ProposalType.SET_RATE;
+            case 21:
+                return ProposalType.SET_DEPLOY_AUTH_TYPE;
+            case 22:
+                return ProposalType.MODIFY_DEPLOY_AUTH;
+            case 31:
+                return ProposalType.RESET_ADMIN;
+            default:
+                return ProposalType.UNKNOWN;
+        }
+    }
+}
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/ReceiptParser.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/decode/ReceiptParser.java
@@ -40,7 +40,7 @@ public static RetCode parseTransactionReceipt(TransactionReceipt receipt)
             throws ContractException {
         RetCode retCode;
         try {
-            Integer status = receipt.getStatus();
+            int status = receipt.getStatus();
             if (status != 0) {
                 retCode = TransactionReceiptStatus.getStatusMessage(status, receipt.getMessage());
                 Tuple2<Boolean, String> errorOutput =
diff --git a/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/exception/TransactionException.java b/sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/model/exception/TransactionException.java
@@ -6,14 +6,14 @@
 public class TransactionException extends Exception {
     private static final long serialVersionUID = -2204228001512046284L;
     private Optional<String> transactionHash = Optional.empty();
-    private String status;
+    private int status;
     private BigInteger gasUsed;
 
-    public String getStatus() {
+    public int getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(int status) {
         this.status = status;
     }
 
@@ -38,8 +38,13 @@ public TransactionException(String message, String transactionHash) {
         this.transactionHash = Optional.ofNullable(transactionHash);
     }
 
+    public TransactionException(String message, int status) {
+        super(message);
+        this.status = status;
+    }
+
     public TransactionException(
-            String message, String status, BigInteger gasUsed, String transactionHash) {
+            String message, int status, BigInteger gasUsed, String transactionHash) {
         super(message);
         this.status = status;
         this.gasUsed = gasUsed;
diff --git a/src/integration-test/java/org/fisco/bcos/sdk/auth/AuthTest.java b/src/integration-test/java/org/fisco/bcos/sdk/auth/AuthTest.java

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public void setGasUsed(String gasUsed) {`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`public String getContractAddress() {`
`196`		`- if (!isWasm() && Objects.nonNull(contractAddress)) {`
	`196`	`+ if (!isWasm() && Objects.nonNull(contractAddress) && !contractAddress.isEmpty()) {`
`197`	`197`	`return "0x" + contractAddress;`
`198`	`198`	`}`
`199`	`199`