fix and pass new traces (#371)

Author: qiweiii

Blockchain/Sources/Blockchain/RuntimeProtocols/Accumulation.swift

@@ -662,12 +662,10 @@ extension Accumulation {
 
             let digests = accumulated.compactMap(\.digests).flatMap(\.self)
             let num = digests.filter { $0.serviceIndex == service }.count
-
-            if num == 0 { continue }
-
             let gasUsed = accumulateOutput.gasUsed
                 .filter { $0.serviceIndex == service }
                 .reduce(Gas(0)) { $0 + $1.gas }
+            if Int(gasUsed.value) + num == 0 { continue }
 
             accumulateStats[service] = (gasUsed, UInt32(num))
         }

Blockchain/Sources/Blockchain/VMInvocations/HostCall/HostCalls.swift

@@ -286,7 +286,7 @@ public class Read: HostCall {
             nil
         }
 
-        logger.debug("value: \(value?.toHexString() ?? "nil")")
+        logger.debug("value: \(value?.toDebugHexString() ?? "nil")")
 
         guard let value else {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.NONE.rawValue)
@@ -346,6 +346,7 @@ public class Write: HostCall {
             throw VMInvocationsError.panic
         }
 
+        // update footprint for threshold balance check
         let oldValue = try await serviceAccounts.value.get(serviceAccount: serviceIndex, storageKey: key)
         if regs[3] == 0 {
             accountDetails.updateFootprintStorage(key: key, oldValue: oldValue, newValue: nil)
@@ -1213,6 +1214,8 @@ public class Solicit: HostCall {
         let hashData = try? state.readMemory(address: startAddr, length: 32)
         let hash = Data32(hashData ?? Data())
 
+        logger.debug("hash: \(hash?.description ?? "nil"), length: \(length)")
+
         guard let hash else {
             throw VMInvocationsError.panic
         }
@@ -1222,21 +1225,40 @@ public class Solicit: HostCall {
             preimageHash: hash,
             length: length
         )
+        logger.debug("previous info: \(String(describing: preimageInfo))")
+
         let notRequestedYet = preimageInfo == nil
         let isPreviouslyAvailable = preimageInfo?.count == 2
         let canSolicit = notRequestedYet || isPreviouslyAvailable
 
-        let acc = try await x.state.accounts.value.get(serviceAccount: x.serviceIndex)
-
         if !canSolicit {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.HUH.rawValue)
-        } else if let acc, acc.balance < acc.thresholdBalance(config: config) {
+            return
+        }
+
+        var acc = try await x.state.accounts.value.get(serviceAccount: x.serviceIndex)
+
+        if var tempAcc = acc {
+            // update footprints for threshold balance check
+            let oldValue = try await x.state.accounts.value.get(serviceAccount: x.serviceIndex, preimageHash: hash, length: length)
+            if notRequestedYet {
+                tempAcc.updateFootprintPreimage(oldValue: oldValue, newValue: [], length: length)
+            } else if isPreviouslyAvailable, var preimageInfo {
+                try preimageInfo.append(timeslot)
+                tempAcc.updateFootprintPreimage(oldValue: oldValue, newValue: preimageInfo, length: length)
+            }
+            acc = tempAcc
+        }
+
+        if let acc, acc.balance < acc.thresholdBalance(config: config) {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.FULL.rawValue)
         } else {
             state.writeRegister(Registers.Index(raw: 7), HostCallResultCode.OK.rawValue)
             if notRequestedYet {
+                logger.debug("solicit new preimage")
                 try await x.state.accounts.set(serviceAccount: x.serviceIndex, preimageHash: hash, length: length, value: [])
             } else if isPreviouslyAvailable, var preimageInfo {
+                logger.debug("solicit existing preimage")
                 try preimageInfo.append(timeslot)
                 try await x.state.accounts.set(
                     serviceAccount: x.serviceIndex,

Fuzzing/Sources/Fuzzing/FuzzingClient.swift

@@ -228,8 +228,8 @@ public class FuzzingClient {
         var targetMap: [String: String] = [:]
         var duplicateTargetKeys: [String] = []
         for kv in targetState {
-            let keyHex = kv.key.data.toHexString()
-            let valueHex = kv.value.toHexString()
+            let keyHex = kv.key.data.toDebugHexString()
+            let valueHex = kv.value.toDebugHexString()
             if targetMap[keyHex] != nil {
                 duplicateTargetKeys.append(keyHex)
                 logger.warning("Duplicate key in target state: \(keyHex)")
@@ -240,8 +240,8 @@ public class FuzzingClient {
         var expectedMap: [String: String] = [:]
         var duplicateExpectedKeys: [String] = []
         for kv in expectedState {
-            let keyHex = kv.key.data.toHexString()
-            let valueHex = kv.value.toHexString()
+            let keyHex = kv.key.data.toDebugHexString()
+            let valueHex = kv.value.toDebugHexString()
             if expectedMap[keyHex] != nil {
                 duplicateExpectedKeys.append(keyHex)
                 logger.warning("Duplicate key in expected state: \(keyHex)")

JAMTests/Tests/JAMTests/jamtestnet/FuzzTests.swift

@@ -50,4 +50,16 @@ struct FuzzTests {
     func v070(_: Testcase) async throws {
         // try await TraceTest.test(input)
     }
+
+    @Test(arguments: try loadTests(
+        version: "0.7.1",
+        filters: [
+            // empty to include all
+        ],
+        ignore: [
+        ]
+    ))
+    func v071(input: Testcase) async throws {
+        try await TraceTest.test(input)
+    }
 }

JAMTests/Tests/JAMTests/jamtestnet/PolkajamTests.swift

@@ -34,6 +34,11 @@ struct PolkajamTests {
         try await TraceTest.test(input)
     }
 
+    @Test(arguments: try JamTestnet.loadTests(path: "traces/fuzzy_light", src: .w3f))
+    func fuzzyLightTests(_ input: Testcase) async throws {
+        try await TraceTest.test(input)
+    }
+
     @Test(arguments: try JamTestnet.loadTests(path: "traces/fuzzy", src: .w3f))
     func fuzzyTests(_ input: Testcase) async throws {
         try await TraceTest.test(input)