From 80310f662cfa0befab559c50d94c3b5b692791b6 Mon Sep 17 00:00:00 2001 From: wenlinli <1574249665@qq.com> Date: Tue, 6 Feb 2024 00:07:16 +0800 Subject: [PATCH 1/2] tx gasprice sysconfig support auth --- src/main/java/console/auth/AuthImpl.java | 8 ++++++++ src/main/java/console/command/category/AuthOpCommand.java | 2 +- src/main/java/console/precompiled/PrecompiledImpl.java | 2 -- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/console/auth/AuthImpl.java b/src/main/java/console/auth/AuthImpl.java index 57384150..be5f4827 100644 --- a/src/main/java/console/auth/AuthImpl.java +++ b/src/main/java/console/auth/AuthImpl.java @@ -2,6 +2,8 @@ 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 +24,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 +225,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 index cd22bc49..79c4924e 100644 --- a/src/main/java/console/command/category/AuthOpCommand.java +++ b/src/main/java/console/command/category/AuthOpCommand.java @@ -187,7 +187,7 @@ public Map 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 index 6acad53a..827f315b 100644 --- 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()); From 941dc8adf23a50eb283d970866e46aa007469ba7 Mon Sep 17 00:00:00 2001 From: wenlinli <1574249665@qq.com> Date: Tue, 6 Feb 2024 00:20:49 +0800 Subject: [PATCH 2/2] format --- src/main/java/console/auth/AuthImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/console/auth/AuthImpl.java b/src/main/java/console/auth/AuthImpl.java index be5f4827..d9431d29 100644 --- a/src/main/java/console/auth/AuthImpl.java +++ b/src/main/java/console/auth/AuthImpl.java @@ -2,7 +2,6 @@ import console.ConsoleInitializer; import console.common.ConsoleUtils; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.Arrays;