@typeberry/jam 0.0.5-1ef0e31 → 0.0.5-6e657f4

package/importer/index.js

@@ -9984,6 +9984,7 @@ function legacyServiceNested(serviceId, hash) {
 ;// CONCATENATED MODULE: ./packages/jam/state/accumulation-output.ts
 
 
+
 /**
  * Single service-indexed commitment to accumulation output
  *
@@ -10004,6 +10005,16 @@ class AccumulationOutput {
         this.output = output;
     }
 }
+function accumulationOutputComparator(a, b) {
+    const result = a.serviceId - b.serviceId;
+    if (result < 0) {
+        return Ordering.Less;
+    }
+    if (result > 0) {
+        return Ordering.Greater;
+    }
+    return Ordering.Equal;
+}
 
 ;// CONCATENATED MODULE: ./packages/jam/state/assurances.ts
 
@@ -11109,6 +11120,7 @@ class StatisticsData {
 
 
 
+
 
 var in_memory_state_UpdateError;
 (function (UpdateError) {
@@ -11512,7 +11524,7 @@ class InMemoryState extends WithDebug {
                 validatorsManager: tryAsServiceId(0),
                 autoAccumulateServices: [],
             }),
-            accumulationOutputLog: [],
+            accumulationOutputLog: SortedArray.fromArray(accumulationOutputComparator, []),
             services: new Map(),
         });
     }
@@ -11711,7 +11723,7 @@ var serialize;
     /** C(16): https://graypaper.fluffylabs.dev/#/38c4e62/3b46033b4603?v=0.7.0 */
     serialize.accumulationOutputLog = {
         key: stateKeys.index(StateKeyIdx.Theta),
-        Codec: descriptors_codec.sequenceVarLen(AccumulationOutput.Codec),
+        Codec: descriptors_codec.sequenceVarLen(AccumulationOutput.Codec).convert((i) => i.array, (o) => SortedArray.fromSortedArray(accumulationOutputComparator, o)),
         extract: (s) => s.accumulationOutputLog,
     };
     /** C(255, s): https://graypaper.fluffylabs.dev/#/85129da/383103383103?v=0.6.3 */
@@ -20258,6 +20270,32 @@ class SafroleSeal {
 
 
 
+;// CONCATENATED MODULE: ./packages/jam/transition/accumulate/accumulate-output.ts
+
+
+
+
+
+class AccumulateOutput {
+    async transition({ accumulationOutputLog }) {
+        const rootHash = await getRootHash(accumulationOutputLog);
+        return rootHash;
+    }
+}
+/**
+ * Returns a new root hash
+ *
+ * https://graypaper.fluffylabs.dev/#/38c4e62/3c9d013c9d01?v=0.7.0
+ */
+async function getRootHash(yieldedRoots) {
+    const keccakHasher = await KeccakHasher.create();
+    const trieHasher = getKeccakTrieHasher(keccakHasher);
+    const values = yieldedRoots.array.map(({ serviceId, output }) => {
+        return bytes_BytesBlob.blobFromParts([numbers_u32AsLeBytes(serviceId), output.raw]);
+    });
+    return binaryMerkleization(values, trieHasher);
+}
+
 ;// CONCATENATED MODULE: ./packages/jam/jam-host-calls/externalities/state-update.ts
 
 
@@ -23352,9 +23390,6 @@ class pvm_executor_PvmExecutor {
 
 
 
-
-
-
 
 
 
@@ -23608,10 +23643,10 @@ class Accumulate {
         const { services, yieldedRoots, transfers, validatorsData, privilegedServices, authorizationQueues, ...stateUpdateRest } = state;
         assertEmpty(stateUpdateRest);
         const accStateUpdate = this.getAccumulationStateUpdate(accumulated, toAccumulateLater, slot, Array.from(statistics.keys()), services);
-        const accumulationOutput = Array.from(yieldedRoots.entries()).map(([serviceId, root]) => {
+        const accumulationOutputUnsorted = Array.from(yieldedRoots.entries()).map(([serviceId, root]) => {
             return { serviceId, output: root.asOpaque() };
         });
-        const rootHash = await getRootHash(accumulationOutput);
+        const accumulationOutput = SortedArray.fromArray(accumulationOutputComparator, accumulationOutputUnsorted);
         const authQueues = (() => {
             if (authorizationQueues.size === 0) {
                 return {};
@@ -23623,7 +23658,6 @@ class Accumulate {
             return { authQueues: tryAsPerCore(updatedAuthQueues, this.chainSpec) };
         })();
         return result_Result.ok({
-            root: rootHash,
             stateUpdate: {
                 ...accStateUpdate,
                 ...(validatorsData === null ? {} : { designatedValidatorData: validatorsData }),
@@ -23636,20 +23670,6 @@ class Accumulate {
         });
     }
 }
-/**
- * Returns a new root hash
- *
- * https://graypaper.fluffylabs.dev/#/38c4e62/3c9d013c9d01?v=0.7.0
- */
-async function getRootHash(yieldedRoots) {
-    const keccakHasher = await KeccakHasher.create();
-    const trieHasher = getKeccakTrieHasher(keccakHasher);
-    const yieldedRootsSortedByServiceId = yieldedRoots.sort((a, b) => a.serviceId - b.serviceId);
-    const values = yieldedRootsSortedByServiceId.map(({ serviceId, output }) => {
-        return bytes_BytesBlob.blobFromParts([numbers_u32AsLeBytes(serviceId), output.raw]);
-    });
-    return binaryMerkleization(values, trieHasher);
-}
 
 ;// CONCATENATED MODULE: ./packages/jam/transition/accumulate/deferred-transfers.ts
 
@@ -25045,6 +25065,7 @@ class Statistics {
 
 
 
+
 class DbHeaderChain {
     blocks;
     constructor(blocks) {
@@ -25088,6 +25109,7 @@ class OnChain {
     assurances;
     // chapter 12: https://graypaper.fluffylabs.dev/#/68eaa1f/159f02159f02?v=0.6.4
     accumulate;
+    accumulateOutput;
     // chapter 12.3: https://graypaper.fluffylabs.dev/#/68eaa1f/178203178203?v=0.6.4
     deferredTransfers;
     // chapter 12.4: https://graypaper.fluffylabs.dev/#/68eaa1f/18cc0018cc00?v=0.6.4
@@ -25112,6 +25134,7 @@ class OnChain {
         this.reports = new Reports(chainSpec, state, new DbHeaderChain(blocks));
         this.assurances = new Assurances(chainSpec, state);
         this.accumulate = new Accumulate(chainSpec, state);
+        this.accumulateOutput = new AccumulateOutput();
         this.deferredTransfers = new DeferredTransfers(chainSpec, state);
         this.preimages = new Preimages(state);
         this.authorization = new Authorization(chainSpec, state);
@@ -25220,7 +25243,7 @@ class OnChain {
         if (accumulateResult.isError) {
             return stfError(StfErrorKind.Accumulate, accumulateResult);
         }
-        const { root: accumulateRoot, stateUpdate: accumulateUpdate, accumulationStatistics, pendingTransfers, accumulationOutputLog, ...accumulateRest } = accumulateResult.ok;
+        const { stateUpdate: accumulateUpdate, accumulationStatistics, pendingTransfers, accumulationOutputLog, ...accumulateRest } = accumulateResult.ok;
         assertEmpty(accumulateRest);
         const { privilegedServices: maybePrivilegedServices, authQueues: maybeAuthorizationQueues, designatedValidatorData: maybeDesignatedValidatorData, preimages: accumulatePreimages, accumulationQueue, recentlyAccumulated, ...servicesUpdate } = accumulateUpdate;
         const deferredTransfersResult = await this.deferredTransfers.transition({
@@ -25234,8 +25257,9 @@ class OnChain {
         }
         const { servicesUpdate: newServicesUpdate, transferStatistics, ...deferredTransfersRest } = deferredTransfersResult.ok;
         assertEmpty(deferredTransfersRest);
+        const accumulateRoot = await this.accumulateOutput.transition({ accumulationOutputLog });
         // recent history
-        const recentHistoryUpdate = this.recentHistory.transition({
+        const recentHistoryUpdate = await this.recentHistory.transition({
             partial: recentHistoryPartialUpdate,
             headerHash,
             accumulateRoot,