Updates codex api

Author: benbierens

ProjectPlugins/CodexPlugin/ApiChecker.cs

@@ -10,7 +10,7 @@ namespace CodexPlugin
     public class ApiChecker
     {
         // <INSERT-OPENAPI-YAML-HASH>
-        private const string OpenApiYamlHash = "13-5A-2D-11-AD-A8-4B-72-95-5E-72-50-05-26-08-C4-53-AA-E9-FA-14-54-F8-1B-A7-C2-7C-2D-C6-4D-5D-F0";
+        private const string OpenApiYamlHash = "6E-0D-3F-26-51-3B-C0-16-1A-A4-81-86-80-CA-08-BC-CB-6C-8A-2C-49-4B-30-CB-75-D8-0F-EA-9D-57-D6-8A";
         private const string OpenApiFilePath = "/codex/openapi.yaml";
         private const string DisableEnvironmentVariable = "CODEXPLUGIN_DISABLE_APICHECK";
 

ProjectPlugins/CodexPlugin/Mapper.cs

@@ -60,8 +60,8 @@ public CodexOpenApi.SalesAvailabilityCREATE Map(StorageAvailability availability
             return new CodexOpenApi.SalesAvailabilityCREATE
             {
                 Duration = ToDecInt(availability.MaxDuration.TotalSeconds),
-                MinPrice = ToDecInt(availability.MinPriceForTotalSpace),
-                MaxCollateral = ToDecInt(availability.MaxCollateral),
+                MinPricePerBytePerSecond = ToDecInt(availability.MinPricePerBytePerSecond),
+                TotalCollateral = ToDecInt(availability.TotalCollateral),
                 TotalSize = ToDecInt(availability.TotalSpace.SizeInBytes)
             };
         }
@@ -72,8 +72,8 @@ public CodexOpenApi.StorageRequestCreation Map(StoragePurchaseRequest purchase)
             {
                 Duration = ToDecInt(purchase.Duration.TotalSeconds),
                 ProofProbability = ToDecInt(purchase.ProofProbability),
-                Reward = ToDecInt(purchase.PricePerSlotPerSecond),
-                Collateral = ToDecInt(purchase.RequiredCollateral),
+                PricePerBytePerSecond = ToDecInt(purchase.PricePerBytePerSecond),
+                CollateralPerByte = ToDecInt(purchase.CollateralPerByte),
                 Expiry = ToDecInt(purchase.Expiry.TotalSeconds),
                 Nodes = Convert.ToInt32(purchase.MinRequiredNumberOfNodes),
                 Tolerance = Convert.ToInt32(purchase.NodeFailureTolerance)
@@ -91,8 +91,8 @@ public StorageAvailability Map(SalesAvailabilityREAD availability)
             (
                 ToByteSize(availability.TotalSize),
                 ToTimespan(availability.Duration),
-                new TestToken(ToBigIng(availability.MinPrice)),
-                new TestToken(ToBigIng(availability.MaxCollateral))
+                new TestToken(ToBigIng(availability.MinPricePerBytePerSecond)),
+                new TestToken(ToBigIng(availability.TotalCollateral))
             )
             {
                 Id = availability.Id,

ProjectPlugins/CodexPlugin/MarketplaceTypes.cs

@@ -12,8 +12,8 @@ public StoragePurchaseRequest(ContentId cid)
         }
 
         public ContentId ContentId { get; set; }
-        public TestToken PricePerSlotPerSecond { get; set; } = 1.TstWei();
-        public TestToken RequiredCollateral { get; set; } = 1.TstWei();
+        public TestToken PricePerBytePerSecond { get; set; } = 1.TstWei();
+        public TestToken CollateralPerByte { get; set; } = 1.TstWei();
         public uint MinRequiredNumberOfNodes { get; set; }
         public uint NodeFailureTolerance { get; set; }
         public int ProofProbability { get; set; }
@@ -23,8 +23,8 @@ public StoragePurchaseRequest(ContentId cid)
         public void Log(ILog log)
         {
             log.Log($"Requesting storage for: {ContentId.Id}... (" +
-                $"pricePerSlotPerSecond: {PricePerSlotPerSecond}, " +
-                $"requiredCollateral: {RequiredCollateral}, " +
+                $"pricePerBytePerSecond: {PricePerBytePerSecond}, " +
+                $"collateralPerByte: {CollateralPerByte}, " +
                 $"minRequiredNumberOfNodes: {MinRequiredNumberOfNodes}, " +
                 $"nodeFailureTolerance: {NodeFailureTolerance}, " +
                 $"proofProbability: {ProofProbability}, " +
@@ -75,28 +75,28 @@ public class StorageContent
 
     public class StorageAvailability
     {
-        public StorageAvailability(ByteSize totalSpace, TimeSpan maxDuration, TestToken minPriceForTotalSpace, TestToken maxCollateral)
+        public StorageAvailability(ByteSize totalSpace, TimeSpan maxDuration, TestToken minPricePerBytePerSecond, TestToken totalCollateral)
         {
             TotalSpace = totalSpace;
             MaxDuration = maxDuration;
-            MinPriceForTotalSpace = minPriceForTotalSpace;
-            MaxCollateral = maxCollateral;
+            MinPricePerBytePerSecond = minPricePerBytePerSecond;
+            TotalCollateral = totalCollateral;
         }
 
         public string Id { get; set; } = string.Empty;
         public ByteSize TotalSpace { get; }
         public TimeSpan MaxDuration { get; }
-        public TestToken MinPriceForTotalSpace { get; }
-        public TestToken MaxCollateral { get; } 
+        public TestToken MinPricePerBytePerSecond { get; }
+        public TestToken TotalCollateral { get; } 
         public ByteSize FreeSpace { get; set; } = ByteSize.Zero;
 
         public void Log(ILog log)
         {
             log.Log($"Storage Availability: (" +
                 $"totalSize: {TotalSpace}, " +
                 $"maxDuration: {Time.FormatDuration(MaxDuration)}, " + 
-                $"minPriceForTotalSpace: {MinPriceForTotalSpace}, " +
-                $"maxCollateral: {MaxCollateral})");
+                $"minPricePerBytePerSecond: {MinPricePerBytePerSecond}, " +
+                $"totalCollateral: {TotalCollateral})");
         }
     }
 }