logos-storage/logos-storage-nim-cs-dist-tests
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim-cs-dist-tests.git synced 2026-01-07 16:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates contract

Browse Source
This commit is contained in:
Ben 2025-02-04 09:39:38 +01:00
parent a62c6f5108
commit 02d1292acc
No known key found for this signature in database
GPG Key ID: 0F16E812E736C24B
6 changed files with 224 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

223
ProjectPlugins/CodexContractsPlugin/Marketplace/Marketplace.cs
View File

File diff suppressed because one or more lines are too long

5
Tests/CodexReleaseTests/MarketTests/ContractFailedTest.cs
View File

@ -67,11 +67,8 @@ namespace CodexReleaseTests.MarketTests
private TimeSpan CalculateContractFailTimespan() private TimeSpan CalculateContractFailTimespan()
{ {
var config = GetContracts().Deployment.Config; var config = GetContracts().Deployment.Config;
var maxSlashesBeforeSlotFreed = Convert.ToInt32(config.Collateral.MaxNumberOfSlashes); var requiredNumMissedProofs = Convert.ToInt32(config.Collateral.MaxNumberOfSlashes);
var numProofsMissedBeforeSlash = Convert.ToInt32(config.Collateral.SlashCriterion);
var periodDuration = GetPeriodDuration(); var periodDuration = GetPeriodDuration();
var requiredNumMissedProofs = maxSlashesBeforeSlotFreed * numProofsMissedBeforeSlash;
// Each host could miss 1 proof per period, // Each host could miss 1 proof per period,
// so the time we should wait is period time * requiredNum of missed proofs. // so the time we should wait is period time * requiredNum of missed proofs.

4
Tools/MarketInsights/ContributionBuilder.cs
View File

@ -71,10 +71,10 @@ namespace MarketInsights
private void AddRequestToAverage(ContractAverages average, RequestEvent requestEvent) private void AddRequestToAverage(ContractAverages average, RequestEvent requestEvent)
{ {
average.Number++; average.Number++;
average.Price = GetNewAverage(average.Price, average.Number, requestEvent.Request.Request.Ask.Reward); average.PricePerBytePerSecond = GetNewAverage(average.PricePerBytePerSecond, average.Number, requestEvent.Request.Request.Ask.PricePerBytePerSecond);
average.Size = GetNewAverage(average.Size, average.Number, requestEvent.Request.Request.Ask.SlotSize); average.Size = GetNewAverage(average.Size, average.Number, requestEvent.Request.Request.Ask.SlotSize);
average.Duration = GetNewAverage(average.Duration, average.Number, requestEvent.Request.Request.Ask.Duration); average.Duration = GetNewAverage(average.Duration, average.Number, requestEvent.Request.Request.Ask.Duration);
average.Collateral = GetNewAverage(average.Collateral, average.Number, requestEvent.Request.Request.Ask.Collateral); average.CollateralPerByte = GetNewAverage(average.CollateralPerByte, average.Number, requestEvent.Request.Request.Ask.CollateralPerByte);
average.ProofProbability = GetNewAverage(average.ProofProbability, average.Number, requestEvent.Request.Request.Ask.ProofProbability); average.ProofProbability = GetNewAverage(average.ProofProbability, average.Number, requestEvent.Request.Request.Ask.ProofProbability);
} }

4
Tools/MarketInsights/Model.cs
View File

@ -66,7 +66,7 @@
/// <summary> /// <summary>
/// Average price of contracts. (TSTWEI) /// Average price of contracts. (TSTWEI)
/// </summary> /// </summary>
public float Price { get; set; } public float PricePerBytePerSecond { get; set; }
/// <summary> /// <summary>
/// Average size of slots in contracts. (bytes) /// Average size of slots in contracts. (bytes)
@ -81,7 +81,7 @@
/// <summary> /// <summary>
/// Average collateral of contracts. (TSTWEI) /// Average collateral of contracts. (TSTWEI)
/// </summary> /// </summary>
public float Collateral { get; set; } public float CollateralPerByte { get; set; }
/// <summary> /// <summary>
/// Average proof probability of contracts. /// Average proof probability of contracts.

4
Tools/MarketInsights/Tracker.cs
View File

@ -47,10 +47,10 @@ namespace MarketInsights
float weight1 = result.Number; float weight1 = result.Number;
float weight2 = toAdd.Number; float weight2 = toAdd.Number;
result.Price = RollingAverage.GetWeightedAverage(result.Price, weight1, toAdd.Price, weight2); result.PricePerBytePerSecond = RollingAverage.GetWeightedAverage(result.PricePerBytePerSecond, weight1, toAdd.PricePerBytePerSecond, weight2);
result.Size = RollingAverage.GetWeightedAverage(result.Size, weight1, toAdd.Size, weight2); result.Size = RollingAverage.GetWeightedAverage(result.Size, weight1, toAdd.Size, weight2);
result.Duration = RollingAverage.GetWeightedAverage(result.Duration, weight1, toAdd.Duration, weight2); result.Duration = RollingAverage.GetWeightedAverage(result.Duration, weight1, toAdd.Duration, weight2);
result.Collateral = RollingAverage.GetWeightedAverage(result.Collateral, weight1, toAdd.Collateral, weight2); result.CollateralPerByte = RollingAverage.GetWeightedAverage(result.CollateralPerByte, weight1, toAdd.CollateralPerByte, weight2);
result.ProofProbability = RollingAverage.GetWeightedAverage(result.ProofProbability, weight1, toAdd.ProofProbability, weight2); result.ProofProbability = RollingAverage.GetWeightedAverage(result.ProofProbability, weight1, toAdd.ProofProbability, weight2);
} }

4
Tools/TestNetRewarder/EventsFormatter.cs
View File

@ -47,8 +47,8 @@ namespace TestNetRewarder
$"Content: {request.Request.Content.Cid}", $"Content: {request.Request.Content.Cid}",
$"Duration: {BigIntToDuration(request.Request.Ask.Duration)}", $"Duration: {BigIntToDuration(request.Request.Ask.Duration)}",
$"Expiry: {BigIntToDuration(request.Request.Expiry)}", $"Expiry: {BigIntToDuration(request.Request.Expiry)}",
$"Collateral: {BitIntToTestTokens(request.Request.Ask.Collateral)}", $"CollateralPerByte: {BitIntToTestTokens(request.Request.Ask.CollateralPerByte)}",
$"Reward: {BitIntToTestTokens(request.Request.Ask.Reward)}", $"PricePerBytePerSecond: {BitIntToTestTokens(request.Request.Ask.PricePerBytePerSecond)}",
$"Number of Slots: {request.Request.Ask.Slots}", $"Number of Slots: {request.Request.Ask.Slots}",
$"Slot Tolerance: {request.Request.Ask.MaxSlotLoss}", $"Slot Tolerance: {request.Request.Ask.MaxSlotLoss}",
$"Slot Size: {BigIntToByteSize(request.Request.Ask.SlotSize)}" $"Slot Size: {BigIntToByteSize(request.Request.Ask.SlotSize)}"