Increment private nonce even if transaction failed.

besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java

@@ -671,6 +671,11 @@ static class PrivacyOptionGroup {
         names = {"--privacy-flexible-groups-enabled"},
         description = "Enable flexible privacy groups (default: ${DEFAULT-VALUE})")
     private final Boolean isFlexiblePrivacyGroupsEnabled = false;
+
+    @Option(
+            names = {"--privacy-nonce-incrementation-enabled"},
+            description = "Enable private nonce incrementation even if the transaction didn't succeeded (default: ${DEFAULT-VALUE})")
+    private final Boolean isPrivateNonceIncrementationEnabled = false;
   }
 
   // Metrics Option Group
@@ -2032,6 +2037,8 @@ private PrivacyParameters privacyParameters() {
           privacyOptionGroup.isFlexiblePrivacyGroupsEnabled);
       privacyParametersBuilder.setPrivacyPluginEnabled(
           unstablePrivacyPluginOptions.isPrivacyPluginEnabled());
+      privacyParametersBuilder.setPrivateNonceIncrementationEnabled(
+              privacyOptionGroup.isPrivateNonceIncrementationEnabled);
 
       final boolean hasPrivacyPublicKey = privacyOptionGroup.privacyPublicKeyFile != null;
 

besu/src/test/resources/everything_config.toml

@@ -173,6 +173,7 @@ privacy-multi-tenancy-enabled=true
 privacy-marker-transaction-signing-key-file="./signerKey"
 privacy-enable-database-migration=false
 privacy-flexible-groups-enabled=false
+privacy-nonce-incrementation-enabled=false
 
 # Transaction Pool
 tx-pool="layered"

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PrivacyParameters.java

@@ -77,6 +77,7 @@ public class PrivacyParameters {
   private PrivateStateRootResolver privateStateRootResolver;
   private PrivateWorldStateReader privateWorldStateReader;
   private PrivacyPluginService privacyPluginService;
+  private boolean privateNonceIncrementationEnabled;
 
   public Address getPrivacyAddress() {
     if (isPrivacyPluginEnabled()) {
@@ -228,6 +229,14 @@ private PrivacyGroupGenesisProvider createPrivateGenesisProvider() {
     }
   }
 
+  public boolean isPrivateNonceIncrementationEnabled() {
+    return privateNonceIncrementationEnabled;
+  }
+
+  public void setPrivateNonceIncrementationEnabled(boolean privateNonceIncrementationEnabled) {
+    this.privateNonceIncrementationEnabled = privateNonceIncrementationEnabled;
+  }
+
   @Override
   public String toString() {
     return "PrivacyParameters{"
@@ -263,6 +272,7 @@ public static class Builder {
     private boolean flexiblePrivacyGroupsEnabled;
     private boolean privacyPluginEnabled;
     private PrivacyPluginService privacyPluginService;
+    private boolean privateNonceIncrementationEnabled;
 
     public Builder setEnclaveUrl(final URI enclaveUrl) {
       this.enclaveUrl = enclaveUrl;
@@ -314,6 +324,12 @@ public Builder setFlexiblePrivacyGroupsEnabled(final boolean flexiblePrivacyGrou
       return this;
     }
 
+    public Builder setPrivateNonceIncrementationEnabled(
+        Boolean isPrivateNonceIncrementationEnabled) {
+      this.privateNonceIncrementationEnabled = isPrivateNonceIncrementationEnabled;
+      return this;
+    }
+
     public Builder setPrivacyPluginEnabled(final boolean privacyPluginEnabled) {
       this.privacyPluginEnabled = privacyPluginEnabled;
       return this;
@@ -382,6 +398,7 @@ public PrivacyParameters build() {
       config.setMultiTenancyEnabled(multiTenancyEnabled);
       config.setFlexiblePrivacyGroupsEnabled(flexiblePrivacyGroupsEnabled);
       config.setPrivacyPluginEnabled(privacyPluginEnabled);
+      config.setPrivateNonceIncrementationEnabled(privateNonceIncrementationEnabled);
       return config;
     }
   }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java

@@ -57,9 +57,10 @@ private ClassicProtocolSpecs() {
   public static ProtocolSpecBuilder classicRecoveryInitDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     return MainnetProtocolSpecs.homesteadDefinition(
-            contractSizeLimit, configStackSizeLimit, evmConfiguration)
+            contractSizeLimit, configStackSizeLimit, evmConfiguration, incrementPrivateTransaction)
         .blockHeaderValidatorBuilder(
             feeMarket -> MainnetBlockHeaderValidator.createClassicValidator())
         .name("ClassicRecoveryInit");
@@ -69,9 +70,10 @@ public static ProtocolSpecBuilder tangerineWhistleDefinition(
       final Optional<BigInteger> chainId,
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     return MainnetProtocolSpecs.homesteadDefinition(
-            contractSizeLimit, configStackSizeLimit, evmConfiguration)
+            contractSizeLimit, configStackSizeLimit, evmConfiguration, incrementPrivateTransaction)
         .isReplayProtectionSupported(true)
         .gasCalculator(TangerineWhistleGasCalculator::new)
         .transactionValidatorFactoryBuilder(
@@ -84,9 +86,14 @@ public static ProtocolSpecBuilder dieHardDefinition(
       final Optional<BigInteger> chainId,
       final OptionalInt ignoredConfigContractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     return tangerineWhistleDefinition(
-            chainId, OptionalInt.empty(), configStackSizeLimit, evmConfiguration)
+            chainId,
+            OptionalInt.empty(),
+            configStackSizeLimit,
+            evmConfiguration,
+            incrementPrivateTransaction)
         .gasCalculator(DieHardGasCalculator::new)
         .difficultyCalculator(ClassicDifficultyCalculators.DIFFICULTY_BOMB_PAUSED)
         .name("DieHard");
@@ -97,8 +104,14 @@ public static ProtocolSpecBuilder gothamDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
-    return dieHardDefinition(chainId, contractSizeLimit, configStackSizeLimit, evmConfiguration)
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
+    return dieHardDefinition(
+            chainId,
+            contractSizeLimit,
+            configStackSizeLimit,
+            evmConfiguration,
+            incrementPrivateTransaction)
         .blockReward(MAX_BLOCK_REWARD)
         .difficultyCalculator(ClassicDifficultyCalculators.DIFFICULTY_BOMB_DELAYED)
         .blockProcessorBuilder(
@@ -124,9 +137,15 @@ public static ProtocolSpecBuilder defuseDifficultyBombDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     return gothamDefinition(
-            chainId, contractSizeLimit, configStackSizeLimit, ecip1017EraRounds, evmConfiguration)
+            chainId,
+            contractSizeLimit,
+            configStackSizeLimit,
+            ecip1017EraRounds,
+            evmConfiguration,
+            incrementPrivateTransaction)
         .difficultyCalculator(ClassicDifficultyCalculators.DIFFICULTY_BOMB_REMOVED)
         .transactionValidatorFactoryBuilder(
             (gasCalculator, gasLimitCalculator, feeMarket) ->
@@ -140,7 +159,8 @@ public static ProtocolSpecBuilder atlantisDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     final int contractSizeLimit =
         configContractSizeLimit.orElse(MainnetProtocolSpecs.SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT);
     final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
@@ -149,7 +169,8 @@ public static ProtocolSpecBuilder atlantisDefinition(
             configContractSizeLimit,
             configStackSizeLimit,
             ecip1017EraRounds,
-            evmConfiguration)
+            evmConfiguration,
+            incrementPrivateTransaction)
         .evmBuilder(MainnetEVMs::byzantium)
         .evmConfiguration(evmConfiguration)
         .gasCalculator(SpuriousDragonGasCalculator::new)
@@ -194,14 +215,16 @@ public static ProtocolSpecBuilder aghartaDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     return atlantisDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            evmConfiguration)
+            evmConfiguration,
+            incrementPrivateTransaction)
         .evmBuilder(MainnetEVMs::constantinople)
         .gasCalculator(PetersburgGasCalculator::new)
         .evmBuilder(MainnetEVMs::constantinople)
@@ -215,14 +238,16 @@ public static ProtocolSpecBuilder phoenixDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     return aghartaDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            evmConfiguration)
+            evmConfiguration,
+            incrementPrivateTransaction)
         .gasCalculator(IstanbulGasCalculator::new)
         .evmBuilder(
             (gasCalculator, evmConfig) ->
@@ -238,14 +263,16 @@ public static ProtocolSpecBuilder thanosDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     return phoenixDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            evmConfiguration)
+            evmConfiguration,
+            incrementPrivateTransaction)
         .blockHeaderValidatorBuilder(
             feeMarket ->
                 MainnetBlockHeaderValidator.createPgaBlockHeaderValidator(
@@ -283,14 +310,16 @@ public static ProtocolSpecBuilder magnetoDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     return thanosDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            evmConfiguration)
+            evmConfiguration,
+            incrementPrivateTransaction)
         .gasCalculator(BerlinGasCalculator::new)
         .transactionValidatorFactoryBuilder(
             (gasCalculator, gasLimitCalculator, feeMarket) ->
@@ -313,7 +342,8 @@ public static ProtocolSpecBuilder mystiqueDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     final int contractSizeLimit =
         configContractSizeLimit.orElse(MainnetProtocolSpecs.SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT);
     return magnetoDefinition(
@@ -322,7 +352,8 @@ public static ProtocolSpecBuilder mystiqueDefinition(
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            evmConfiguration)
+            evmConfiguration,
+            incrementPrivateTransaction)
         .gasCalculator(LondonGasCalculator::new)
         .contractCreationProcessorBuilder(
             (gasCalculator, evm) ->
@@ -341,15 +372,17 @@ public static ProtocolSpecBuilder spiralDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final EvmConfiguration evmConfiguration) {
+      final EvmConfiguration evmConfiguration,
+      final boolean incrementPrivateTransaction) {
     final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
     return mystiqueDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            evmConfiguration)
+            evmConfiguration,
+            incrementPrivateTransaction)
         // EIP-3860
         .gasCalculator(ShanghaiGasCalculator::new)
         // EIP-3855