diff --git a/src/Nethermind/Nethermind.Db.Rpc/RpcDb.cs b/src/Nethermind/Nethermind.Db.Rpc/RpcDb.cs index 98279f33c4a..6c6cc02ed1d 100644 --- a/src/Nethermind/Nethermind.Db.Rpc/RpcDb.cs +++ b/src/Nethermind/Nethermind.Db.Rpc/RpcDb.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text.Json; using Nethermind.Core; using Nethermind.Core.Extensions; using Nethermind.JsonRpc; @@ -96,7 +97,7 @@ private byte[] GetThroughRpc(ReadOnlySpan key) byte[] value = null; if (response.Result is not null) { - value = Bytes.FromHexString((string)response.Result); + value = Bytes.FromHexString(response.Result.ToString()); if (_recordDb is not null) { _recordDb[key] = value; diff --git a/src/Nethermind/Nethermind.Db/FullPruning/FullPruningInnerDbFactory.cs b/src/Nethermind/Nethermind.Db/FullPruning/FullPruningInnerDbFactory.cs index 42edb7b34b6..54df51cfd16 100644 --- a/src/Nethermind/Nethermind.Db/FullPruning/FullPruningInnerDbFactory.cs +++ b/src/Nethermind/Nethermind.Db/FullPruning/FullPruningInnerDbFactory.cs @@ -59,7 +59,7 @@ private DbSettings GetRocksDbSettings(DbSettings originalSetting) bool firstDb = _index == -1; // if first DB, then we will put it into main directory and not use indexed subdirectory - string dbName = firstDb ? originalSetting.DbName : originalSetting.DbName + _index; + string dbName = originalSetting.DbName; string dbPath = firstDb ? originalSetting.DbPath : _fileSystem.Path.Combine(originalSetting.DbPath, _index.ToString()); DbSettings dbSettings = originalSetting.Clone(dbName, dbPath); dbSettings.CanDeleteFolder = !firstDb; // we cannot delete main db folder, only indexed subfolders diff --git a/src/Nethermind/Nethermind.JsonRpc/Modules/DebugModule/DebugBridge.cs b/src/Nethermind/Nethermind.JsonRpc/Modules/DebugModule/DebugBridge.cs index df9dea1b87f..6e307532830 100644 --- a/src/Nethermind/Nethermind.JsonRpc/Modules/DebugModule/DebugBridge.cs +++ b/src/Nethermind/Nethermind.JsonRpc/Modules/DebugModule/DebugBridge.cs @@ -61,6 +61,8 @@ public DebugBridge( IDb headersDb = dbProvider.HeadersDb ?? throw new ArgumentNullException(nameof(dbProvider.HeadersDb)); IDb codeDb = dbProvider.CodeDb ?? throw new ArgumentNullException(nameof(dbProvider.CodeDb)); IDb metadataDb = dbProvider.MetadataDb ?? throw new ArgumentNullException(nameof(dbProvider.MetadataDb)); + IDb blockNumbersDb = dbProvider.BlockNumbersDb ?? throw new ArgumentNullException(nameof(dbProvider.BlockNumbersDb)); + IDb bloomDb = dbProvider.BloomDb ?? throw new ArgumentNullException(nameof(dbProvider.BloomDb)); _dbMappings = new Dictionary(StringComparer.InvariantCultureIgnoreCase) { @@ -70,6 +72,9 @@ public DebugBridge( {DbNames.Headers, headersDb}, {DbNames.Metadata, metadataDb}, {DbNames.Code, codeDb}, + {DbNames.Blocks, blocksDb}, + {DbNames.BlockNumbers, blockNumbersDb}, + {DbNames.Bloom, bloomDb}, }; _blockStore = new BlockStore(blocksDb);