add frozen error code (#497)

FISCO-BCOS · Jan 21, 2020 · 2b0bb69 · 2b0bb69
1 parent bfc3b86
commit 2b0bb69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/main/java/org/fisco/bcos/web3j/precompile/frozen/FrozenService.java b/src/main/java/org/fisco/bcos/web3j/precompile/frozen/FrozenService.java
@@ -4,7 +4,6 @@
 import org.fisco.bcos.web3j.crypto.Credentials;
 import org.fisco.bcos.web3j.crypto.WalletUtils;
 import org.fisco.bcos.web3j.precompile.common.PrecompiledCommon;
-import org.fisco.bcos.web3j.protocol.ObjectMapperFactory;
 import org.fisco.bcos.web3j.protocol.Web3j;
 import org.fisco.bcos.web3j.protocol.core.methods.response.TransactionReceipt;
 import org.fisco.bcos.web3j.tuples.generated.Tuple2;
@@ -14,15 +13,17 @@
 public class FrozenService {
     private static BigInteger gasPrice = new BigInteger("30000000000");
     private static BigInteger gasLimit = new BigInteger("30000000000");
-    private static String ConsensusPrecompileAddress = "0x0000000000000000000000000000000000001007";
+    private static String ContractFrozenPrecompileAddress =
+            "0x0000000000000000000000000000000000001007";
     private Web3j web3j;
     private Frozen frozen;
 
     public FrozenService(Web3j web3j, Credentials credentials) {
         ContractGasProvider contractGasProvider = new StaticGasProvider(gasPrice, gasLimit);
         this.web3j = web3j;
         this.frozen =
-                Frozen.load(ConsensusPrecompileAddress, web3j, credentials, contractGasProvider);
+                Frozen.load(
+                        ContractFrozenPrecompileAddress, web3j, credentials, contractGasProvider);
     }
 
     public String frozen(String addr) throws Exception {
@@ -58,6 +59,6 @@ public String queryStatus(String addr) throws Exception {
         }
 
         Tuple2<BigInteger, String> send = frozen.queryStatus(addr).send();
-        return ObjectMapperFactory.getObjectMapper().writeValueAsString(send);
+        return send.getValue2();
     }
 }
diff --git a/src/main/java/org/fisco/bcos/web3j/protocol/channel/StatusCode.java b/src/main/java/org/fisco/bcos/web3j/protocol/channel/StatusCode.java
@@ -32,6 +32,7 @@ public class StatusCode {
     public static final String GasOverflow = "0x1b";
     public static final String TxPoolIsFull = "0x1c";
     public static final String TransactionRefused = "0x1d";
+    public static final String ContractFrozen = "0x1e";
 
     // extension
     public static final String ExceptionCatched = "0x30";
@@ -163,6 +164,9 @@ public static String getStatusMessage(String status, String errorMessage) {
             case MalformedTx:
                 message = "malformed transaction";
                 break;
+            case ContractFrozen:
+                message = "contract has been frozen";
+                break;
             default:
                 message = errorMessage;
                 break;