diff --git a/hedera-node/hedera-app/src/test/resources/bootstrap.properties b/hedera-node/hedera-app/src/test/resources/bootstrap.properties index 28581e5bd8d5..69ab6ff8c60e 100644 --- a/hedera-node/hedera-app/src/test/resources/bootstrap.properties +++ b/hedera-node/hedera-app/src/test/resources/bootstrap.properties @@ -80,7 +80,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 diff --git a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ContractsConfig.java b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ContractsConfig.java index eea17a2561c6..479bb53f32c4 100644 --- a/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ContractsConfig.java +++ b/hedera-node/hedera-config/src/main/java/com/hedera/node/config/data/ContractsConfig.java @@ -46,7 +46,7 @@ public record ContractsConfig( @ConfigProperty(defaultValue = "15000000") @NetworkProperty long maxGasPerSec, @ConfigProperty(value = "maxKvPairs.aggregate", defaultValue = "500000000") @NetworkProperty long maxKvPairsAggregate, - @ConfigProperty(value = "maxKvPairs.individual", defaultValue = "163840") @NetworkProperty + @ConfigProperty(value = "maxKvPairs.individual", defaultValue = "16384000") @NetworkProperty int maxKvPairsIndividual, @ConfigProperty(defaultValue = "5000000") @NetworkProperty long maxNumber, // CHAINID returns 295 (0x0127) for mainnet, 296 (0x0128) for testnet, and 297 (0x0129) for previewnet. diff --git a/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/contracts/SizeLimitedStorageBench.java b/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/contracts/SizeLimitedStorageBench.java index 6ec091da2b5e..64ecc57b686e 100644 --- a/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/contracts/SizeLimitedStorageBench.java +++ b/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/contracts/SizeLimitedStorageBench.java @@ -54,7 +54,7 @@ @Measurement(iterations = 3, time = 30) public class SizeLimitedStorageBench { // Application-level config overrides - @Param("163840") + @Param("16384000") int maxContractKvPairs; // Config for the starting database to load/create diff --git a/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/ledger/StakingActivityModule.java b/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/ledger/StakingActivityModule.java index 55229264739b..c0bac8bd343d 100644 --- a/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/ledger/StakingActivityModule.java +++ b/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/ledger/StakingActivityModule.java @@ -92,7 +92,7 @@ public interface StakingActivityModule { @Provides @Singleton static GlobalDynamicProperties provideGlobalDynamicProperties() { - return mockPropertiesWith(500_000_000, 163_840); + return mockPropertiesWith(500_000_000, 16_384_000); } @Provides diff --git a/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/setup/EvmKeyValueSource.java b/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/setup/EvmKeyValueSource.java index 7fbec53bf04d..619804e62a01 100644 --- a/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/setup/EvmKeyValueSource.java +++ b/hedera-node/hedera-mono-service/src/jmh/java/com/hedera/node/app/service/mono/setup/EvmKeyValueSource.java @@ -27,7 +27,7 @@ private EvmKeyValueSource() { throw new UnsupportedOperationException(); } - private static final int NUM_KEYS = 163_840; + private static final int NUM_KEYS = 16_384_000; private static final long ENTROPY_SEED = 42_424_242L; private static final UInt256[] keys = new UInt256[NUM_KEYS]; private static final SplittableRandom r = new SplittableRandom(ENTROPY_SEED); diff --git a/hedera-node/hedera-mono-service/src/main/resources/bootstrap.properties b/hedera-node/hedera-mono-service/src/main/resources/bootstrap.properties index b3fc1fef5e96..3267887c5d2b 100644 --- a/hedera-node/hedera-mono-service/src/main/resources/bootstrap.properties +++ b/hedera-node/hedera-mono-service/src/main/resources/bootstrap.properties @@ -80,7 +80,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 diff --git a/hedera-node/hedera-mono-service/src/test/java/com/hedera/node/app/service/mono/context/properties/BootstrapPropertiesTest.java b/hedera-node/hedera-mono-service/src/test/java/com/hedera/node/app/service/mono/context/properties/BootstrapPropertiesTest.java index 2407d96db606..beb8b9d72636 100644 --- a/hedera-node/hedera-mono-service/src/test/java/com/hedera/node/app/service/mono/context/properties/BootstrapPropertiesTest.java +++ b/hedera-node/hedera-mono-service/src/test/java/com/hedera/node/app/service/mono/context/properties/BootstrapPropertiesTest.java @@ -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)), diff --git a/hedera-node/hedera-mono-service/src/test/resources/bootstrap.properties b/hedera-node/hedera-mono-service/src/test/resources/bootstrap.properties index e54ef8c7ff34..b8efe458c9fc 100644 --- a/hedera-node/hedera-mono-service/src/test/resources/bootstrap.properties +++ b/hedera-node/hedera-mono-service/src/test/resources/bootstrap.properties @@ -80,7 +80,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 diff --git a/hedera-node/hedera-mono-service/src/test/resources/bootstrap/standard.properties b/hedera-node/hedera-mono-service/src/test/resources/bootstrap/standard.properties index b08643ec25be..ba8a3f37b3fa 100644 --- a/hedera-node/hedera-mono-service/src/test/resources/bootstrap/standard.properties +++ b/hedera-node/hedera-mono-service/src/test/resources/bootstrap/standard.properties @@ -80,7 +80,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 diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/autorenew/ContractAutoExpirySpecs.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/autorenew/ContractAutoExpirySpecs.java index 9318c06dc3ff..106638cc806b 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/autorenew/ContractAutoExpirySpecs.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/autorenew/ContractAutoExpirySpecs.java @@ -335,7 +335,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() { diff --git a/hedera-node/test-clients/src/main/resource/bootstrap.properties b/hedera-node/test-clients/src/main/resource/bootstrap.properties index 67cc8911638a..3ed9b9e45807 100644 --- a/hedera-node/test-clients/src/main/resource/bootstrap.properties +++ b/hedera-node/test-clients/src/main/resource/bootstrap.properties @@ -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 diff --git a/hedera-node/test-clients/src/main/resource/precompile-bootstrap.properties b/hedera-node/test-clients/src/main/resource/precompile-bootstrap.properties index 4919741718f3..55d84cfe308a 100644 --- a/hedera-node/test-clients/src/main/resource/precompile-bootstrap.properties +++ b/hedera-node/test-clients/src/main/resource/precompile-bootstrap.properties @@ -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