diff --git a/common/src/main/java/org/tron/common/logsfilter/TriggerConfig.java b/common/src/main/java/org/tron/common/logsfilter/TriggerConfig.java
index d76db47c40d..bf4b1cd4946 100644
--- a/common/src/main/java/org/tron/common/logsfilter/TriggerConfig.java
+++ b/common/src/main/java/org/tron/common/logsfilter/TriggerConfig.java
@@ -33,7 +33,7 @@ public TriggerConfig() {
triggerName = "";
enabled = false;
topic = "";
- redundancy = false; // event will also write to log
+ redundancy = false; // if true, event triggers will also be emitted as log triggers
ethCompatible = false; // add eth compatible fields, just for transaction now
solidified = false; // just write solidified data, just for block and transaction now
}
diff --git a/framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/HttpApiOnSolidityService.java b/framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/HttpApiOnSolidityService.java
index 33e325bd578..b7e96a36b45 100644
--- a/framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/HttpApiOnSolidityService.java
+++ b/framework/src/main/java/org/tron/core/services/interfaceOnSolidity/http/solidity/HttpApiOnSolidityService.java
@@ -265,7 +265,6 @@ protected void addServlet(ServletContextHandler context) {
context.addServlet(new ServletHolder(getMarketPairListOnSolidityServlet),
"/walletsolidity/getmarketpairlist");
- // only for SolidityNode
context.addServlet(new ServletHolder(getTransactionByIdOnSolidityServlet),
"/walletsolidity/gettransactionbyid");
context.addServlet(new ServletHolder(getTransactionInfoByIdOnSolidityServlet),
diff --git a/framework/src/main/resources/logback.xml b/framework/src/main/resources/logback.xml
index 1b0955df2fd..1c50b65e518 100644
--- a/framework/src/main/resources/logback.xml
+++ b/framework/src/main/resources/logback.xml
@@ -31,7 +31,7 @@
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
./logs/tron-%d{yyyy-MM-dd}.%i.log.gz
-
+
500MB
7
50GB
diff --git a/protocol/src/main/protos/core/contract/account_contract.proto b/protocol/src/main/protos/core/contract/account_contract.proto
index d3180048f43..05e7226329c 100644
--- a/protocol/src/main/protos/core/contract/account_contract.proto
+++ b/protocol/src/main/protos/core/contract/account_contract.proto
@@ -29,7 +29,7 @@ message AccountCreateContract {
AccountType type = 3;
}
-// Update account name. Account name is not unique now.
+// Update account name. ALLOW_UPDATE_ACCOUNT_NAME is not enabled on Mainnet, so account names are currently unique.
message AccountUpdateContract {
bytes account_name = 1;
bytes owner_address = 2;
@@ -47,4 +47,3 @@ message AccountPermissionUpdateContract {
Permission witness = 3; //Can be empty
repeated Permission actives = 4; //Empty is invalidate
}
-