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.

Sign up for GitHub

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

Cherry-pick #9581 into release/0.42 #9592

Merged
merged 10 commits into from Nov 1, 2023
Merged

Cherry-pick #9581 into release/0.42 #9592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8cf1258
Increase contract kv/pairs storage allowed by 100x
lukelee-sl Oct 31, 2023
f3b1303
update the default for modualrization service contracts configuration
lukelee-sl Oct 31, 2023
953f80e
fix unit test
lukelee-sl Oct 31, 2023
85219aa
update config values related to jmh and in ContractAutoExpirySpecs
lukelee-sl Oct 31, 2023
75884e0
Remove `_` from contract values in property files
david-bakin-sl Nov 1, 2023
2db5ad4
add contracts.maxKvPairs.individual config to testnet and mainnet env…
lukelee-sl Nov 1, 2023
e13b3ba
remove updates to environment specific bootstrap.properties files
lukelee-sl Nov 1, 2023
e960da2
restore underscores for readibility
lukelee-sl Nov 1, 2023
a3e77e1
add underscore
lukelee-sl Nov 1, 2023
dfa4fc3
remove code changes as these changes will not be deployed
lukelee-sl Nov 1, 2023
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
1 change: 1 addition & 0 deletions hedera-node/configuration/mainnet/bootstrap.properties
View file
Open in desktop
Expand Up @@ -19,3 +19,4 @@ accounts.maxNumber=20_000_000
#Overrides that differ based on the network
ledger.id=0x00
contracts.chainId=295
contracts.maxKvPairs.individual=16_384_000
1 change: 1 addition & 0 deletions hedera-node/configuration/testnet/bootstrap.properties
View file
Open in desktop
Expand Up @@ -17,3 +17,4 @@ tokens.nfts.maxAllowedMints=10_000_000
ledger.id=0x01
contracts.chainId=296
bootstrap.genesisPublicKey=e06b22e0966108fa5d63fc6ae53f9824319b891cd4d6050dbf2b242be7e13344
contracts.maxKvPairs.individual=16_384_000
2 changes: 1 addition & 1 deletion hedera-node/hedera-app/src/test/resources/bootstrap.properties
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ contracts.knownBlockHash=
contracts.localCall.estRetBytes=32
contracts.maxGasPerSec=15000000
contracts.maxKvPairs.aggregate=500_000_000
contracts.maxKvPairs.individual=163_840
contracts.maxKvPairs.individual=16_384_000
contracts.maxNumber=5_000_000
contracts.maxRefundPercentOfGasLimit=20
contracts.precompile.exchangeRateGasCost=100
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-mono-service/src/main/resources/bootstrap.properties
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ contracts.knownBlockHash=
contracts.localCall.estRetBytes=4096
contracts.maxGasPerSec=15000000
contracts.maxKvPairs.aggregate=500_000_000
contracts.maxKvPairs.individual=163_840
contracts.maxKvPairs.individual=16_384_000
contracts.maxNumber=5_000_000
contracts.maxRefundPercentOfGasLimit=20
contracts.precompile.exchangeRateGasCost=100
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/com/hedera/node/app/service/mono/context/properties/BootstrapPropertiesTest.java
View file
Open in desktop
Expand Up @@ -370,7 +370,7 @@ class BootstrapPropertiesTest {
entry(CONTRACTS_LOCAL_CALL_EST_RET_BYTES, 32),
entry(CONTRACTS_MAX_GAS_PER_SEC, 15000000L),
entry(CONTRACTS_MAX_KV_PAIRS_AGGREGATE, 500_000_000L),
entry(CONTRACTS_MAX_KV_PAIRS_INDIVIDUAL, 163_840),
entry(CONTRACTS_MAX_KV_PAIRS_INDIVIDUAL, 16_384_000),
entry(CONTRACTS_CHAIN_ID, 295),
entry(CONTRACTS_THROTTLE_THROTTLE_BY_GAS, true),
entry(CONTRACTS_PRECOMPILE_HTS_UNSUPPORTED_CUSTOM_FEE_RECEIVER_DEBITS, EnumSet.of(CustomFeeType.FIXED_FEE)),
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-mono-service/src/test/resources/bootstrap.properties
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ contracts.knownBlockHash=
contracts.localCall.estRetBytes=32
contracts.maxGasPerSec=15000000
contracts.maxKvPairs.aggregate=500_000_000
contracts.maxKvPairs.individual=163_840
contracts.maxKvPairs.individual=16_384_000
contracts.maxNumber=5_000_000
contracts.maxRefundPercentOfGasLimit=20
contracts.precompile.exchangeRateGasCost=100
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/hedera-mono-service/src/test/resources/bootstrap/standard.properties
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ contracts.knownBlockHash=
contracts.localCall.estRetBytes=32
contracts.maxGasPerSec=15000000
contracts.maxKvPairs.aggregate=500_000_000
contracts.maxKvPairs.individual=163_840
contracts.maxKvPairs.individual=16_384_000
contracts.maxNumber=5_000_000
contracts.maxRefundPercentOfGasLimit=20
contracts.precompile.exchangeRateGasCost=100
Expand Down
2 changes: 1 addition & 1 deletion ...ients/src/main/java/com/hedera/services/bdd/suites/autorenew/ContractAutoExpirySpecs.java
View file
Open in desktop
Expand Up @@ -337,7 +337,7 @@ private HapiSpec storageRentChargedOnlyAfterInitialFreePeriodIsComplete() {
opLog.info("Renewal fee with storage: {}", renewalFeeWithStorage.get());
assertTrue(renewalFeeWithStorage.get() > renewalFeeWithoutStorage.get());
}),
overriding(INDIVIDUAL_KV_LIMIT_PROP, String.valueOf(163_840)));
overriding(INDIVIDUAL_KV_LIMIT_PROP, String.valueOf(16_384_000)));
}

private HapiSpec autoRenewWorksAsExpected() {
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/test-clients/src/main/resource/bootstrap.properties
View file
Open in desktop
Expand Up @@ -79,7 +79,7 @@ contracts.knownBlockHash=
contracts.localCall.estRetBytes=32
contracts.maxGasPerSec=15000000
contracts.maxKvPairs.aggregate=500_000_000
contracts.maxKvPairs.individual=163_840
contracts.maxKvPairs.individual=16_384_000
contracts.maxNumber=5_000_000
contracts.maxRefundPercentOfGasLimit=20
contracts.precompile.exchangeRateGasCost=100
Expand Down
2 changes: 1 addition & 1 deletion hedera-node/test-clients/src/main/resource/precompile-bootstrap.properties
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ contracts.evm.version.dynamic=false
contracts.localCall.estRetBytes=32
contracts.maxGas=8000000
contracts.maxKvPairs.aggregate=500_000_000
contracts.maxKvPairs.individual=163_840
contracts.maxKvPairs.individual=16_384_000
contracts.chainId=298
contracts.throttle.throttleByGas=true
contracts.maxRefundPercentOfGasLimit=20
Expand Down