Revert "* fix missing ToUTC in static circles conversion"

This reverts commit cf3e641.
aboutcircles · Dec 13, 2024 · 19ebe9d · 19ebe9d
1 parent cf3e641
commit 19ebe9d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Circles.Index.Utils/ConversionUtils.cs b/Circles.Index.Utils/ConversionUtils.cs
@@ -21,8 +21,8 @@ public abstract class ConversionUtils
 
     public static long ConvertToUnixTimestamp(DateTime dateTime)
     {
-        DateTimeOffset dateTimeOffset = dateTime;
-        return dateTimeOffset.ToUnixTimeMilliseconds();
+        DateTime unixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        return (long)(dateTime - unixEpoch).TotalMilliseconds;
     }
 
     public static decimal GetCrcPayoutAt(long timestamp)
@@ -100,7 +100,7 @@ public static decimal CirclesToStaticCircles(decimal circlesBalance, DateTime la
     /// <returns></returns>
     public static decimal StaticCirclesToCircles(decimal staticCirclesBalance)
     {
-        var lastUpdate = DateTime.Now.ToUniversalTime();
+        var lastUpdate = DateTime.Now;
         var lastUpdateDay = (lastUpdate - CirclesInceptionDate).TotalDays;
         var f = (decimal)Math.Pow((double)Beta, lastUpdateDay);
         return staticCirclesBalance / f;

diff --git a/Circles.Index/Circles.Index.csproj b/Circles.Index/Circles.Index.csproj
@@ -8,8 +8,8 @@
         <Authors>Daniel Janz (Gnosis Service GmbH)</Authors>
         <Copyright>Gnosis Service GmbH</Copyright>
         <Product>Circles</Product>
-        <AssemblyVersion>1.11.4</AssemblyVersion>
-        <FileVersion>1.11.4</FileVersion>
+        <AssemblyVersion>1.11.3</AssemblyVersion>
+        <FileVersion>1.11.3</FileVersion>
     </PropertyGroup>
 
 

diff --git a/arm64.Dockerfile b/arm64.Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 RUN dotnet restore
 RUN dotnet publish -c Release -o /circles-nethermind-plugin
 
-FROM nethermind/nethermind:1.30.1 AS base
+FROM nethermind/nethermind:1.29.1 AS base
 
 # dotnet libs
 COPY --from=build /circles-nethermind-plugin/Circles.Index.deps.json /nethermind/plugins

diff --git a/x64.Dockerfile b/x64.Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 RUN dotnet restore
 RUN dotnet publish -c Release -o /circles-nethermind-plugin
 
-FROM nethermind/nethermind:1.30.1 AS base
+FROM nethermind/nethermind:1.29.1 AS base
 
 # dotnet libs
 COPY --from=build /circles-nethermind-plugin/Circles.Index.deps.json /nethermind/plugins

diff --git a/x64.debug.Dockerfile b/x64.debug.Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 RUN dotnet restore
 RUN dotnet publish -c Debug -o /circles-nethermind-plugin
 
-FROM nethermind/nethermind:1.30.1 AS base
+FROM nethermind/nethermind:1.29.1 AS base
 
 # dotnet libs
 COPY --from=build /circles-nethermind-plugin/Circles.Index.deps.json /nethermind/plugins

diff --git a/x64.debug.spaceneth.Dockerfile b/x64.debug.spaceneth.Dockerfile
@@ -6,7 +6,7 @@ COPY . .
 RUN dotnet restore
 RUN dotnet publish -c Debug -o /circles-nethermind-plugin
 
-FROM nethermind/nethermind:1.30.1 AS base
+FROM nethermind/nethermind:1.29.1 AS base
 
 # dotnet libs
 COPY --from=build /circles-nethermind-plugin/Circles.Index.deps.json /nethermind/plugins