Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/v3.6.5 dynamic energy #2463

Merged
merged 3 commits into from Sep 10, 2019
Merged

Feature/v3.6.5 dynamic energy #2463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5c17a4
add proposals for modifying parameters of energy dynamic adjustment.
Sep 10, 2019
e668a25
Merge branch 'develop_v3.6.5' into feature/v3.6.5_dynamicEnergy
Sep 10, 2019
5e09aec
change proposal number
Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/main/java/org/tron/core/actuator/ProposalCreateActuator.java
View file
Open in desktop
Expand Up @@ -339,6 +339,26 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
}
break;
}
case (28): {
if (!dbManager.getForkController().pass(ForkBlockVersionEnum.VERSION_3_6_5)) {
throw new ContractValidateException("Bad chain parameter id");
}
if (entry.getValue() < 1 || entry.getValue() > 1_000) {
throw new ContractValidateException(
"Bad chain parameter value,valid range is [1,1_000]");
}
break;
}
case (29): {
if (!dbManager.getForkController().pass(ForkBlockVersionEnum.VERSION_3_6_5)) {
throw new ContractValidateException("Bad chain parameter id");
}
if (entry.getValue() < 1 || entry.getValue() > 10_000L) {
throw new ContractValidateException(
"Bad chain parameter value,valid range is [1,10_000]");
}
break;
}
default:
break;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/tron/core/db/DynamicPropertiesStore.java
View file
Open in desktop
Expand Up @@ -370,7 +370,7 @@ private DynamicPropertiesStore(@Value("properties") String dbName) {
try {
this.getAdaptiveResourceLimitTargetRatio();
} catch (IllegalArgumentException e) {
this.saveAdaptiveResourceLimitTargetRatio(14400);//24 * 60 * 10
this.saveAdaptiveResourceLimitTargetRatio(14400);// 24 * 60 * 10,one minute 1/10 total limit
}

try {
Expand Down Expand Up @@ -927,7 +927,7 @@ public void saveTotalEnergyLimit(long totalEnergyLimit) {
new BytesCapsule(ByteArray.fromLong(totalEnergyLimit)));

long ratio = getAdaptiveResourceLimitTargetRatio();
saveTotalEnergyTargetLimit(totalEnergyLimit / ratio);// 24 * 60 * 10,one minute 1/10 total limit
saveTotalEnergyTargetLimit(totalEnergyLimit / ratio);
}

public void saveTotalEnergyLimit2(long totalEnergyLimit) {
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/org/tron/core/witness/ProposalController.java
View file
Open in desktop
Expand Up @@ -195,7 +195,8 @@ public void setDynamicParameters(ProposalCapsule proposalCapsule) {
if (manager.getForkController().pass(Parameter.ForkBlockVersionEnum.VERSION_3_6_5)) {
//24 * 60 * 2 . one minute,1/2 total limit.
manager.getDynamicPropertiesStore().saveAdaptiveResourceLimitTargetRatio(2880);
manager.getDynamicPropertiesStore().saveTotalEnergyTargetLimit(manager.getDynamicPropertiesStore().getTotalEnergyLimit() / 2880);
manager.getDynamicPropertiesStore().saveTotalEnergyTargetLimit(
manager.getDynamicPropertiesStore().getTotalEnergyLimit() / 2880);
manager.getDynamicPropertiesStore().saveAdaptiveResourceLimitLimitMultiplier(50);
}
}
Expand Down Expand Up @@ -226,6 +227,18 @@ public void setDynamicParameters(ProposalCapsule proposalCapsule) {
manager.getDynamicPropertiesStore().saveAllowTvmSolidity059(entry.getValue());
break;
}
case (28): {
long ratio = 24 * 60 * entry.getValue();
manager.getDynamicPropertiesStore().saveAdaptiveResourceLimitTargetRatio(ratio);
manager.getDynamicPropertiesStore().saveTotalEnergyTargetLimit(
manager.getDynamicPropertiesStore().getTotalEnergyLimit() / ratio);
break;
}
case (29): {
manager.getDynamicPropertiesStore().saveAdaptiveResourceLimitLimitMultiplier(entry.getValue());
break;
}

default:
break;
}
Expand Down