JIT WIP

.githooks/pre-commit

@@ -6,10 +6,10 @@
 #   echo "warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint"
 # fi
 
-git diff --diff-filter=d --staged --name-only | grep -e '\(.*\).swift$' | while read line; do
-  swiftformat "${line}";
-  git add "$line";
-done
+# git diff --diff-filter=d --staged --name-only | grep -e '\(.*\).swift$' | while read line; do
+#   swiftformat "${line}";
+#   git add "$line";
+# done
 
 files=$((git diff --cached --name-only --diff-filter=ACMR | grep -Ei "\.rs$") || true)
 if [ ! -z "${files}" ]; then

.github/workflows/benchmark-pr.yml

@@ -114,7 +114,8 @@ jobs:
       - name: Switch to branch 'master'
         if: ${{ env.hasBenchmark == '1' }}
         run: |
-          git checkout master
+          git fetch origin master
+          git checkout -B master origin/master
 
       - name: Run benchmarks for branch 'master'
         if: ${{ env.hasBenchmark == '1' }}

.gitignore

@@ -32,3 +32,4 @@ tmp
 *.pvm
 
 spec/
+plans/

.swift-version

@@ -1 +1 @@
-6.2.1
+6.2.3

.swiftformat

@@ -1,5 +1,5 @@
 --extensionacl on-declarations
---maxwidth 140
+--maxwidth 180
 --asynccapturing debugCheck
 --closurevoid preserve
 --disable typeSugar

.swiftlint.yml

@@ -20,13 +20,13 @@ type_name:
     min_length: 1
 
 line_length:
-    warning: 140
-    error: 140
+    warning: 400
+    error: 400
     ignores_function_declarations: true
 
 function_body_length:
-    warning: 300
-    error: 500
+    warning: 600
+    error: 600
 
 redundant_void_return:
     include_closures: false

.vscode/launch.json

@@ -99,6 +99,26 @@
 			"target": "SimpleWriteBufferBenchmark",
 			"configuration": "release",
 			"preLaunchTask": "swift: Build Release SimpleWriteBufferBenchmark (JAMTests)"
+		},
+		{
+			"type": "swift",
+			"request": "launch",
+			"args": [],
+			"cwd": "${workspaceFolder:boka}/PolkaVM",
+			"name": "Debug boka-sandbox (PolkaVM)",
+			"target": "boka-sandbox",
+			"configuration": "debug",
+			"preLaunchTask": "swift: Build Debug boka-sandbox (PolkaVM)"
+		},
+		{
+			"type": "swift",
+			"request": "launch",
+			"args": [],
+			"cwd": "${workspaceFolder:boka}/PolkaVM",
+			"name": "Release boka-sandbox (PolkaVM)",
+			"target": "boka-sandbox",
+			"configuration": "release",
+			"preLaunchTask": "swift: Build Release boka-sandbox (PolkaVM)"
 		}
 	]
 }

Blockchain/Package.swift

@@ -12,7 +12,7 @@ let package = Package(
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "Blockchain",
-            targets: ["Blockchain"]
+            targets: ["Blockchain"],
         ),
     ],
     dependencies: [
@@ -37,7 +37,7 @@ let package = Package(
             ],
             swiftSettings: [
                 .interoperabilityMode(.Cxx),
-            ]
+            ],
         ),
         .testTarget(
             name: "BlockchainTests",
@@ -47,8 +47,8 @@ let package = Package(
             ],
             swiftSettings: [
                 .interoperabilityMode(.Cxx),
-            ]
+            ],
         ),
     ],
-    swiftLanguageModes: [.version("6")]
+    swiftLanguageModes: [.version("6")],
 )

Blockchain/Sources/Blockchain/AuxDataStore/DataStore.swift

@@ -24,7 +24,7 @@ public final class DataStore: Sendable {
     /// - Returns: The retrieved segments
     public func fetchSegment(
         segments: [WorkItem.ImportedDataSegment],
-        segmentsRootMappings: SegmentsRootMappings?
+        segmentsRootMappings: SegmentsRootMappings?,
     ) async throws -> [Data4104] {
         var result: [Data4104] = []
 
@@ -52,7 +52,7 @@ public final class DataStore: Sendable {
     /// Resolves a segment root from either direct root or work package hash
     private func resolveSegmentRoot(
         segment: WorkItem.ImportedDataSegment,
-        segmentsRootMappings: SegmentsRootMappings?
+        segmentsRootMappings: SegmentsRootMappings?,
     ) async throws -> Data32 {
         switch segment.root {
         case let .segmentRoot(root):

Blockchain/Sources/Blockchain/AuxDataStore/DataStoreProtocol.swift

@@ -94,6 +94,6 @@ public struct D3LEntry: Sendable, Codable {
 }
 
 public protocol DataStoreNetworkProtocol: Sendable {
-    // Use CE139/CE140 to fetch remote chunk
+    /// Use CE139/CE140 to fetch remote chunk
     func fetchRemoteChunk(erasureRoot: Data32, shardIndex: UInt16, segmentIndices: [UInt16]) async throws -> Data12?
 }

Blockchain/Sources/Blockchain/AuxDataStore/FilesystemDataStore.swift

@@ -62,7 +62,7 @@ public actor FilesystemDataStore {
                 try fm.createDirectory(
                     at: url,
                     withIntermediateDirectories: true,
-                    attributes: nil
+                    attributes: nil,
                 )
             } catch {
                 // Verify if it was created by another task
@@ -136,7 +136,7 @@ public actor FilesystemDataStore {
 
             let files = try FileManager.default.contentsOfDirectory(
                 at: URL(fileURLWithPath: shardsDirPath),
-                includingPropertiesForKeys: nil
+                includingPropertiesForKeys: nil,
             )
             var indices: [UInt16] = []
             indices.reserveCapacity(files.count)
@@ -177,7 +177,7 @@ public actor FilesystemDataStore {
 
             let prefixDirs = try FileManager.default.contentsOfDirectory(
                 at: URL(fileURLWithPath: auditPathString),
-                includingPropertiesForKeys: nil
+                includingPropertiesForKeys: nil,
             )
 
             for prefixDir in prefixDirs {
@@ -213,7 +213,7 @@ public actor FilesystemDataStore {
 
             let prefixDirs = try FileManager.default.contentsOfDirectory(
                 at: URL(fileURLWithPath: d3lPathString),
-                includingPropertiesForKeys: nil
+                includingPropertiesForKeys: nil,
             )
 
             for prefixDir in prefixDirs {
@@ -259,7 +259,7 @@ extension FilesystemDataStore {
                     try FileManager.default.createDirectory(
                         at: URL(fileURLWithPath: path),
                         withIntermediateDirectories: true,
-                        attributes: nil
+                        attributes: nil,
                     )
                 } catch {
                     // Verify if it was created by another task
@@ -299,26 +299,26 @@ extension FilesystemDataStore {
             if FileManager.default.fileExists(atPath: targetPath) {
                 // Target exists - use replaceItem for atomic replacement
                 #if os(Linux)
-                    try FileManager.default.replaceItem(
+                    _ = try FileManager.default.replaceItem(
                         at: targetURL,
                         withItemAt: URL(fileURLWithPath: tempPath),
                         backupItemName: nil,
-                        options: .usingNewMetadataOnly
+                        options: .usingNewMetadataOnly,
                     )
                 #else
-                    try FileManager.default.replaceItem(
+                    _ = try FileManager.default.replaceItem(
                         at: targetURL,
                         withItemAt: URL(fileURLWithPath: tempPath),
                         backupItemName: nil,
                         options: .usingNewMetadataOnly,
-                        resultingItemURL: nil
+                        resultingItemURL: nil,
                     )
                 #endif
             } else {
                 // Target doesn't exist - use moveItem
                 try FileManager.default.moveItem(
                     at: URL(fileURLWithPath: tempPath),
-                    to: targetURL
+                    to: targetURL,
                 )
             }
         }.value
@@ -380,7 +380,7 @@ extension FilesystemDataStore {
             let enumerator = FileManager.default.enumerator(
                 at: URL(fileURLWithPath: path),
                 includingPropertiesForKeys: [.fileSizeKey],
-                options: []
+                options: [],
             )
 
             while let fileURL = enumerator?.nextObject() as? URL {

Blockchain/Sources/Blockchain/AuxDataStore/InMemoryDataStoreBackend.swift

@@ -2,31 +2,31 @@ import Foundation
 import Utils
 
 public actor InMemoryDataStoreBackend {
-    // segment root => erasure root (for audit bundles)
+    /// segment root => erasure root (for audit bundles)
     private var erasureRootBySegmentRoot: [Data32: Data32] = [:]
 
-    // segment root => D³L erasure root (separate mapping to avoid collision)
+    /// segment root => D³L erasure root (separate mapping to avoid collision)
     private var d3lErasureRootBySegmentsRoot: [Data32: Data32] = [:]
 
-    // work package hash => segment root
+    /// work package hash => segment root
     private var segmentRootByWorkPackageHash: [Data32: Data32] = [:]
 
-    // erasure root + index => segment data (variable-length to support both audit and D³L shards)
+    /// erasure root + index => segment data (variable-length to support both audit and D³L shards)
     private var chunks: [Data32: [UInt16: Data]] = [:]
 
-    // erasure root => timestamp
+    /// erasure root => timestamp
     private var timestamps: [Data32: Date] = [:]
 
-    // erasure root => Paged-Proofs metadata
+    /// erasure root => Paged-Proofs metadata
     private var pagedProofsMetadata: [Data32: Data] = [:]
 
-    // erasure root => audit entry
+    /// erasure root => audit entry
     private var auditEntries: [Data32: AuditEntry] = [:]
 
-    // erasure root => D³L entry
+    /// erasure root => D³L entry
     private var d3lEntries: [Data32: D3LEntry] = [:]
 
-    // Generic metadata storage
+    /// Generic metadata storage
     private var genericMetadata: [Data: Data] = [:]
 
     public init() {}
@@ -96,14 +96,14 @@ extension InMemoryDataStoreBackend: DataStoreProtocol {
         erasureRoot: Data32,
         segmentsRoot: Data32,
         bundleSize: Int,
-        timestamp: Date
+        timestamp: Date,
     ) async throws {
         auditEntries[erasureRoot] = AuditEntry(
             workPackageHash: workPackageHash,
             erasureRoot: erasureRoot,
             segmentsRoot: segmentsRoot,
             bundleSize: bundleSize,
-            timestamp: timestamp
+            timestamp: timestamp,
         )
     }
 
@@ -122,7 +122,7 @@ extension InMemoryDataStoreBackend: DataStoreProtocol {
     public func cleanupAuditEntriesIteratively(
         before cutoff: Date,
         batchSize: Int,
-        processor: @Sendable ([AuditEntry]) async throws -> Bool
+        processor: @Sendable ([AuditEntry]) async throws -> Bool,
     ) async throws -> Int {
         let entries = auditEntries.values.filter { $0.timestamp < cutoff }
         var totalProcessed = 0
@@ -147,7 +147,7 @@ extension InMemoryDataStoreBackend: DataStoreProtocol {
             segmentsRoot: segmentsRoot,
             erasureRoot: erasureRoot,
             segmentCount: segmentCount,
-            timestamp: timestamp
+            timestamp: timestamp,
         )
     }
 
@@ -166,7 +166,7 @@ extension InMemoryDataStoreBackend: DataStoreProtocol {
     public func cleanupD3LEntriesIteratively(
         before cutoff: Date,
         batchSize: Int,
-        processor: @Sendable ([D3LEntry]) async throws -> Bool
+        processor: @Sendable ([D3LEntry]) async throws -> Bool,
     ) async throws -> Int {
         let entries = d3lEntries.values.filter { $0.timestamp < cutoff }
         var totalProcessed = 0

Blockchain/Sources/Blockchain/AuxDataStore/SegmentCache.swift

@@ -82,7 +82,7 @@ public final class SegmentCache: @unchecked Sendable {
                 accessTime: .now,
                 hitCount: 0,
                 previousKey: nil,
-                nextKey: nil
+                nextKey: nil,
             )
 
             if state.storage[key] != nil {
@@ -136,7 +136,7 @@ public final class SegmentCache: @unchecked Sendable {
                 misses: state.misses,
                 evictions: state.evictions,
                 size: state.storage.count,
-                hitRate: hitRate
+                hitRate: hitRate,
             )
         }
     }

Blockchain/Sources/Blockchain/Blockchain.swift

@@ -16,7 +16,7 @@ public final class Blockchain: ServiceBase, @unchecked Sendable {
         config: ProtocolConfigRef,
         dataProvider: BlockchainDataProvider,
         timeProvider: TimeProvider,
-        eventBus: EventBus
+        eventBus: EventBus,
     ) async throws {
         self.dataProvider = dataProvider
         self.timeProvider = timeProvider
@@ -76,7 +76,7 @@ public final class Blockchain: ServiceBase, @unchecked Sendable {
     public func waitFor<T: Event>(
         _ eventType: T.Type,
         check: @escaping @Sendable (T) -> Bool = { _ in true },
-        timeout: TimeInterval = 10
+        timeout: TimeInterval = 10,
     ) async throws -> T {
         try await waitFor(eventType: eventType, check: check, timeout: timeout)
     }

Blockchain/Sources/Blockchain/BlockchainDataProvider/BlockchainDataProvider.swift

@@ -37,7 +37,7 @@ public actor BlockchainDataProvider {
         finalizedHead = try await HeadInfo(
             hash: finalizedHeadHash,
             timeslot: dataProvider.getHeader(hash: finalizedHeadHash).unwrap().value.timeslot,
-            number: dataProvider.getBlockNumber(hash: finalizedHeadHash).unwrap()
+            number: dataProvider.getBlockNumber(hash: finalizedHeadHash).unwrap(),
         )
 
         self.dataProvider = dataProvider
@@ -122,7 +122,7 @@ extension BlockchainDataProvider {
         try await dataProvider.getStorage(key: key, blockHash: blockHash)
     }
 
-    // add forks of finalized head is not allowed
+    /// add forks of finalized head is not allowed
     public func add(block: BlockRef) async throws {
         logger.debug("adding block: \(block.hash)")