tx gasprice sysconfig support auth (#825)

FISCO-BCOS · Feb 5, 2024 · b24e47e · b24e47e
1 parent d10504e
commit b24e47e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/console/auth/AuthImpl.java b/src/main/java/console/auth/AuthImpl.java
@@ -2,6 +2,7 @@
 
 import console.ConsoleInitializer;
 import console.common.ConsoleUtils;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
@@ -22,6 +23,7 @@
 import org.fisco.bcos.sdk.v3.transaction.codec.decode.ReceiptParser;
 import org.fisco.bcos.sdk.v3.transaction.model.exception.ContractException;
 import org.fisco.bcos.sdk.v3.transaction.model.exception.TransactionException;
+import org.fisco.bcos.sdk.v3.transaction.tools.Convert;
 import org.fisco.bcos.sdk.v3.utils.AddressUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -222,6 +224,11 @@ public void createSetSysConfigProposal(ConsoleInitializer consoleInitializer, St
             throws Exception {
         String key = params[1];
         String value = params[2];
+        if (params.length > 3 && key.equals(SystemConfigService.TX_GAS_PRICE)) {
+            Convert.Unit unit = Convert.Unit.fromString(params[3]);
+            BigDecimal weiValue = Convert.toWei(value, unit);
+            value = weiValue.toBigIntegerExact().toString();
+        }
 
         BigInteger proposalId = authManager.createSetSysConfigProposal(key, value);
         System.out.println("Set system config proposal created, ID is: " + proposalId);

diff --git a/src/main/java/console/command/category/AuthOpCommand.java b/src/main/java/console/command/category/AuthOpCommand.java
@@ -187,7 +187,7 @@ public Map<String, CommandInfo> getAllCommandInfo(boolean isWasm) {
                                     .getAuthFace()
                                     .createSetSysConfigProposal(consoleInitializer, params),
                     2,
-                    2,
+                    3,
                     false,
                     false,
                     true);

diff --git a/src/main/java/console/precompiled/PrecompiledImpl.java b/src/main/java/console/precompiled/PrecompiledImpl.java
@@ -124,9 +124,7 @@ public void setSystemConfigByKey(ConsoleInitializer consoleInitializer, String[]
         if (params.length > 3 && key.equals(SystemConfigService.TX_GAS_PRICE)) {
             Convert.Unit unit = Convert.Unit.fromString(params[3]);
             BigDecimal weiValue = Convert.toWei(value, unit);
-            System.out.println("weiValue: " + weiValue);
             value = weiValue.toBigIntegerExact().toString();
-            System.out.println("value: " + value);
         }
         RetCode retCode = this.systemConfigService.setValueByKey(key, value);
         ConsoleUtils.printJson(retCode.toString());
-Original file line number
+Diff line change
@@ Expand Up @@
                                         .getAuthFace()
                                         .createSetSysConfigProposal(consoleInitializer, params),
 ,
-,
+,
                         false,
                         false,
                         true);
@@ Expand Down @@