23.7.1-RC burn in (#5750)

* Address import performance issues (#5734)
* 23.7.1-RC burn-in rev

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>

CHANGELOG.md

@@ -2,17 +2,6 @@
 
 ## 23.7.1
 
-### Breaking Changes
-
-### Additions and Improvements
-
-### Bug Fixes
-
-### Download Links
-
-
-## 23.7.0
-
 ### Breaking Changes
 - Removed deprecated GoQuorum permissioning interop [#5607](https://github.com/hyperledger/besu/pull/5607)
 - Removed support for version 0 of the database as it is no longer used by any active node. [#5698](https://github.com/hyperledger/besu/pull/5698)
@@ -35,11 +24,13 @@
 - Failure at startup when enabling layered txpool before initial sync done [#5636](https://github.com/hyperledger/besu/issues/5636)
 - Remove miner-related option warnings if the change isn't using Ethash consensus algorithm [#5669](https://github.com/hyperledger/besu/pull/5669)
 - Fix for pending transactions reference leak [#5693](https://github.com/hyperledger/besu/pull/5693) 
+- Address a performance regression observed in import testing [#5734](https://github.com/hyperledger/besu/pull/5734)
 
 ### Download Links
-https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.7.0/besu-23.7.0.tar.gz / sha256: 083efc26e22fa20bd04c9a6311e50dd93092f001e5d639d023fd7a61173616dd 
-https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.7.0/besu-23.7.0.zip / sha256: 019a5ce3b7b94e76a6bac08bc23e3fec9880e235928b3c5378541927690046d7
 
+## 23.7.0 
+
+- Was not released (failed burn-in test)
 
 ## 23.4.4
 
@@ -71,7 +62,7 @@ https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.4.4/besu-23.4.4.z
 
 - Was not released (failed burn-in test)
 
-- ## 23.4.2
+## 23.4.2
 
 - Was not released (failed burn-in test)
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionEncoder.java

@@ -21,6 +21,7 @@ import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.TransactionType;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 import org.hyperledger.besu.evm.AccessListEntry;
@@ -75,9 +76,10 @@ public class TransactionEncoder {
               TYPED_TRANSACTION_ENCODERS.get(transactionType),
               "Developer Error. A supported transaction type %s has no associated encoding logic",
               transactionType);
-      return Bytes.concatenate(
-          Bytes.of(transactionType.getSerializedType()),
-          RLP.encode(rlpOutput -> encoder.encode(transaction, rlpOutput)));
+      final BytesValueRLPOutput out = new BytesValueRLPOutput();
+      out.writeByte(transactionType.getSerializedType());
+      encoder.encode(transaction, out);
+      return out.encoded();
     }
   }
 

ethereum/p2p/build.gradle

@@ -62,7 +62,13 @@ dependencies {
 
   annotationProcessor "org.immutables:value"
   implementation "org.immutables:value-annotations"
-  implementation 'tech.pegasys.discovery:discovery'
+  implementation('tech.pegasys.discovery:discovery') {
+    // version conflicts, prefer ours
+    exclude group: 'org.apache.tuweni', module:'tuweni-bytes'
+    exclude group: 'org.apache.tuweni', module:'tuweni-crypto'
+    exclude group: 'org.apache.tuweni', module:'tuweni-rlp'
+    exclude group: 'org.apache.tuweni', module:'tuweni-units'
+  }
 
   // test dependencies.
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')

gradle.properties

@@ -1,4 +1,4 @@
-version=23.7.1-SNAPSHOT
+version=23.7.1-RC
 
 org.gradle.welcome=never
 # Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396)