Merge remote-tracking branch 'upstream/develop' into hooks-merge

* upstream/develop:
  Factor out Transactor::trapTransaction (5087)
  Remove shards (5066)

Builds/levelization/results/loops.txt

@@ -16,11 +16,8 @@ Loop: xrpld.app xrpld.ledger
 Loop: xrpld.app xrpld.net
   xrpld.app > xrpld.net
 
-Loop: xrpld.app xrpld.nodestore
-  xrpld.app > xrpld.nodestore
-
 Loop: xrpld.app xrpld.overlay
-  xrpld.overlay ~= xrpld.app
+  xrpld.overlay == xrpld.app
 
 Loop: xrpld.app xrpld.peerfinder
   xrpld.app > xrpld.peerfinder
@@ -38,10 +35,7 @@ Loop: xrpld.core xrpld.perflog
   xrpld.perflog ~= xrpld.core
 
 Loop: xrpld.net xrpld.rpc
-  xrpld.rpc > xrpld.net
-
-Loop: xrpld.nodestore xrpld.overlay
-  xrpld.overlay ~= xrpld.nodestore
+  xrpld.rpc ~= xrpld.net
 
 Loop: xrpld.overlay xrpld.rpc
   xrpld.rpc ~= xrpld.overlay

Builds/levelization/results/ordering.txt

@@ -74,19 +74,13 @@ test.ledger > xrpld.app
 test.ledger > xrpld.core
 test.ledger > xrpld.ledger
 test.ledger > xrpl.protocol
-test.net > test.jtx
-test.net > test.toplevel
-test.net > test.unit_test
-test.net > xrpld.net
 test.nodestore > test.jtx
 test.nodestore > test.toplevel
 test.nodestore > test.unit_test
 test.nodestore > xrpl.basics
-test.nodestore > xrpld.app
 test.nodestore > xrpld.core
 test.nodestore > xrpld.nodestore
 test.nodestore > xrpld.unity
-test.nodestore > xrpl.protocol
 test.overlay > test.jtx
 test.overlay > test.unit_test
 test.overlay > xrpl.basics
@@ -109,13 +103,11 @@ test.resource > test.unit_test
 test.resource > xrpl.basics
 test.resource > xrpl.resource
 test.rpc > test.jtx
-test.rpc > test.nodestore
 test.rpc > test.toplevel
 test.rpc > xrpl.basics
 test.rpc > xrpld.app
 test.rpc > xrpld.core
 test.rpc > xrpld.net
-test.rpc > xrpld.nodestore
 test.rpc > xrpld.overlay
 test.rpc > xrpld.rpc
 test.rpc > xrpl.json
@@ -150,6 +142,7 @@ xrpld.app > test.unit_test
 xrpld.app > xrpl.basics
 xrpld.app > xrpld.conditions
 xrpld.app > xrpld.consensus
+xrpld.app > xrpld.nodestore
 xrpld.app > xrpld.perflog
 xrpld.app > xrpl.json
 xrpld.app > xrpl.protocol
@@ -186,14 +179,12 @@ xrpld.peerfinder > xrpl.basics
 xrpld.peerfinder > xrpld.core
 xrpld.peerfinder > xrpl.protocol
 xrpld.perflog > xrpl.basics
-xrpld.perflog > xrpld.nodestore
 xrpld.perflog > xrpl.json
 xrpld.perflog > xrpl.protocol
 xrpld.rpc > xrpl.basics
 xrpld.rpc > xrpld.core
 xrpld.rpc > xrpld.ledger
 xrpld.rpc > xrpld.nodestore
-xrpld.rpc > xrpld.shamap
 xrpld.rpc > xrpl.json
 xrpld.rpc > xrpl.protocol
 xrpld.rpc > xrpl.resource

cfg/rippled-example.cfg

@@ -1094,7 +1094,7 @@
 #                           default value for the unspecified parameter.
 #
 #                           Note: the cache will not be created if online_delete
-#                           is specified, or if shards are used.
+#                           is specified.
 #
 #       fast_load           Boolean. If set, load the last persisted ledger
 #                           from disk upon process start before syncing to
@@ -1107,10 +1107,6 @@
 #       earliest_seq        The default is 32570 to match the XRP ledger
 #                           network's earliest allowed sequence. Alternate
 #                           networks may set this value. Minimum value of 1.
-#                           If a [shard_db] section is defined, and this
-#                           value is present either [node_db] or [shard_db],
-#                           it must be defined with the same value in both
-#                           sections.
 #
 #       online_delete       Minimum value of 256. Enable automatic purging
 #                           of older ledger information. Maintain at least this
@@ -1192,32 +1188,6 @@
 #   your rippled.cfg file.
 #   Partial pathnames are relative to the location of the rippled executable.
 #
-#   [shard_db]      Settings for the Shard Database (optional)
-#
-#   Format (without spaces):
-#       One or more lines of case-insensitive key / value pairs:
-#       <key> '=' <value>
-#       ...
-#
-#   Example:
-#       path=db/shards/nudb
-#
-#   Required keys:
-#       path                Location to store the database
-#
-#   Optional keys:
-#       max_historical_shards
-#                           The maximum number of historical shards
-#                           to store.
-#
-#   [historical_shard_paths]      Additional storage paths for the Shard Database (optional)
-#
-#   Format (without spaces):
-#       One or more lines, each expressing a full path for storing historical shards:
-#       /mnt/disk1
-#       /mnt/disk2
-#       ...
-#
 #   [sqlite]       Tuning settings for the SQLite databases (optional)
 #
 #   Format (without spaces):
@@ -1674,21 +1644,6 @@ path=/var/lib/rippled/db/nudb
 online_delete=512
 advisory_delete=0
 
-# This is the persistent datastore for shards. It is important for the health
-# of the ripple network that rippled operators shard as much as practical.
-# NuDB requires SSD storage. Helpful information can be found at
-# https://xrpl.org/history-sharding.html
-#[shard_db]
-#path=/var/lib/rippled/db/shards/nudb
-#max_historical_shards=50
-#
-# This optional section can be configured with a list
-# of paths to use for storing historical shards. Each
-# path must correspond to a unique filesystem.
-#[historical_shard_paths]
-#/path/1
-#/path/2
-
 [database_path]
 /var/lib/rippled/db
 

cfg/rippled-reporting.cfg

@@ -1039,17 +1039,13 @@
 #                           default value for the unspecified parameter.
 #
 #                           Note: the cache will not be created if online_delete
-#                           is specified, or if shards are used.
+#                           is specified.
 #
 #   Optional keys for NuDB or RocksDB:
 #
 #       earliest_seq        The default is 32570 to match the XRP ledger
 #                           network's earliest allowed sequence. Alternate
 #                           networks may set this value. Minimum value of 1.
-#                           If a [shard_db] section is defined, and this
-#                           value is present either [node_db] or [shard_db],
-#                           it must be defined with the same value in both
-#                           sections.
 #
 #       online_delete       Minimum value of 256. Enable automatic purging
 #                           of older ledger information. Maintain at least this
@@ -1135,32 +1131,6 @@
 #   your rippled.cfg file.
 #   Partial pathnames are relative to the location of the rippled executable.
 #
-#   [shard_db]      Settings for the Shard Database (optional)
-#
-#   Format (without spaces):
-#       One or more lines of case-insensitive key / value pairs:
-#       <key> '=' <value>
-#       ...
-#
-#   Example:
-#       path=db/shards/nudb
-#
-#   Required keys:
-#       path                Location to store the database
-#
-#   Optional keys:
-#       max_historical_shards
-#                           The maximum number of historical shards
-#                           to store.
-#
-#   [historical_shard_paths]      Additional storage paths for the Shard Database (optional)
-#
-#   Format (without spaces):
-#       One or more lines, each expressing a full path for storing historical shards:
-#       /mnt/disk1
-#       /mnt/disk2
-#       ...
-#
 #   [sqlite]       Tuning settings for the SQLite databases (optional)
 #
 #   Format (without spaces):
@@ -1616,21 +1586,6 @@ path=/var/lib/rippled-reporting/db/nudb
 # online_delete=512 #
 advisory_delete=0
 
-# This is the persistent datastore for shards. It is important for the health
-# of the ripple network that rippled operators shard as much as practical.
-# NuDB requires SSD storage. Helpful information can be found at
-# https://xrpl.org/history-sharding.html
-#[shard_db]
-#path=/var/lib/rippled/db/shards/nudb
-#max_historical_shards=50
-#
-# This optional section can be configured with a list
-# of paths to use for storing historical shards. Each
-# path must correspond to a unique filesystem.
-#[historical_shard_paths]
-#/path/1
-#/path/2
-
 [database_path]
 /var/lib/rippled-reporting/db
 

cmake/RippledCore.cmake

@@ -140,18 +140,17 @@ if(xrpld)
 
   # any files that don't play well with unity should be added here
   if(tests)
-  set_source_files_properties(
-    # these two seem to produce conflicts in beast teardown template methods
-    src/test/rpc/ValidatorRPC_test.cpp
-    src/test/rpc/ShardArchiveHandler_test.cpp
-    src/test/ledger/Invariants_test.cpp
-    # These depend on wasmedge.h, which has some duplicate declarations
-    src/ripple/app/hook/impl/applyHook.cpp
-    src/ripple/app/misc/NetworkOPs.cpp
-    src/ripple/app/tx/impl/applySteps.cpp
-    src/ripple/app/tx/impl/SetHook.cpp
-    src/ripple/app/tx/impl/Transactor.cpp
-    src/ripple/rpc/handlers/Fee1.cpp
-    PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
+    set_source_files_properties(
+      # these two seem to produce conflicts in beast teardown template methods
+      src/test/rpc/ValidatorRPC_test.cpp
+      src/test/ledger/Invariants_test.cpp
+      # These depend on wasmedge.h, which has some duplicate declarations
+      src/ripple/app/hook/impl/applyHook.cpp
+      src/ripple/app/misc/NetworkOPs.cpp
+      src/ripple/app/tx/impl/applySteps.cpp
+      src/ripple/app/tx/impl/SetHook.cpp
+      src/ripple/app/tx/impl/Transactor.cpp
+      src/ripple/rpc/handlers/Fee1.cpp
+      PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
   endif()
 endif()