Update to .Net 6, EF 6, Adding Goerli and Sepolia, to sql server. Add…

… fields for 1559. Recreate sql server migrations, sql scripts. DbSchema names allow to generate using a string, instead of enum constants
Nethereum · Oct 14, 2022 · 60e62b7 · 60e62b7
1 parent 9c348f4
commit 60e62b7
Show file tree

Hide file tree

Showing 90 changed files with 6,756 additions and 3,519 deletions.
diff --git a/src/Nethereum.BlockchainProcessing.Storage.sln b/src/Nethereum.BlockchainProcessing.Storage.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29021.104
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.32916.344
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethereum.BlockchainStore.Azure.LogProcessor.Db", "Nethereum.BlockchainStore.Azure.LogProcessor.Db\Nethereum.BlockchainStore.Azure.LogProcessor.Db.csproj", "{B4063D96-347C-476D-AC81-5E6020F5DBC4}"
 EndProject
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethereum.BlockchainStore.C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethereum.BlockchainStore.CosmosCore.Console", "Nethereum.BlockchainStore.CosmosCore.Console\Nethereum.BlockchainStore.CosmosCore.Console.csproj", "{846C1948-EBED-4005-B281-AF6A055FB8EF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5551D3F6-DE86-4AAA-9820-92D996BCB800}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethereum.BlockchainStore.Csv", "Nethereum.BlockchainStore.Csv\Nethereum.BlockchainStore.Csv.csproj", "{8D63D180-DEBD-4378-B377-3D0F142035F9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethereum.BlockchainStore.Csv.Console", "Nethereum.BlockchainStore.Csv.Console\Nethereum.BlockchainStore.Csv.Console.csproj", "{A609BF84-5995-456C-B848-854B3C4488FC}"
@@ -117,6 +115,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethereum.BlockchainStore.S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nethereum.BlockchainStore.Queue.Azure", "Nethereum.BlockchainStore.Queue.Azure\Nethereum.BlockchainStore.Queue.Azure.csproj", "{25DD3631-513A-4C26-8E1B-B038B3D530E9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nethereum.Web3", "..\..\Nethereum\src\Nethereum.Web3\Nethereum.Web3.csproj", "{9123BE6E-F492-49B2-BE08-08AE8F261489}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -595,6 +595,18 @@ Global
 		{25DD3631-513A-4C26-8E1B-B038B3D530E9}.Release|x64.Build.0 = Release|Any CPU
 		{25DD3631-513A-4C26-8E1B-B038B3D530E9}.Release|x86.ActiveCfg = Release|Any CPU
 		{25DD3631-513A-4C26-8E1B-B038B3D530E9}.Release|x86.Build.0 = Release|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Debug|x64.Build.0 = Debug|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Debug|x86.Build.0 = Debug|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Release|x64.ActiveCfg = Release|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Release|x64.Build.0 = Release|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Release|x86.ActiveCfg = Release|Any CPU
+		{9123BE6E-F492-49B2-BE08-08AE8F261489}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/...ckchainStore.Azure.LogProcessor.Db/Nethereum.BlockchainStore.Azure.LogProcessor.Db.csproj b/...ckchainStore.Azure.LogProcessor.Db/Nethereum.BlockchainStore.Azure.LogProcessor.Db.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...nStore.AzureTables.Core.Console/Nethereum.BlockchainStore.AzureTables.Core.Console.csproj b/...nStore.AzureTables.Core.Console/Nethereum.BlockchainStore.AzureTables.Core.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...reum.BlockchainStore.AzureTables.Tests/Nethereum.BlockchainStore.AzureTables.Tests.csproj b/...reum.BlockchainStore.AzureTables.Tests/Nethereum.BlockchainStore.AzureTables.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>Nethereum.BlockchainStore.AzureTables</UserSecretsId>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Nethereum.BlockchainStore.AzureTables/Entities/AddressTransaction.cs b/src/Nethereum.BlockchainStore.AzureTables/Entities/AddressTransaction.cs
@@ -29,6 +29,8 @@ public string Address
         //Store as a string so it can be parsed as a BigInteger
         public override string BlockNumber { get; set; } = string.Empty;
 
+
+
         public static AddressTransaction CreateAddressTransaction(
             RPC.Eth.DTOs.Transaction transactionSource,
             TransactionReceipt transactionReceipt,

diff --git a/src/Nethereum.BlockchainStore.AzureTables/Entities/Block.cs b/src/Nethereum.BlockchainStore.AzureTables/Entities/Block.cs
@@ -35,6 +35,7 @@ public string BlockNumber
         public string GasUsed { get; set; } = string.Empty;
         public string TimeStamp { get; set; } = string.Empty;
         public long TransactionCount { get; set; } = 0;
+        public string BaseFeePerGas {get; set;} = string.Empty;
 
         public void SetBlockNumber(HexBigInteger blockNumber)
         {

diff --git a/src/Nethereum.BlockchainStore.AzureTables/Entities/TransactionBase.cs b/src/Nethereum.BlockchainStore.AzureTables/Entities/TransactionBase.cs
@@ -28,6 +28,8 @@ public abstract class TransactionBase : TableEntity
         public bool HasVmStack{ get; set; } = false;
         public string NewContractAddress{ get; set; } = string.Empty;
         public bool FailedCreateContract{ get; set; } = false;
+        public string MaxFeePerGas { get; set; } = string.Empty;
+        public string MaxPriorityFeePerGas { get; set; } = string.Empty;
 
         public static TransactionBase CreateTransaction(
             TransactionBase transaction,
@@ -58,6 +60,8 @@ public static TransactionBase CreateTransaction(
             transaction.SetTimeStamp(timeStamp);
             transaction.Error = error ?? string.Empty;
             transaction.HasVmStack = hasVmStack;
+            transaction.MaxFeePerGas = transactionSource.MaxFeePerGas?.Value.ToString();
+            transaction.MaxPriorityFeePerGas = transactionSource.MaxPriorityFeePerGas?.Value.ToString();
 
             return transaction;
         }

diff --git a/src/Nethereum.BlockchainStore.AzureTables/Nethereum.BlockchainStore.AzureTables.csproj b/src/Nethereum.BlockchainStore.AzureTables/Nethereum.BlockchainStore.AzureTables.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Authors>$(DefaultAuthors), $(OtherAuthors)</Authors>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -13,8 +13,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-	  <PackageReference Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
+
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
 
+  <ItemGroup>
+	<PackageReference  Condition="'$(UseLocalNethereum)' == 'false'" Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
+    <ProjectReference Condition="'$(UseLocalNethereum)' == 'true'" Include="..\..\..\Nethereum\src\Nethereum.Web3\Nethereum.Web3.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Nethereum.BlockchainStore.Console/Nethereum.BlockchainStore.Console.csproj b/src/Nethereum.BlockchainStore.Console/Nethereum.BlockchainStore.Console.csproj
@@ -2,7 +2,7 @@
 	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
 
 	<PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,7 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
+	  <PackageReference  Condition="'$(UseLocalNethereum)' == 'false'" Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
+	  <ProjectReference Condition="'$(UseLocalNethereum)' == 'true'" Include="..\..\..\Nethereum\src\Nethereum.Web3\Nethereum.Web3.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Nethereum.BlockchainStore.Console/StorageProcessorConsole.cs b/src/Nethereum.BlockchainStore.Console/StorageProcessorConsole.cs
@@ -18,10 +18,9 @@ namespace Nethereum.BlockchainStore.Console
     public class StorageProcessorConsole<TRepositoryFactory> 
         where TRepositoryFactory : IBlockchainStoreRepositoryFactory, IBlockProgressRepositoryFactory
     {
-        ILog log = LoggerFactory
+        ILogger log = LoggerFactory
             .Create(builder => builder.AddConsole())
-            .CreateLogger<StorageProcessorConsole<TRepositoryFactory>>()
-            .ToILog();
+            .CreateLogger<StorageProcessorConsole<TRepositoryFactory>>();
 
         public StorageProcessorConsole(
             string[] consoleArgs,
@@ -30,7 +29,7 @@ public StorageProcessorConsole(
             Action<TRepositoryFactory> disposeRepositoriesCallback = null
             )
         {
-            log.Info("StorageProcessorConsole constructor");
+            log.LogInformation("StorageProcessorConsole constructor");
             ConsoleArgs = consoleArgs;
             UserSecretsId = userSecretsId;
             CreateRepositoryFactoryCallback = createRepositoryFactoryCallback;
@@ -70,7 +69,7 @@ public async Task<int> ExecuteAsync(
             }
             catch (Exception ex)
             {
-                log?.Error(ex);
+                log?.LogError(ex.Message);
                 if(repoFactory != null) DisposeAction?.Invoke(repoFactory);
                 return 1;
             }
@@ -82,9 +81,9 @@ private BlockchainProcessor CreateBlockChainProcessor(TRepositoryFactory repoFac
             var web3 = new Web3.Web3(TargetConfiguration.BlockchainUrl);
 
             var steps = new BlockProcessingSteps();
-            steps.BlockStep.AddProcessorHandler((b) => { log.Info($"Processing block {b.Number.Value}, Tx Count: {b.Transactions.Length}"); return Task.CompletedTask; });
-            steps.TransactionReceiptStep.AddProcessorHandler((tx) => { log.Info($"\tTransaction: Index: {tx.Transaction.TransactionIndex}, Hash: {tx.TransactionHash}"); return Task.CompletedTask; });
-            steps.FilterLogStep.AddProcessorHandler((l) => { log.Info($"\t\tLog: Index: {l.LogIndex}"); return Task.CompletedTask; });
+            steps.BlockStep.AddProcessorHandler((b) => { log.LogInformation($"Processing block {b.Number.Value}, Tx Count: {b.Transactions.Length}"); return Task.CompletedTask; });
+            steps.TransactionReceiptStep.AddProcessorHandler((tx) => { log.LogInformation($"\tTransaction: Index: {tx.Transaction.TransactionIndex}, Hash: {tx.TransactionHash}"); return Task.CompletedTask; });
+            steps.FilterLogStep.AddProcessorHandler((l) => { log.LogInformation($"\t\tLog: Index: {l.LogIndex}"); return Task.CompletedTask; });
 
             var orchestrator = new BlockCrawlOrchestrator(web3.Eth, steps);
             orchestrator.ContractCreatedCrawlerStep.RetrieveCode = true;

diff --git a/...um.BlockchainStore.CosmosCore.Console/Nethereum.BlockchainStore.CosmosCore.Console.csproj b/...um.BlockchainStore.CosmosCore.Console/Nethereum.BlockchainStore.CosmosCore.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>Nethereum.BlockchainStore.CosmosCore.UserSecrets</UserSecretsId>
   </PropertyGroup>
 

diff --git a/...hereum.BlockchainStore.CosmosCore.Tests/Nethereum.BlockchainStore.CosmosCore.Tests.csproj b/...hereum.BlockchainStore.CosmosCore.Tests/Nethereum.BlockchainStore.CosmosCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <UserSecretsId>Nethereum.BlockchainStore.CosmosCore.UserSecrets.UnitTests</UserSecretsId>
   </PropertyGroup>

diff --git a/src/Nethereum.BlockchainStore.CosmosCore/Nethereum.BlockchainStore.CosmosCore.csproj b/src/Nethereum.BlockchainStore.CosmosCore/Nethereum.BlockchainStore.CosmosCore.csproj
@@ -1,19 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 	  <Authors>$(OtherAuthors), $(DefaultAuthors)</Authors>
     <UserSecretsId>Nethereum.BlockchainStore.CosmosCore.UserSecrets</UserSecretsId>
     <Description>Store Ethereum block chain data in Azure Cosmos Db.</Description>
   </PropertyGroup>
 
   <ItemGroup>
-	<PackageReference Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
-    <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.2.1" />
+	  <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.2.1" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Nethereum.Configuration.Utils\Nethereum.Microsoft.Configuration.Utils.csproj" />
   </ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Condition="'$(UseLocalNethereum)' == 'false'" Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
+		<ProjectReference Condition="'$(UseLocalNethereum)' == 'true'" Include="..\..\..\Nethereum\src\Nethereum.Web3\Nethereum.Web3.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/src/Nethereum.BlockchainStore.Csv.Console/Nethereum.BlockchainStore.Csv.Console.csproj b/src/Nethereum.BlockchainStore.Csv.Console/Nethereum.BlockchainStore.Csv.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Nethereum.BlockchainStore.Csv.Tests/Nethereum.BlockchainStore.Csv.Tests.csproj b/src/Nethereum.BlockchainStore.Csv.Tests/Nethereum.BlockchainStore.Csv.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Nethereum.BlockchainStore.Csv/Nethereum.BlockchainStore.Csv.csproj b/src/Nethereum.BlockchainStore.Csv/Nethereum.BlockchainStore.Csv.csproj
@@ -2,17 +2,16 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
     <Authors>$(OtherAuthors), $(DefaultAuthors)</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>Store Ethereum blockchain data in CSV format.</Description>
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
     <PackageReference Include="CsvHelper" Version="12.1.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    
-  </ItemGroup>
-
+	<ItemGroup>
+		<PackageReference  Condition="'$(UseLocalNethereum)' == 'false'" Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
+		<ProjectReference Condition="'$(UseLocalNethereum)' == 'true'" Include="..\..\..\Nethereum\src\Nethereum.Web3\Nethereum.Web3.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/src/Nethereum.BlockchainStore.EF.Hana.Tests/Nethereum.BlockchainStore.EF.Hana.Tests.csproj b/src/Nethereum.BlockchainStore.EF.Hana.Tests/Nethereum.BlockchainStore.EF.Hana.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
     <Authors>Kevin Small</Authors>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>Store Ethereum blockchain data in SAP Hana using Entity Framework.</Description>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>    
   </PropertyGroup>

diff --git a/src/Nethereum.BlockchainStore.EF.Hana/Nethereum.BlockchainStore.EF.Hana.csproj b/src/Nethereum.BlockchainStore.EF.Hana/Nethereum.BlockchainStore.EF.Hana.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Authors>Kevin Small, $(OtherAuthors), $(DefaultAuthors)</Authors>
     <Description>Store Ethereum blockchain data in SAP Hana using Entity Framework (not core).</Description>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/...um.BlockchainStore.EF.SqlServer.Tests/Nethereum.BlockchainStore.EF.SqlServer.Tests.csproj b/...um.BlockchainStore.EF.SqlServer.Tests/Nethereum.BlockchainStore.EF.SqlServer.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
     <Authors>$(OtherAuthors)</Authors>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>Store Ethereum blockchain data in Sql Server using Entity Framework.</Description>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>    
   </PropertyGroup>

diff --git a/src/Nethereum.BlockchainStore.EF.SqlServer/Nethereum.BlockchainStore.EF.SqlServer.csproj b/src/Nethereum.BlockchainStore.EF.SqlServer/Nethereum.BlockchainStore.EF.SqlServer.csproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
     <Authors>$(OtherAuthors), $(DefaultAuthors)</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>Store Ethereum blockchain data in Sql Server using Entity Framework (not core).</Description>
   </PropertyGroup>
 

diff --git a/...ethereum.BlockchainStore.EF.Sqlite.Tests/Nethereum.BlockchainStore.EF.Sqlite.Tests.csproj b/...ethereum.BlockchainStore.EF.Sqlite.Tests/Nethereum.BlockchainStore.EF.Sqlite.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
     <Authors>$(OtherAuthors)</Authors>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>Store Ethereum blockchain data in Sqlite using Entity Framework.</Description>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>    

diff --git a/src/Nethereum.BlockchainStore.EF.Sqlite/Nethereum.BlockchainStore.EF.Sqlite.csproj b/src/Nethereum.BlockchainStore.EF.Sqlite/Nethereum.BlockchainStore.EF.Sqlite.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Authors>$(OtherAuthors), $(DefaultAuthors)</Authors>
     <Description>Store Ethereum blockchain data in Sqlite using Entity Framework (not core).</Description>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>

diff --git a/src/Nethereum.BlockchainStore.EF/EntityBuilders/BlockEntityBuilder.cs b/src/Nethereum.BlockchainStore.EF/EntityBuilders/BlockEntityBuilder.cs
@@ -23,6 +23,7 @@ public BlockEntityBuilder()
             Property(b => b.GasUsed).IsBigInteger();
             Property(b => b.Timestamp).IsBigInteger();
             Property(b => b.Nonce).IsBigInteger();
+            Property(b => b.BaseFeePerGas).IsBigInteger();
         }
     }
 }
diff --git a/src/Nethereum.BlockchainStore.EF/EntityBuilders/TransactionEntityBuilder.cs b/src/Nethereum.BlockchainStore.EF/EntityBuilders/TransactionEntityBuilder.cs
@@ -36,6 +36,10 @@ public TransactionEntityBuilder()
             Property(b => b.GasUsed).IsBigInteger();
             Property(b => b.Nonce).IsBigInteger();
             Property(b => b.CumulativeGasUsed).IsBigInteger();
+
+            Property(b => b.EffectiveGasPrice).IsBigInteger();
+            Property(b => b.MaxFeePerGas).IsBigInteger();
+            Property(b => b.MaxPriorityFeePerGas).IsBigInteger();
         }
     }
 }
diff --git a/src/Nethereum.BlockchainStore.EF/Nethereum.BlockchainStore.EF.csproj b/src/Nethereum.BlockchainStore.EF/Nethereum.BlockchainStore.EF.csproj
@@ -2,17 +2,17 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\buildConf\Generic.props" />
   <PropertyGroup>
     <Authors> $(OtherAuthors), $(DefaultAuthors)</Authors>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>Store Ethereum blockchain data using Entity Framework (not EF core).  This package only contains the base components.  Use the other DB specific packages available for Sqlite, SqlServer etc.</Description>
   </PropertyGroup>
 
   <ItemGroup>
-	 <PackageReference Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
     <PackageReference Include="EntityFramework" Version="6.2.0" />
   </ItemGroup>
 
-  <ItemGroup>
-
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference  Condition="'$(UseLocalNethereum)' == 'false'" Include="Nethereum.Web3" Version="$(NethereumWeb3Version)" />
+		<ProjectReference Condition="'$(UseLocalNethereum)' == 'true'" Include="..\..\..\Nethereum\src\Nethereum.Web3\Nethereum.Web3.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/...nStore.EFCore.SqlServer.Console/Nethereum.BlockchainStore.EFCore.SqlServer.Console.csproj b/...nStore.EFCore.SqlServer.Console/Nethereum.BlockchainStore.EFCore.SqlServer.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <GenerateProgramFile>false</GenerateProgramFile>