Refine invocation

Blockchain/Sources/Blockchain/Config/ProtocolConfig+Preset.swift

@@ -32,7 +32,8 @@ extension Ref where T == ProtocolConfig {
         erasureCodedPieceSize: 684,
         maxWorkPackageManifestEntries: 1 << 11,
         maxEncodedWorkPackageSize: 12 * 1 << 20,
-        maxEncodedWorkReportSize: 96 * 1 << 10,
+        segmentSize: 4104,
+        maxWorkReportOutputSize: 96 * 1 << 10,
         erasureCodedSegmentSize: 6,
         ticketSubmissionEndSlot: 2,
         pvmDynamicAddressAlignmentFactor: 2,
@@ -72,7 +73,8 @@ extension Ref where T == ProtocolConfig {
         erasureCodedPieceSize: 684,
         maxWorkPackageManifestEntries: 1 << 11,
         maxEncodedWorkPackageSize: 12 * 1 << 20,
-        maxEncodedWorkReportSize: 96 * 1 << 10,
+        segmentSize: 4104,
+        maxWorkReportOutputSize: 96 * 1 << 10,
         erasureCodedSegmentSize: 6,
         ticketSubmissionEndSlot: 10,
         pvmDynamicAddressAlignmentFactor: 2,
@@ -111,7 +113,8 @@ extension Ref where T == ProtocolConfig {
         erasureCodedPieceSize: 684,
         maxWorkPackageManifestEntries: 1 << 11,
         maxEncodedWorkPackageSize: 12 * 1 << 20,
-        maxEncodedWorkReportSize: 96 * 1 << 10,
+        segmentSize: 4104,
+        maxWorkReportOutputSize: 96 * 1 << 10,
         erasureCodedSegmentSize: 6,
         ticketSubmissionEndSlot: 500,
         pvmDynamicAddressAlignmentFactor: 2,

Blockchain/Sources/Blockchain/Config/ProtocolConfig.swift

@@ -85,14 +85,17 @@
     // WM = 2^11: The maximum number of entries in a work-package manifest.
     public var maxWorkPackageManifestEntries: Int
 
-    // WP = 12 * 2^20: The maximum size of an encoded work-package together with its extrinsic data and import impli-
+    // WB = 12 * 2^20: The maximum size of an encoded work-package together with its extrinsic data and import impli-
     // cations, in octets.
     public var maxEncodedWorkPackageSize: Int
 
-    // WR = 96 * 2^10: The maximum size of an encoded work-report in octets.
-    public var maxEncodedWorkReportSize: Int
+    // WG = WP*WE = 4104: The size of a segment in octets.
+    public var segmentSize: Int
 
-    // WS = 6: The size of an exported segment in erasure-coded pieces.
+    // WR = 48 * 2^10: The maximum total size of all output blobs in a work-report, in octets.
+    public var maxWorkReportOutputSize: Int
+
+    // WP = 6: The number of erasure-coded pieces in a segment.
     public var erasureCodedSegmentSize: Int
 
     // WT = 128: The size of a transfer memo in octets.
@@ -143,7 +146,8 @@
         erasureCodedPieceSize: Int,
         maxWorkPackageManifestEntries: Int,
         maxEncodedWorkPackageSize: Int,
-        maxEncodedWorkReportSize: Int,
+        segmentSize: Int,
+        maxWorkReportOutputSize: Int,
         erasureCodedSegmentSize: Int,
         ticketSubmissionEndSlot: Int,
         pvmDynamicAddressAlignmentFactor: Int,
@@ -180,7 +184,8 @@
         self.erasureCodedPieceSize = erasureCodedPieceSize
         self.maxWorkPackageManifestEntries = maxWorkPackageManifestEntries
         self.maxEncodedWorkPackageSize = maxEncodedWorkPackageSize
-        self.maxEncodedWorkReportSize = maxEncodedWorkReportSize
+        self.segmentSize = segmentSize
+        self.maxWorkReportOutputSize = maxWorkReportOutputSize
         self.erasureCodedSegmentSize = erasureCodedSegmentSize
         self.ticketSubmissionEndSlot = ticketSubmissionEndSlot
         self.pvmDynamicAddressAlignmentFactor = pvmDynamicAddressAlignmentFactor
@@ -260,8 +265,9 @@
                 ? other.maxWorkPackageManifestEntries : maxWorkPackageManifestEntries,
             maxEncodedWorkPackageSize: other.maxEncodedWorkPackageSize != 0
                 ? other.maxEncodedWorkPackageSize : maxEncodedWorkPackageSize,
-            maxEncodedWorkReportSize: other.maxEncodedWorkReportSize != 0
-                ? other.maxEncodedWorkReportSize : maxEncodedWorkReportSize,
+            segmentSize: other.segmentSize != 0 ? other.segmentSize : segmentSize,
+            maxWorkReportOutputSize: other.maxWorkReportOutputSize != 0
+                ? other.maxWorkReportOutputSize : maxWorkReportOutputSize,
             erasureCodedSegmentSize: other.erasureCodedSegmentSize != 0
                 ? other.erasureCodedSegmentSize : erasureCodedSegmentSize,
             ticketSubmissionEndSlot: other.ticketSubmissionEndSlot != 0
@@ -347,8 +353,9 @@
         maxEncodedWorkPackageSize = try decode(
             .maxEncodedWorkPackageSize, defaultValue: 0, required: required
         )
-        maxEncodedWorkReportSize = try decode(
-            .maxEncodedWorkReportSize, defaultValue: 0, required: required
+        segmentSize = try decode(.segmentSize, defaultValue: 0, required: required)
+        maxWorkReportOutputSize = try decode(
+            .maxWorkReportOutputSize, defaultValue: 0, required: required
         )
         erasureCodedSegmentSize = try decode(
             .erasureCodedSegmentSize, defaultValue: 0, required: required
@@ -579,10 +586,17 @@
         }
     }
 
-    public enum MaxEncodedWorkReportSize: ReadInt {
+    public enum SegmentSize: ReadInt {
+        public typealias TConfig = ProtocolConfigRef
+        public static func read(config: ProtocolConfigRef) -> Int {
+            config.value.segmentSize
+        }
+    }
+
+    public enum MaxWorkReportOutputSize: ReadInt {
         public typealias TConfig = ProtocolConfigRef
         public static func read(config: ProtocolConfigRef) -> Int {
-            config.value.maxEncodedWorkReportSize
+            config.value.maxWorkReportOutputSize
         }
     }
 

Blockchain/Sources/Blockchain/RuntimeProtocols/Accumulation.swift

@@ -56,6 +56,7 @@
 }
 
 public protocol Accumulation: ServiceAccounts {
+    var timeslot: TimeslotIndex { get }
     var privilegedServices: PrivilegedServices { get }
     var validatorQueue: ConfigFixedSizeArray<
         ValidatorKey, ProtocolConfig.TotalNumberOfValidators
@@ -359,6 +360,7 @@
                 config: config,
                 service: service,
                 serviceAccounts: &self,
+                timeslot: timeslot,
                 transfers: transfers
             )
         }

Blockchain/Sources/Blockchain/RuntimeProtocols/OnTransferFunction.swift

@@ -5,6 +5,7 @@ public protocol OnTransferFunction {
         config: ProtocolConfigRef,
         service: ServiceIndex,
         serviceAccounts: inout some ServiceAccounts,
+        timeslot: TimeslotIndex,
         transfers: [DeferredTransfers]
     ) async throws
 }

Blockchain/Sources/Blockchain/State/ServiceAccounts.swift

@@ -9,6 +9,8 @@ public protocol ServiceAccounts {
         serviceAccount index: ServiceIndex, preimageHash hash: Data32, length: UInt32
     ) async throws -> StateKeys.ServiceAccountPreimageInfoKey.Value?
 
+    func historicalLookup(serviceAccount index: ServiceIndex, timeslot: TimeslotIndex, preimageHash hash: Data32) async throws -> Data?
+
     mutating func set(serviceAccount index: ServiceIndex, account: ServiceAccountDetails?)
     mutating func set(serviceAccount index: ServiceIndex, storageKey key: Data32, value: Data?)
     mutating func set(serviceAccount index: ServiceIndex, preimageHash hash: Data32, value: Data?)

Blockchain/Sources/Blockchain/State/State.swift

@@ -361,6 +361,29 @@
         return try await backend.read(StateKeys.ServiceAccountPreimageInfoKey(index: index, hash: hash, length: length))
     }
 
+    public func historicalLookup(
+        serviceAccount index: ServiceIndex,
+        timeslot: TimeslotIndex,
+        preimageHash hash: Data32
+    ) async throws -> Data? {
+        if let preimage = try await get(serviceAccount: index, preimageHash: hash),
+           let preimageInfo = try await get(serviceAccount: index, preimageHash: hash, length: UInt32(preimage.count))
+        {
+            var isAvailable = false
+            if preimageInfo.count == 1 {
+                isAvailable = preimageInfo[0] <= timeslot
+            } else if preimageInfo.count == 2 {
+                isAvailable = preimageInfo[0] <= timeslot && timeslot < preimageInfo[1]
+            } else if preimageInfo.count == 3 {
+                isAvailable = preimageInfo[0] <= timeslot && timeslot < preimageInfo[1] && preimageInfo[2] <= timeslot
+            }
+
+            return isAvailable ? preimage : nil
+        } else {
+            return nil
+        }
+    }
+
     public mutating func set(serviceAccount index: ServiceIndex, account: ServiceAccountDetails?) {
         layer[serviceAccount: index] = account
     }
@@ -455,6 +478,7 @@
         config _: ProtocolConfigRef,
         service _: ServiceIndex,
         serviceAccounts _: inout some ServiceAccounts,
+        timeslot _: TimeslotIndex,
         transfers _: [DeferredTransfers]
     ) async throws {
         fatalError("not implemented")

Blockchain/Sources/Blockchain/Types/WorkReport.swift

@@ -90,7 +90,8 @@
         guard refinementContext.prerequisiteWorkPackages.count + lookup.count <= config.value.maxDepsInWorkReport else {
             throw .tooManyDependencies
         }
-        guard encodedSize <= config.value.maxEncodedWorkReportSize else {
+        let resultOutputSize = results.compactMap { result in try? result.output.result.get() }.reduce(0) { $0 + $1.count }
+        guard authorizationOutput.count + resultOutputSize <= config.value.maxWorkReportOutputSize else {
             throw .tooBig
         }
         guard coreIndex < UInt32(config.value.totalNumberOfCores) else {