diff --git a/Interface/app.config b/Interface/app.config
index 049118ec..bfca9c4f 100644
--- a/Interface/app.config
+++ b/Interface/app.config
@@ -24,7 +24,7 @@
-
+
@@ -36,7 +36,7 @@
-
+
diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj
index 5ce2732a..10e712e8 100644
--- a/Logic/Logic.csproj
+++ b/Logic/Logic.csproj
@@ -52,18 +52,30 @@
false
-
- ..\packages\NGeoIP.1.0.1\lib\net45\AutoMapper.dll
+
+ ..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll
True
-
- ..\packages\NGeoIP.1.0.1\lib\net45\AutoMapper.Net4.dll
+
+ ..\packages\Google.Protobuf.3.17.3\lib\net45\Google.Protobuf.dll
True
..\packages\HtmlAgilityPack.1.11.34\lib\Net45\HtmlAgilityPack.dll
True
+
+ ..\packages\K4os.Compression.LZ4.1.2.16\lib\net45\K4os.Compression.LZ4.dll
+ True
+
+
+ ..\packages\K4os.Compression.LZ4.Streams.1.2.16\lib\net45\K4os.Compression.LZ4.Streams.dll
+ True
+
+
+ ..\packages\K4os.Hash.xxHash.1.0.6\lib\net45\K4os.Hash.xxHash.dll
+ True
+
..\External Libraries\Mono.Posix.dll
@@ -80,22 +92,29 @@
..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NGeoIP.1.0.1\lib\net45\NGeoIP.dll
- True
-
-
- ..\packages\NGeoIP.1.0.1\lib\net45\RestSharp.dll
- True
+
+ ..\Site\bin\RestSharp.dll
+
+ ..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll
+ True
+
+
+ ..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll
+ True
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll
+ True
+
..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
True
diff --git a/Logic/Special/DummyGeoLookup.cs b/Logic/Special/DummyGeoLookup.cs
index 11f6be02..35330e21 100644
--- a/Logic/Special/DummyGeoLookup.cs
+++ b/Logic/Special/DummyGeoLookup.cs
@@ -4,8 +4,8 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web;
-using NGeoIP;
-using NGeoIP.Client;
+//using NGeoIP;
+//using NGeoIP.Client;
namespace Swarmops.Logic.Special
{
@@ -15,6 +15,7 @@ namespace Swarmops.Logic.Special
///
public class DummyGeoLookup
{
+ /*
public static string Lookup (string ip)
{
NGeoIP.Request request = new Request()
@@ -26,6 +27,6 @@ namespace Swarmops.Logic.Special
NGeoIP.RawData rawData = client.Execute();
return rawData.CountryCode;
- }
+ }*/
}
}
diff --git a/Logic/app.config b/Logic/app.config
index 049118ec..bfca9c4f 100644
--- a/Logic/app.config
+++ b/Logic/app.config
@@ -24,7 +24,7 @@
-
+
@@ -36,7 +36,7 @@
-
+
diff --git a/Logic/packages.config b/Logic/packages.config
index bd0cc262..8a032043 100644
--- a/Logic/packages.config
+++ b/Logic/packages.config
@@ -1,13 +1,16 @@
-
+
+
+
+
+
-
-
+
@@ -18,6 +21,7 @@
+
@@ -27,6 +31,7 @@
+
diff --git a/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs b/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs
index dc9b28cd..806f0d91 100644
--- a/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs
+++ b/Site/Pages/v5/Admin/BitcoinEchoTest.aspx.cs
@@ -8,7 +8,7 @@ using System.Web.Services;
using System.Web.UI;
using System.Web.UI.WebControls;
using NBitcoin;
-using RestSharp.Serializers;
+//using RestSharp.Serializers;
using Swarmops.Common.Enums;
using Swarmops.Logic.Cache;
using Swarmops.Logic.Communications;
diff --git a/Site/Pages/v5/Public/Signup.aspx.cs b/Site/Pages/v5/Public/Signup.aspx.cs
index 6298c662..eea68aa6 100644
--- a/Site/Pages/v5/Public/Signup.aspx.cs
+++ b/Site/Pages/v5/Public/Signup.aspx.cs
@@ -11,8 +11,8 @@ using System.Web.Security;
using System.Web.Services;
using System.Web.UI;
using System.Web.UI.WebControls;
-using NGeoIP;
-using NGeoIP.Client;
+//using NGeoIP;
+//using NGeoIP.Client;
using Resources;
using Swarmops.Common.Enums;
using Swarmops.Logic.Communications;
@@ -370,7 +370,7 @@ namespace Swarmops.Frontend.Pages.Public
try
{
string ipAddress = Logic.Support.SupportFunctions.GetMostLikelyRemoteIPAddress();
-
+ /*
NGeoIP.RawData rawData = (NGeoIP.RawData) GuidCache.Get(ipAddress);
if (rawData == null)
@@ -391,7 +391,7 @@ namespace Swarmops.Frontend.Pages.Public
GuidCache.Set(ipAddress, rawData); // store lookup results in cache for later
return new AjaxCallResult {Success = true, DisplayMessage = rawData.CountryCode};
- }
+ }*/
}
catch (Exception)
{
diff --git a/Site/Site.csproj b/Site/Site.csproj
index 1591719a..87cb60d0 100644
--- a/Site/Site.csproj
+++ b/Site/Site.csproj
@@ -45,14 +45,30 @@
4
-
- ..\packages\NGeoIP.1.0.1\lib\net45\AutoMapper.Net4.dll
+
+ ..\packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll
True
..\packages\CsvHelper.27.1.1\lib\net45\CsvHelper.dll
True
+
+ ..\packages\Google.Protobuf.3.17.3\lib\net45\Google.Protobuf.dll
+ True
+
+
+ ..\packages\K4os.Compression.LZ4.1.2.16\lib\net45\K4os.Compression.LZ4.dll
+ True
+
+
+ ..\packages\K4os.Compression.LZ4.Streams.1.2.16\lib\net45\K4os.Compression.LZ4.Streams.dll
+ True
+
+
+ ..\packages\K4os.Hash.xxHash.1.0.6\lib\net45\K4os.Hash.xxHash.dll
+ True
+
..\packages\NBitcoinBCC.1.0.17\lib\netstandard1.1\NBitcoinBCC.dll
@@ -62,14 +78,6 @@
..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
True
-
- ..\packages\NGeoIP.1.0.1\lib\net45\NGeoIP.dll
- True
-
-
- ..\packages\NGeoIP.1.0.1\lib\net45\RestSharp.dll
- True
-
..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll
True
diff --git a/Site/packages.config b/Site/packages.config
index fd3f860c..10d154c2 100644
--- a/Site/packages.config
+++ b/Site/packages.config
@@ -1,15 +1,17 @@
-
+
+
+
+
+
-
-
diff --git a/Site/web.config b/Site/web.config
index e3d2b707..b429f1ed 100644
--- a/Site/web.config
+++ b/Site/web.config
@@ -99,13 +99,9 @@
-
-
-
-
-
+
@@ -113,7 +109,7 @@
-
+
diff --git a/Tests/app.config b/Tests/app.config
index 049118ec..bfca9c4f 100644
--- a/Tests/app.config
+++ b/Tests/app.config
@@ -24,7 +24,7 @@
-
+
@@ -36,7 +36,7 @@
-
+