update work item (#250)

* update work item * fix build
open-web3-stack · Dec 16, 2024 · 13569f4 · 13569f4
1 parent c9838bc
commit 13569f4
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 13 deletions.
diff --git a/Blockchain/Sources/Blockchain/Types/WorkItem.swift b/Blockchain/Sources/Blockchain/Types/WorkItem.swift
@@ -4,13 +4,47 @@ import Utils
 // I
 public struct WorkItem: Sendable, Equatable, Codable {
     public struct ImportedDataSegment: Sendable, Equatable, Codable {
-        public var root: Data32
+        public enum DataSegmentRootKind: Sendable, Equatable {
+            case segmentRoot(Data32)
+            case workPackageHash(Data32)
+        }
+
+        public var root: DataSegmentRootKind
         public var index: UInt16
 
-        public init(root: Data32, index: UInt16) {
+        public init(root: DataSegmentRootKind, index: UInt16) {
             self.root = root
             self.index = index
         }
+
+        // Encodable
+        public func encode(to encoder: Encoder) throws {
+            var container = encoder.unkeyedContainer()
+            var indexValue = index
+            switch root {
+            case let .segmentRoot(root):
+                try container.encode(root)
+            case let .workPackageHash(hash):
+                try container.encode(hash)
+                indexValue |= 1 << 15
+            }
+            try container.encode(indexValue)
+        }
+
+        // Decodable
+        public init(from decoder: Decoder) throws {
+            var container = try decoder.unkeyedContainer()
+            let root = try container.decode(Data32.self)
+            let index = try container.decode(UInt16.self)
+            let flag = index >> 15
+            if flag == 0 {
+                self.root = .segmentRoot(root)
+                self.index = index
+            } else {
+                self.root = .workPackageHash(root)
+                self.index = index & 0x7FFF
+            }
+        }
     }
 
     // s
@@ -23,7 +57,10 @@ public struct WorkItem: Sendable, Equatable, Codable {
     public var payloadBlob: Data
 
     // g
-    public var gasLimit: Gas
+    public var refineGasLimit: Gas
+
+    // a
+    public var accumulateGasLimit: Gas
 
     // i: a sequence of imported data segments which identify a prior exported segment through an index
     public var inputs: [ImportedDataSegment]
@@ -38,15 +75,17 @@ public struct WorkItem: Sendable, Equatable, Codable {
         serviceIndex: ServiceIndex,
         codeHash: Data32,
         payloadBlob: Data,
-        gasLimit: Gas,
+        refineGasLimit: Gas,
+        accumulateGasLimit: Gas,
         inputs: [ImportedDataSegment],
         outputs: [HashAndLength],
         outputDataSegmentsCount: UInt16
     ) {
         self.serviceIndex = serviceIndex
         self.codeHash = codeHash
         self.payloadBlob = payloadBlob
-        self.gasLimit = gasLimit
+        self.refineGasLimit = refineGasLimit
+        self.accumulateGasLimit = accumulateGasLimit
         self.inputs = inputs
         self.outputs = outputs
         self.outputDataSegmentsCount = outputDataSegmentsCount
@@ -60,7 +99,8 @@ extension WorkItem: Dummy {
             serviceIndex: 0,
             codeHash: Data32(),
             payloadBlob: Data(),
-            gasLimit: Gas(0),
+            refineGasLimit: Gas(0),
+            accumulateGasLimit: Gas(0),
             inputs: [],
             outputs: [],
             outputDataSegmentsCount: 0

diff --git a/JAMTests/Tests/JAMTests/CodecTests.swift b/JAMTests/Tests/JAMTests/CodecTests.swift
@@ -297,14 +297,18 @@ struct CodecTests {
 
     @Test
     func work_item() throws {
-        let (actual, expected) = try Self.test(WorkItem.self, path: "work_item")
-        #expect(actual == expected)
+        withKnownIssue("need bump test vectors") {
+            let (actual, expected) = try Self.test(WorkItem.self, path: "work_item")
+            #expect(actual == expected)
+        }
     }
 
     @Test
     func work_package() throws {
-        let (actual, expected) = try Self.test(WorkPackage.self, path: "work_package")
-        #expect(actual == expected)
+        withKnownIssue("need bump test vectors") {
+            let (actual, expected) = try Self.test(WorkPackage.self, path: "work_package")
+            #expect(actual == expected)
+        }
     }
 
     @Test

diff --git a/Utils/Sources/Utils/AnyCodable.swift b/Utils/Sources/Utils/AnyCodable.swift
@@ -13,12 +13,12 @@
 /// A type-erased codable value.
 ///
 /// An `AnyCodable` value forwards encoding and decoding operations to the underlying base.
-public struct AnyCodable: Codable, CustomDebugStringConvertible {
+public struct AnyCodable: Codable, CustomDebugStringConvertible, Sendable {
     /// The base encodable value.
-    public var value: Encodable
+    public var value: Encodable & Sendable
 
     /// Creates a codable value that wraps the given base.
-    public init(_ encodable: Encodable) {
+    public init(_ encodable: Encodable & Sendable) {
         value = encodable
     }