Swift 6.0 (#27)

* config swift 6 language mode * import Foundation * remove explicit import Foundation * sendable * update ci * update ci --------- Co-authored-by: wangjj9219 <[email protected]>
open-web3-stack · Jun 27, 2024 · 17f0af2 · 17f0af2
1 parent eae4a71
commit 17f0af2
Show file tree

Hide file tree

Showing 32 changed files with 75 additions and 64 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: ["master"]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   lint:
@@ -33,9 +36,9 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-spm-
     - name: Setup Swift
-      uses: swift-actions/setup-swift@v2
+      uses: SwiftyLab/setup-swift@latest
       with:
-        swift-version: "5.10"
+        swift-version: '6.0'
     - name: Build
       run: make build
     - name: Test

diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-5.10
+6.0
diff --git a/Blockchain/Package.swift b/Blockchain/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -37,5 +37,6 @@ let package = Package(
             name: "BlockchainTests",
             dependencies: ["Blockchain"]
         ),
-    ]
+    ],
+    swiftLanguageVersions: [.version("6")]
 )
diff --git a/Blockchain/Sources/Blockchain/Config/ProtocolConfig.swift b/Blockchain/Sources/Blockchain/Config/ProtocolConfig.swift
@@ -1,7 +1,7 @@
 import Utils
 
 // constants defined in the graypaper
-public struct ProtocolConfig {
+public struct ProtocolConfig: Sendable {
     // A = 8: The period, in seconds, between audit tranches.
     public var auditTranchePeriod: Int
 

diff --git a/Blockchain/Sources/Blockchain/Types/AvailabilitySpecifications.swift b/Blockchain/Sources/Blockchain/Types/AvailabilitySpecifications.swift
@@ -1,7 +1,7 @@
 import ScaleCodec
 import Utils
 
-public struct AvailabilitySpecifications {
+public struct AvailabilitySpecifications: Sendable {
     // h
     public var workPackageHash: H256
 

diff --git a/Blockchain/Sources/Blockchain/Types/Block.swift b/Blockchain/Sources/Blockchain/Types/Block.swift
@@ -1,7 +1,7 @@
 import ScaleCodec
 import Utils
 
-public struct Block {
+public struct Block: Sendable {
     public var header: Header
     public var extrinsic: Extrinsic
 

diff --git a/Blockchain/Sources/Blockchain/Types/Extrinsic.swift b/Blockchain/Sources/Blockchain/Types/Extrinsic.swift
@@ -1,7 +1,7 @@
 import ScaleCodec
 import Utils
 
-public struct Extrinsic {
+public struct Extrinsic: Sendable {
     // ET: Tickets, used for the mechanism which manages the selection of validators for the
     // permissioning of block authoring
     public var tickets: ExtrinsicTickets

diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicAvailability.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicAvailability.swift
@@ -2,8 +2,8 @@ import Foundation
 import ScaleCodec
 import Utils
 
-public struct ExtrinsicAvailability {
-    public struct AssuranceItem {
+public struct ExtrinsicAvailability: Sendable {
+    public struct AssuranceItem: Sendable {
         // a
         public var parentHash: H256
         // f

diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicGuarantees.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicGuarantees.swift
@@ -1,8 +1,8 @@
 import ScaleCodec
 import Utils
 
-public struct ExtrinsicGuarantees {
-    public struct GuaranteeItem {
+public struct ExtrinsicGuarantees: Sendable {
+    public struct GuaranteeItem: Sendable {
         public var coreIndex: CoreIndex
         public var workReport: WorkReport
         public var timeslot: TimeslotIndex

diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicJudgement.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicJudgement.swift
@@ -1,9 +1,9 @@
 import ScaleCodec
 import Utils
 
-public struct ExtrinsicJudgement {
-    public struct JudgementItem {
-        public struct SignatureItem {
+public struct ExtrinsicJudgement: Sendable {
+    public struct JudgementItem: Sendable {
+        public struct SignatureItem: Sendable {
             public var isValid: Bool
             public var validatorIndex: ValidatorIndex
             public var signature: BandersnatchSignature

diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicPreimages.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicPreimages.swift
@@ -2,7 +2,17 @@ import Foundation
 import ScaleCodec
 import Utils
 
-public struct ExtrinsicPreimages {
+public struct ExtrinsicPreimages: Sendable {
+    public struct SizeAndData: Sendable {
+        public var size: DataLength
+        public var data: Data
+
+        public init(size: DataLength, data: Data) {
+            self.size = size
+            self.data = data
+        }
+    }
+
     public var preimages: [SizeAndData]
 
     public init(
@@ -31,17 +41,7 @@ extension ExtrinsicPreimages: ScaleCodec.Codable {
     }
 }
 
-public struct SizeAndData {
-    public var size: DataLength
-    public var data: Data
-
-    public init(size: DataLength, data: Data) {
-        self.size = size
-        self.data = data
-    }
-}
-
-extension SizeAndData: ScaleCodec.Codable {
+extension ExtrinsicPreimages.SizeAndData: ScaleCodec.Codable {
     public init(from decoder: inout some ScaleCodec.Decoder) throws {
         try self.init(
             size: decoder.decode(),

diff --git a/Blockchain/Sources/Blockchain/Types/ExtrinsicTickets.swift b/Blockchain/Sources/Blockchain/Types/ExtrinsicTickets.swift
@@ -1,8 +1,8 @@
 import ScaleCodec
 import Utils
 
-public struct ExtrinsicTickets {
-    public struct TicketItem {
+public struct ExtrinsicTickets: Sendable {
+    public struct TicketItem: Sendable {
         public var ticketIndex: TicketIndex
         public var proof: BandersnatchRintVRFProof
 

diff --git a/Blockchain/Sources/Blockchain/Types/Header.swift b/Blockchain/Sources/Blockchain/Types/Header.swift
@@ -1,8 +1,8 @@
 import ScaleCodec
 import Utils
 
-public struct Header {
-    public struct EpochMarker {
+public struct Header: Sendable {
+    public struct EpochMarker: Sendable {
         public var randomness: H256
         public var keys: ConfigFixedSizeArray<
             BandersnatchPublicKey,

diff --git a/Blockchain/Sources/Blockchain/Types/JudgementsState.swift b/Blockchain/Sources/Blockchain/Types/JudgementsState.swift
@@ -1,7 +1,7 @@
 import ScaleCodec
 import Utils
 
-public struct JudgementsState {
+public struct JudgementsState: Sendable {
     // ψa: The allow-set contains the hashes of all work-reports which were disputed and judged to be accurate.
     public var allowSet: Set<H256>
 

diff --git a/Blockchain/Sources/Blockchain/Types/RefinementContext.swift b/Blockchain/Sources/Blockchain/Types/RefinementContext.swift
@@ -3,7 +3,7 @@ import Utils
 
 // A refinement context, denoted by the set X, describes the context of the chain
 // at the point that the report’s corresponding work-package was evaluated.
-public struct RefinementContext {
+public struct RefinementContext: Sendable {
     public var anchor: (
         headerHash: H256,
         stateRoot: H256,

diff --git a/Blockchain/Sources/Blockchain/Types/SafroleState.swift b/Blockchain/Sources/Blockchain/Types/SafroleState.swift
@@ -1,7 +1,7 @@
 import ScaleCodec
 import Utils
 
-public struct SafroleState {
+public struct SafroleState: Sendable {
     // γk
     public var pendingValidators: ConfigFixedSizeArray<
         ValidatorKey, ProtocolConfig.TotalNumberOfValidators

diff --git a/Blockchain/Sources/Blockchain/Types/ServiceAccount.swift b/Blockchain/Sources/Blockchain/Types/ServiceAccount.swift
@@ -2,8 +2,8 @@ import Foundation
 import ScaleCodec
 import Utils
 
-public struct ServiceAccount {
-    public struct HashAndLength: Hashable {
+public struct ServiceAccount: Sendable {
+    public struct HashAndLength: Sendable, Hashable {
         public var hash: H256
         public var length: DataLength
 

diff --git a/Blockchain/Sources/Blockchain/Types/State.swift b/Blockchain/Sources/Blockchain/Types/State.swift
@@ -1,8 +1,8 @@
 import ScaleCodec
 import Utils
 
-public struct State {
-    public struct ReportItem {
+public struct State: Sendable {
+    public struct ReportItem: Sendable {
         public var workReport: WorkReport
         public var guarantors: LimitedSizeArray<Ed25519PublicKey, ConstInt2, ConstInt3>
         public var timestamp: TimeslotIndex

diff --git a/Blockchain/Sources/Blockchain/Types/Ticket.swift b/Blockchain/Sources/Blockchain/Types/Ticket.swift
@@ -1,7 +1,7 @@
 import ScaleCodec
 import Utils
 
-public struct Ticket {
+public struct Ticket: Sendable {
     public var identifier: H256
     public var entryIndex: TicketIndex
 }

diff --git a/Blockchain/Sources/Blockchain/Types/ValidatorKey.swift b/Blockchain/Sources/Blockchain/Types/ValidatorKey.swift
@@ -1,7 +1,7 @@
 import ScaleCodec
 import Utils
 
-public struct ValidatorKey {
+public struct ValidatorKey: Sendable {
     public var bandersnatchKey: BandersnatchPublicKey
     public var ed25519Key: Ed25519PublicKey
     public var blsKey: BLSKey

diff --git a/Blockchain/Sources/Blockchain/Types/WorkReport.swift b/Blockchain/Sources/Blockchain/Types/WorkReport.swift
@@ -2,7 +2,7 @@ import Foundation
 import ScaleCodec
 import Utils
 
-public struct WorkReport {
+public struct WorkReport: Sendable {
     // a: authorizer hash
     public var authorizerHash: H256
 

diff --git a/Blockchain/Sources/Blockchain/Types/WorkResult.swift b/Blockchain/Sources/Blockchain/Types/WorkResult.swift
@@ -2,7 +2,7 @@ import Foundation
 import ScaleCodec
 import Utils
 
-public struct WorkResult {
+public struct WorkResult: Sendable {
     // s: the index of the service whose state is to be altered and thus whose refine code was already executed
     public var serviceIdentifier: ServiceIdentifier
 

diff --git a/Boka/Package.swift b/Boka/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -26,5 +26,6 @@ let package = Package(
             name: "BokaTests",
             dependencies: ["Boka"]
         ),
-    ]
+    ],
+    swiftLanguageVersions: [.version("6")]
 )
diff --git a/Database/Package.swift b/Database/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -22,5 +22,6 @@ let package = Package(
             name: "DatabaseTests",
             dependencies: ["Database"]
         ),
-    ]
+    ],
+    swiftLanguageVersions: [.version("6")]
 )
diff --git a/Node/Package.swift b/Node/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -32,5 +32,6 @@ let package = Package(
             name: "NodeTests",
             dependencies: ["Node"]
         ),
-    ]
+    ],
+    swiftLanguageVersions: [.version("6")]
 )
diff --git a/Utils/Package.swift b/Utils/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -35,5 +35,6 @@ let package = Package(
             name: "UtilsTests",
             dependencies: ["Utils"]
         ),
-    ]
+    ],
+    swiftLanguageVersions: [.version("6")]
 )
diff --git a/Utils/Sources/Utils/ConfigLimitedSizeArray.swift b/Utils/Sources/Utils/ConfigLimitedSizeArray.swift
@@ -42,6 +42,8 @@ public struct ConfigLimitedSizeArray<T, TMinLength: ReadInt, TMaxLength: ReadInt
     }
 }
 
+extension ConfigLimitedSizeArray: Sendable where T: Sendable {}
+
 extension ConfigLimitedSizeArray: RandomAccessCollection {
     public typealias Element = T
     public typealias Index = Int

diff --git a/Utils/Sources/Utils/Either.swift b/Utils/Sources/Utils/Either.swift
@@ -7,6 +7,8 @@ public enum Either<A, B> {
 
 extension Either: Equatable where A: Equatable, B: Equatable {}
 
+extension Either: Sendable where A: Sendable, B: Sendable {}
+
 extension Either: CustomStringConvertible where A: CustomStringConvertible, B: CustomStringConvertible {
     public var description: String {
         switch self {

diff --git a/Utils/Sources/Utils/FixedSizeData.swift b/Utils/Sources/Utils/FixedSizeData.swift
@@ -1,7 +1,7 @@
 import Foundation
 import ScaleCodec
 
-public struct FixedSizeData<T: ConstInt> {
+public struct FixedSizeData<T: ConstInt>: Sendable {
     public private(set) var data: Data
 
     public init?(_ value: Data) {

diff --git a/Utils/Sources/Utils/LimitedSizeArray.swift b/Utils/Sources/Utils/LimitedSizeArray.swift
@@ -30,6 +30,8 @@ public struct LimitedSizeArray<T, TMinLength: ConstInt, TMaxLength: ConstInt> {
     }
 }
 
+extension LimitedSizeArray: Sendable where T: Sendable {}
+
 extension LimitedSizeArray: ExpressibleByArrayLiteral {
     public init(arrayLiteral elements: T...) {
         self.init(elements)

diff --git a/Utils/Sources/Utils/Ref.swift b/Utils/Sources/Utils/Ref.swift
@@ -1,21 +1,18 @@
 import ScaleCodec
 
-public class Ref<T> {
-    public internal(set) var value: T
+public final class Ref<T: Sendable>: Sendable {
+    public let value: T
 
     public required init(_ value: T) {
         self.value = value
     }
 }
 
-public class RefMut<T>: Ref<T> {
-    override public var value: T {
-        get {
-            super.value
-        }
-        set {
-            super.value = newValue
-        }
+public final class RefMut<T> {
+    public var value: T
+
+    public required init(_ value: T) {
+        self.value = value
     }
 }