Update testvectors (#259)

* reports tests * add shuffle tests * fixes * fix * enable full tests * fix * fix
open-web3-stack · Jan 3, 2025 · 5749790 · 5749790
1 parent 74b0ab5
commit 5749790
Show file tree

Hide file tree

Showing 13 changed files with 316 additions and 70 deletions.
diff --git a/Blockchain/Sources/Blockchain/Config/ProtocolConfig+Preset.swift b/Blockchain/Sources/Blockchain/Config/ProtocolConfig+Preset.swift
@@ -11,10 +11,10 @@ extension Ref where T == ProtocolConfig {
         preimagePurgePeriod: 28800,
         epochLength: 6,
         auditBiasFactor: 2,
-        workReportAccumulationGas: Gas(100_000),
-        workPackageAuthorizerGas: Gas(1_000_000),
-        workPackageRefineGas: Gas(500_000_000),
-        totalAccumulationGas: Gas(35_000_000),
+        workReportAccumulationGas: Gas(10_000_000),
+        workPackageAuthorizerGas: Gas(50_000_000),
+        workPackageRefineGas: Gas(5_000_000_000),
+        totalAccumulationGas: Gas(3_500_000_000),
         recentHistorySize: 8,
         maxWorkItems: 4,
         maxDepsInWorkReport: 8,
@@ -33,7 +33,7 @@ extension Ref where T == ProtocolConfig {
         maxWorkPackageManifestEntries: 1 << 11,
         maxEncodedWorkPackageSize: 12 * 1 << 20,
         segmentSize: 4104,
-        maxWorkReportOutputSize: 96 * 1 << 10,
+        maxWorkReportOutputSize: 48 * 1 << 10,
         erasureCodedSegmentSize: 6,
         ticketSubmissionEndSlot: 2,
         pvmDynamicAddressAlignmentFactor: 2,
@@ -52,10 +52,10 @@ extension Ref where T == ProtocolConfig {
         preimagePurgePeriod: 28800,
         epochLength: 12,
         auditBiasFactor: 2,
-        workReportAccumulationGas: Gas(100_000),
-        workPackageAuthorizerGas: Gas(1_000_000),
-        workPackageRefineGas: Gas(500_000_000),
-        totalAccumulationGas: Gas(35_000_000),
+        workReportAccumulationGas: Gas(10_000_000),
+        workPackageAuthorizerGas: Gas(50_000_000),
+        workPackageRefineGas: Gas(5_000_000_000),
+        totalAccumulationGas: Gas(3_500_000_000),
         recentHistorySize: 8,
         maxWorkItems: 4,
         maxDepsInWorkReport: 8,
@@ -74,7 +74,7 @@ extension Ref where T == ProtocolConfig {
         maxWorkPackageManifestEntries: 1 << 11,
         maxEncodedWorkPackageSize: 12 * 1 << 20,
         segmentSize: 4104,
-        maxWorkReportOutputSize: 96 * 1 << 10,
+        maxWorkReportOutputSize: 48 * 1 << 10,
         erasureCodedSegmentSize: 6,
         ticketSubmissionEndSlot: 10,
         pvmDynamicAddressAlignmentFactor: 2,
@@ -92,10 +92,10 @@ extension Ref where T == ProtocolConfig {
         preimagePurgePeriod: 28800,
         epochLength: 12,
         auditBiasFactor: 2,
-        workReportAccumulationGas: Gas(100_000),
-        workPackageAuthorizerGas: Gas(1_000_000),
-        workPackageRefineGas: Gas(500_000_000),
-        totalAccumulationGas: Gas(35_000_000),
+        workReportAccumulationGas: Gas(10_000_000),
+        workPackageAuthorizerGas: Gas(50_000_000),
+        workPackageRefineGas: Gas(5_000_000_000),
+        totalAccumulationGas: Gas(3_500_000_000),
         recentHistorySize: 8,
         maxWorkItems: 4,
         maxDepsInWorkReport: 8,
@@ -106,15 +106,15 @@ extension Ref where T == ProtocolConfig {
         maxAuthorizationsPoolItems: 8,
         slotPeriodSeconds: 6,
         maxAuthorizationsQueueItems: 80,
-        coreAssignmentRotationPeriod: 10,
+        coreAssignmentRotationPeriod: 4,
         maxServiceCodeSize: 4_000_000,
         preimageReplacementPeriod: 5,
         totalNumberOfValidators: 6,
         erasureCodedPieceSize: 684,
         maxWorkPackageManifestEntries: 1 << 11,
         maxEncodedWorkPackageSize: 12 * 1 << 20,
         segmentSize: 4104,
-        maxWorkReportOutputSize: 96 * 1 << 10,
+        maxWorkReportOutputSize: 48 * 1 << 10,
         erasureCodedSegmentSize: 6,
         ticketSubmissionEndSlot: 10,
         pvmDynamicAddressAlignmentFactor: 2,
@@ -132,10 +132,10 @@ extension Ref where T == ProtocolConfig {
         preimagePurgePeriod: 28800,
         epochLength: 600,
         auditBiasFactor: 2,
-        workReportAccumulationGas: Gas(100_000),
-        workPackageAuthorizerGas: Gas(1_000_000),
-        workPackageRefineGas: Gas(500_000_000),
-        totalAccumulationGas: Gas(35_000_000),
+        workReportAccumulationGas: Gas(10_000_000),
+        workPackageAuthorizerGas: Gas(50_000_000),
+        workPackageRefineGas: Gas(5_000_000_000),
+        totalAccumulationGas: Gas(3_500_000_000),
         recentHistorySize: 8,
         maxWorkItems: 4,
         maxDepsInWorkReport: 8,
@@ -154,7 +154,7 @@ extension Ref where T == ProtocolConfig {
         maxWorkPackageManifestEntries: 1 << 11,
         maxEncodedWorkPackageSize: 12 * 1 << 20,
         segmentSize: 4104,
-        maxWorkReportOutputSize: 96 * 1 << 10,
+        maxWorkReportOutputSize: 48 * 1 << 10,
         erasureCodedSegmentSize: 6,
         ticketSubmissionEndSlot: 500,
         pvmDynamicAddressAlignmentFactor: 2,

diff --git a/Blockchain/Sources/Blockchain/Config/ProtocolConfig.swift b/Blockchain/Sources/Blockchain/Config/ProtocolConfig.swift
@@ -28,13 +28,13 @@ public struct ProtocolConfig: Sendable, Codable, Equatable {
     /// following tranche for each no-show in the previous.
     public var auditBiasFactor: Int
 
-    /// GA: The gas allocated to invoke a work-report's Accumulation logic.
+    /// GA = 10,000,000: The gas allocated to invoke a work-report's Accumulation logic.
     public var workReportAccumulationGas: Gas
 
-    /// GI: The gas allocated to invoke a work-package’s Is-Authorized logic.
+    /// GI = 50,000,000: The gas allocated to invoke a work-package’s Is-Authorized logic.
     public var workPackageAuthorizerGas: Gas
 
-    /// GR: The gas allocated to invoke a work-package's Refine logic.
+    /// GR = 5,000,000,000: The gas allocated to invoke a work-package's Refine logic.
     public var workPackageRefineGas: Gas
 
     /// GT: The total gas allocated across for all Accumulation.

diff --git a/Blockchain/Sources/Blockchain/RuntimeProtocols/Guaranteeing.swift b/Blockchain/Sources/Blockchain/RuntimeProtocols/Guaranteeing.swift
@@ -15,11 +15,11 @@ public enum GuaranteeingError: Error {
     case invalidServiceGas
     case invalidPublicKey
     case invalidSegmentLookup
+    case futureReportSlot
 }
 
 public protocol Guaranteeing {
     var entropyPool: EntropyPool { get }
-    var timeslot: TimeslotIndex { get }
     var currentValidators: ConfigFixedSizeArray<
         ValidatorKey, ProtocolConfig.TotalNumberOfValidators
     > { get }
@@ -87,11 +87,16 @@ extension Guaranteeing {
 
     public func update(
         config: ProtocolConfigRef,
+        timeslot: TimeslotIndex,
         extrinsic: ExtrinsicGuarantees
-    ) throws(GuaranteeingError) -> ConfigFixedSizeArray<
-        ReportItem?,
-        ProtocolConfig.TotalNumberOfCores
-    > {
+    ) throws(GuaranteeingError) -> (
+        newReports: ConfigFixedSizeArray<
+            ReportItem?,
+            ProtocolConfig.TotalNumberOfCores
+        >,
+        reported: [WorkReport],
+        reporters: [Ed25519PublicKey]
+    ) {
         let coreAssignmentRotationPeriod = UInt32(config.value.coreAssignmentRotationPeriod)
 
         let currentCoreAssignment = getCoreAssignment(config: config, randomness: entropyPool.t2, timeslot: timeslot)
@@ -108,23 +113,28 @@ extension Guaranteeing {
         )
         let pareviousCoreKeys = withoutOffenders(keys: previousValidators.map(\.ed25519))
 
-        var workReportHashes = Set<Data32>()
-
-        var totalMinGasRequirement = Gas(0)
+        var workPackageHashes = Set<Data32>()
 
         var oldLookups = [Data32: Data32]()
 
+        var reporters = [Ed25519PublicKey]()
+
         for guarantee in extrinsic.guarantees {
+            var totalGasUsage = Gas(0)
             let report = guarantee.workReport
 
+            guard guarantee.timeslot <= timeslot else {
+                throw .futureReportSlot
+            }
+
             oldLookups[report.packageSpecification.workPackageHash] = report.packageSpecification.segmentRoot
 
             for credential in guarantee.credential {
                 let isCurrent = (guarantee.timeslot / coreAssignmentRotationPeriod) == (timeslot / coreAssignmentRotationPeriod)
                 let keys = isCurrent ? currentCoreKeys : pareviousCoreKeys
                 let key = keys[Int(credential.index)]
                 let reportHash = report.hash()
-                workReportHashes.insert(reportHash)
+                workPackageHashes.insert(report.packageSpecification.workPackageHash)
                 let payload = SigningContext.guarantee + reportHash.data
                 let pubkey = try Result { try Ed25519.PublicKey(from: key) }
                     .mapError { _ in GuaranteeingError.invalidPublicKey }
@@ -137,6 +147,8 @@ extension Guaranteeing {
                 guard coreAssignment[Int(credential.index)] == report.coreIndex else { // TODO: it should accepts the last core index?
                     throw .invalidGuaranteeCore
                 }
+
+                reporters.append(key)
             }
 
             let coreIndex = Int(report.coreIndex)
@@ -164,22 +176,22 @@ extension Guaranteeing {
                     throw .invalidServiceGas
                 }
 
-                totalMinGasRequirement += acc.minAccumlateGas
+                totalGasUsage += result.gasRatio
             }
-        }
 
-        guard totalMinGasRequirement <= config.value.workReportAccumulationGas else {
-            throw .outOfGas
+            guard totalGasUsage <= config.value.workReportAccumulationGas else {
+                throw .outOfGas
+            }
         }
 
-        let recentWorkReportHashes: Set<Data32> = Set(recentHistory.items.flatMap(\.lookup.keys))
+        let recentWorkPackageHashes: Set<Data32> = Set(recentHistory.items.flatMap(\.lookup.keys))
         let accumulateHistoryReports = Set(accumulationHistory.array.flatMap { $0 })
         let accumulateQueueReports = Set(accumulationQueue.array.flatMap { $0 }
             .flatMap(\.workReport.refinementContext.prerequisiteWorkPackages))
         let pendingWorkReportHashes = Set(reports.array.flatMap { $0?.workReport.refinementContext.prerequisiteWorkPackages ?? [] })
-        let pipelinedWorkReportHashes = recentWorkReportHashes.union(accumulateHistoryReports).union(accumulateQueueReports)
+        let pipelinedWorkReportHashes = recentWorkPackageHashes.union(accumulateHistoryReports).union(accumulateQueueReports)
             .union(pendingWorkReportHashes)
-        guard pipelinedWorkReportHashes.isDisjoint(with: workReportHashes) else {
+        guard pipelinedWorkReportHashes.isDisjoint(with: workPackageHashes) else {
             throw .duplicatedWorkPackage
         }
 
@@ -200,13 +212,13 @@ extension Guaranteeing {
             guard context.anchor.beefyRoot == history.mmr.superPeak() else {
                 throw .invalidContext
             }
-            guard context.lookupAnchor.timeslot >= timeslot - UInt32(config.value.maxLookupAnchorAge) else {
+            guard context.lookupAnchor.timeslot >= Int64(timeslot) - Int64(config.value.maxLookupAnchorAge) else {
                 throw .invalidContext
             }
 
             for prerequisiteWorkPackage in context.prerequisiteWorkPackages.union(report.lookup.keys) {
-                guard recentWorkReportHashes.contains(prerequisiteWorkPackage) ||
-                    workReportHashes.contains(prerequisiteWorkPackage)
+                guard recentWorkPackageHashes.contains(prerequisiteWorkPackage) ||
+                    workPackageHashes.contains(prerequisiteWorkPackage)
                 else {
                     throw .prerequisiteNotFound
                 }
@@ -220,6 +232,7 @@ extension Guaranteeing {
         }
 
         var newReports = reports
+        var reported = [WorkReport]()
 
         for guarantee in extrinsic.guarantees {
             let report = guarantee.workReport
@@ -228,8 +241,12 @@ extension Guaranteeing {
                 workReport: report,
                 timeslot: timeslot
             )
+            reported.append(report)
         }
 
-        return newReports
+        reported.sort { $0.packageSpecification.workPackageHash < $1.packageSpecification.workPackageHash }
+        reporters.sort()
+
+        return (newReports, reported, reporters)
     }
 }
diff --git a/Blockchain/Sources/Blockchain/RuntimeProtocols/Runtime.swift b/Blockchain/Sources/Blockchain/RuntimeProtocols/Runtime.swift
@@ -353,7 +353,11 @@ public final class Runtime {
         )
 
         newState.reports = newReports
-        newState.reports = try newState.update(config: config, extrinsic: block.extrinsic.reports)
+        let result = try newState.update(
+            config: config, timeslot: newState.timeslot, extrinsic: block.extrinsic.reports
+        )
+
+        newState.reports = result.newReports
 
         return availableReports
     }

diff --git a/Blockchain/Sources/Blockchain/VMInvocations/HostCall/HostCalls.swift b/Blockchain/Sources/Blockchain/VMInvocations/HostCall/HostCalls.swift
@@ -561,7 +561,7 @@ public class Solicit: HostCall {
             if notRequestedYet {
                 x.serviceAccounts.set(serviceAccount: x.serviceIndex, preimageHash: Data32(hash!)!, length: length, value: [])
             } else if isPreviouslyAvailable, var preimageInfo {
-                preimageInfo.append(timeslot)
+                try preimageInfo.append(timeslot)
                 x.serviceAccounts.set(serviceAccount: x.serviceIndex, preimageHash: Data32(hash!)!, length: length, value: preimageInfo)
             }
         }
@@ -602,7 +602,7 @@ public class Forget: HostCall {
                 x.serviceAccounts.set(serviceAccount: x.serviceIndex, preimageHash: Data32(hash!)!, length: length, value: nil)
                 x.serviceAccounts.set(serviceAccount: x.serviceIndex, preimageHash: Data32(hash!)!, value: nil)
             } else if isAvailable1, var preimageInfo {
-                preimageInfo.append(timeslot)
+                try preimageInfo.append(timeslot)
                 x.serviceAccounts.set(serviceAccount: x.serviceIndex, preimageHash: Data32(hash!)!, length: length, value: preimageInfo)
             } else if isAvailable3, var preimageInfo {
                 preimageInfo = [preimageInfo[2], timeslot]

diff --git a/Boka/Package.resolved b/Boka/Package.resolved
diff --git a/Database/Package.resolved b/Database/Package.resolved