GP 0.7.0 (#359)

* refactor to reduce a few force unwrap

* update tiny config changes

* update submodule

* update submodule

* update jamtestvectors

* 0.7.0

Author: qiweiii

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

@@ -110,13 +110,13 @@ extension Ref where T == ProtocolConfig {
         additionalMinBalancePerStateByte: 1,
         serviceMinBalance: 100,
         totalNumberOfCores: 2,
-        preimagePurgePeriod: 19200,
+        preimagePurgePeriod: 32,
         epochLength: 12,
         auditBiasFactor: 2,
         workReportAccumulationGas: Gas(10_000_000),
         workPackageIsAuthorizedGas: Gas(50_000_000),
-        workPackageRefineGas: Gas(5_000_000_000),
-        totalAccumulationGas: Gas(3_500_000_000),
+        workPackageRefineGas: Gas(1_000_000_000),
+        totalAccumulationGas: Gas(20_000_000),
         recentHistorySize: 8,
         maxWorkItems: 16,
         maxDepsInWorkReport: 8,

Blockchain/Sources/Blockchain/RuntimeProtocols/AccumulateFunction.swift

@@ -4,7 +4,7 @@ import Utils
 
 // wrangled operand tuple
 public struct OperandTuple: Codable {
-    /// h
+    /// p
     public var packageHash: Data32
     /// e
     public var segmentRoot: Data32
@@ -14,9 +14,9 @@ public struct OperandTuple: Codable {
     public var payloadHash: Data32
     /// g
     @CodingAs<Compact<Gas>> public var gasLimit: Gas
-    /// d
+    /// l
     public var workResult: WorkResult
-    /// o
+    /// t
     public var authorizerTrace: Data
 }
 
@@ -83,7 +83,6 @@ public struct AccumulateState {
     }
 }
 
-/// X
 public class AccumlateResultContext {
     /// s: the accumulating service account index
     public var serviceIndex: ServiceIndex

Blockchain/Sources/Blockchain/RuntimeProtocols/Accumulation.swift

@@ -64,11 +64,11 @@ public struct ServicePreimagePair: Hashable {
 }
 
 public struct AccumulationResult {
-    // o
+    // e
     public var state: AccumulateState
     // t
     public var transfers: [DeferredTransfers]
-    // b
+    // y
     public var commitment: Data32?
     // u
     public var gasUsed: Gas

Blockchain/Sources/Blockchain/State/State.swift

@@ -26,7 +26,7 @@ public struct State: Sendable {
         }
     }
 
-    // φ: The authorization queue.
+    // ϕ: The authorization queue.
     public var authorizationQueue: StateKeys.AuthorizationQueueKey.Value {
         get {
             layer.authorizationQueue
@@ -146,7 +146,7 @@ public struct State: Sendable {
         }
     }
 
-    // ϑ: The accumulation queue.
+    // ω: The accumulation queue.
     public var accumulationQueue: StateKeys.AccumulationQueueKey.Value {
         get {
             layer.accumulationQueue

Blockchain/Sources/Blockchain/Types/Header.swift

@@ -34,15 +34,15 @@ public struct Header: Sendable, Equatable {
                 ProtocolConfig.EpochLength
             >?
 
-        // Ho: The offenders markers must contain exactly the sequence of keys of all new offenders.
-        public var offendersMarkers: [Ed25519PublicKey]
-
         // Hi: block author index
         public var authorIndex: ValidatorIndex
 
         // Hv: the entropy-yielding vrf signature
         public var vrfSignature: BandersnatchSignature
 
+        // Ho: The offenders markers must contain exactly the sequence of keys of all new offenders.
+        public var offendersMarkers: [Ed25519PublicKey]
+
         public init(
             parentHash: Data32,
             priorStateRoot: Data32,
@@ -53,9 +53,9 @@ public struct Header: Sendable, Equatable {
                 Ticket,
                 ProtocolConfig.EpochLength
             >?,
-            offendersMarkers: [Ed25519PublicKey],
             authorIndex: ValidatorIndex,
-            vrfSignature: BandersnatchSignature
+            vrfSignature: BandersnatchSignature,
+            offendersMarkers: [Ed25519PublicKey]
         ) {
             self.parentHash = parentHash
             self.priorStateRoot = priorStateRoot
@@ -107,9 +107,9 @@ extension Header: Codable {
                     ConfigFixedSizeArray<Ticket, ProtocolConfig.EpochLength>.self,
                     forKey: .winningTickets
                 ),
-                offendersMarkers: container.decode([Ed25519PublicKey].self, forKey: .offendersMarkers),
                 authorIndex: container.decode(ValidatorIndex.self, forKey: .authorIndex),
-                vrfSignature: container.decode(BandersnatchSignature.self, forKey: .vrfSignature)
+                vrfSignature: container.decode(BandersnatchSignature.self, forKey: .vrfSignature),
+                offendersMarkers: container.decode([Ed25519PublicKey].self, forKey: .offendersMarkers),
             ),
             seal: container.decode(BandersnatchSignature.self, forKey: .seal)
         )
@@ -123,9 +123,9 @@ extension Header: Codable {
         try container.encode(unsigned.timeslot, forKey: .timeslot)
         try container.encodeIfPresent(unsigned.epoch, forKey: .epoch)
         try container.encodeIfPresent(unsigned.winningTickets, forKey: .winningTickets)
-        try container.encode(unsigned.offendersMarkers, forKey: .offendersMarkers)
         try container.encode(unsigned.authorIndex, forKey: .authorIndex)
         try container.encode(unsigned.vrfSignature, forKey: .vrfSignature)
+        try container.encode(unsigned.offendersMarkers, forKey: .offendersMarkers)
         try container.encode(seal, forKey: .seal)
     }
 }
@@ -157,9 +157,9 @@ extension Header.Unsigned: Dummy {
             timeslot: 0,
             epoch: EpochMarker.dummy(config: config),
             winningTickets: nil,
-            offendersMarkers: [],
             authorIndex: 0,
-            vrfSignature: BandersnatchSignature()
+            vrfSignature: BandersnatchSignature(),
+            offendersMarkers: []
         )
     }
 }

Blockchain/Sources/Blockchain/Types/Statistics.swift

@@ -43,14 +43,14 @@ public struct Statistics: Sendable, Equatable, Codable {
         // i: total number of segments imported from the Segments DA
         public var importsCount: UInt
 
-        // e: total number of segments exported into the Segments DA
-        public var exportsCount: UInt
+        // x: total number of the extrinsics used in computing the workload
+        public var extrinsicsCount: UInt
 
         // z: total size in octets of the extrinsics used in computing the workload
         public var extrinsicsSize: UInt
 
-        // x: total number of the extrinsics used in computing the workload
-        public var extrinsicsCount: UInt
+        // e: total number of segments exported into the Segments DA
+        public var exportsCount: UInt
 
         // b: total package data length
         public var packageSize: UInt
@@ -79,14 +79,14 @@ public struct Statistics: Sendable, Equatable, Codable {
         // i: total number of segments imported from the Segments DA
         public var importsCount: UInt
 
-        // e: total number of segments exported into the Segments DA
-        public var exportsCount: UInt
+        // x: total number of the extrinsics used in computing the workload
+        public var extrinsicsCount: UInt
 
         // z: total size in octets of the extrinsics used in computing the workload
         public var extrinsicsSize: UInt
 
-        // x: total number of the extrinsics used in computing the workload
-        public var extrinsicsCount: UInt
+        // e: total number of segments exported into the Segments DA
+        public var exportsCount: UInt
 
         // a: accumulate count and gas used
         public var accumulates: CountAndGas
@@ -145,9 +145,9 @@ extension Statistics.Core: Dummy {
             dataSize: 0,
             assuranceCount: 0,
             importsCount: 0,
-            exportsCount: 0,
-            extrinsicsSize: 0,
             extrinsicsCount: 0,
+            extrinsicsSize: 0,
+            exportsCount: 0,
             packageSize: 0,
             gasUsed: 0
         )
@@ -161,9 +161,9 @@ extension Statistics.Service: Dummy {
             preimages: .init(count: 0, size: 0),
             refines: .init(count: 0, gasUsed: 0),
             importsCount: 0,
-            exportsCount: 0,
-            extrinsicsSize: 0,
             extrinsicsCount: 0,
+            extrinsicsSize: 0,
+            exportsCount: 0,
             accumulates: .init(count: 0, gasUsed: 0),
             transfers: .init(count: 0, gasUsed: 0)
         )

Blockchain/Sources/Blockchain/Types/WorkDigest.swift

@@ -2,7 +2,6 @@ import Codec
 import Foundation
 import Utils
 
-// L
 public struct WorkDigest: Sendable, Equatable, Codable {
     // s: the index of the service whose state is to be altered and thus whose refine code was already executed
     public var serviceIndex: ServiceIndex
@@ -16,7 +15,7 @@ public struct WorkDigest: Sendable, Equatable, Codable {
     // g: the gas limit for executing this item's accumulate
     public var gasLimit: Gas
 
-    // d: the work result
+    // l: the work result
     public var result: WorkResult
 
     // u: the actual amount of gas used during refinement

Blockchain/Sources/Blockchain/Types/WorkItem.swift

@@ -1,7 +1,6 @@
 import Foundation
 import Utils
 
-// I
 public struct WorkItem: Sendable, Equatable, Codable, Hashable {
     public struct ImportedDataSegment: Sendable, Equatable, Codable, Hashable {
         public enum DataSegmentRootKind: Sendable, Equatable, Hashable {
@@ -66,27 +65,27 @@ public struct WorkItem: Sendable, Equatable, Codable, Hashable {
     // s
     public var serviceIndex: ServiceIndex
 
-    // h
+    // c
     public var codeHash: Data32
 
-    // y
-    public var payloadBlob: Data
-
     // g
     public var refineGasLimit: Gas
 
     // a
     public var accumulateGasLimit: Gas
 
+    // e: the number of data segments exported by this work item
+    public var exportsCount: UInt16
+
+    // y
+    public var payloadBlob: Data
+
     // i: a sequence of imported data segments which identify a prior exported segment through an index
     public var inputs: [ImportedDataSegment]
 
     // x: a sequence of hashed of blob hashes and lengths to be introduced in this block
     public var outputs: [HashAndLength]
 
-    // e: the number of data segments exported by this work item
-    public var exportsCount: UInt16
-
     public init(
         serviceIndex: ServiceIndex,
         codeHash: Data32,

Blockchain/Sources/Blockchain/Types/WorkPackage.swift

@@ -4,21 +4,21 @@ import Utils
 
 // P
 public struct WorkPackage: Comparable, Sendable, Equatable, Codable, Hashable {
-    // j
-    public var authorizationToken: Data
-
     // h
     public var authorizationServiceIndex: ServiceIndex
 
     // u
     public var authorizationCodeHash: Data32
 
-    // p
-    public var configurationBlob: Data
-
-    // x
+    // c
     public var context: RefinementContext
 
+    // j
+    public var authorizationToken: Data
+
+    // f
+    public var configurationBlob: Data
+
     // w
     public var workItems: ConfigLimitedSizeArray<
         WorkItem,

Blockchain/Sources/Blockchain/Types/WorkReport.swift

@@ -6,7 +6,7 @@ public struct WorkReport: Sendable, Equatable, Codable, Hashable {
     // s: package specification
     public var packageSpecification: AvailabilitySpecifications
 
-    // x: refinement context
+    // **c**: refinement context
     public var refinementContext: RefinementContext
 
     // c: the core-index
@@ -15,22 +15,22 @@ public struct WorkReport: Sendable, Equatable, Codable, Hashable {
     // a: authorizer hash
     public var authorizerHash: Data32
 
-    // o: authorizer trace
+    // g
+    public var authGasUsed: UInt
+
+    // t: authorizer trace
     public var authorizerTrace: Data
 
     // l: segment-root lookup dictionary
     @CodingAs<SortedKeyValues<Data32, Data32>> public var lookup: [Data32: Data32]
 
-    // r: the results of the evaluation of each of the items in the package
+    // d: the results of the evaluation of each of the items in the package
     public var digests: ConfigLimitedSizeArray<
         WorkDigest,
         ProtocolConfig.Int1,
         ProtocolConfig.MaxWorkItems
     >
 
-    // g
-    public var authGasUsed: UInt
-
     public init(
         authorizerHash: Data32,
         coreIndex: UInt,