@typeberry/lib 0.5.3 → 0.5.4-b101fe6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +8 -4
- package/packages/core/hash/hash.d.ts.map +1 -1
- package/packages/core/hash/hash.js +1 -0
- package/packages/core/networking/certificate.d.ts.map +1 -1
- package/packages/core/networking/certificate.js +1 -0
- package/packages/core/networking/package.json +1 -1
- package/packages/core/networking/setup.d.ts.map +1 -1
- package/packages/core/networking/setup.js +16 -12
- package/packages/core/numbers/index.d.ts +4 -0
- package/packages/core/numbers/index.d.ts.map +1 -1
- package/packages/core/numbers/index.js +4 -4
- package/packages/core/pvm-host-calls/host-calls-executor.d.ts +23 -17
- package/packages/core/pvm-host-calls/host-calls-executor.d.ts.map +1 -1
- package/packages/core/pvm-host-calls/host-calls-executor.js +23 -31
- package/packages/core/pvm-interpreter/ops/math-consts.d.ts +2 -3
- package/packages/core/pvm-interpreter/ops/math-consts.d.ts.map +1 -1
- package/packages/core/pvm-interpreter/ops/math-consts.js +2 -3
- package/packages/core/pvm-interpreter/ops/math-ops.js +3 -3
- package/packages/core/pvm-interpreter/ops/math-utils.js +13 -13
- package/packages/core/pvm-interpreter/ops/math-utils.test.js +17 -16
- package/packages/core/telemetry/package.json +1 -1
- package/packages/core/utils/compatibility.d.ts +0 -1
- package/packages/core/utils/compatibility.d.ts.map +1 -1
- package/packages/core/utils/compatibility.js +1 -2
- package/packages/core/utils/compatibility.test.js +6 -10
- package/packages/extensions/ipc/jamnp/handler.d.ts +5 -4
- package/packages/extensions/ipc/jamnp/handler.d.ts.map +1 -1
- package/packages/extensions/ipc/jamnp/handler.js +59 -34
- package/packages/extensions/ipc/jamnp/stream.d.ts +6 -4
- package/packages/extensions/ipc/jamnp/stream.d.ts.map +1 -1
- package/packages/jam/block/work-item.d.ts +13 -4
- package/packages/jam/block/work-item.d.ts.map +1 -1
- package/packages/jam/block/work-package.d.ts +3 -1
- package/packages/jam/block/work-package.d.ts.map +1 -1
- package/packages/jam/block/work-package.js +6 -2
- package/packages/jam/block/work-result.d.ts +3 -5
- package/packages/jam/block/work-result.d.ts.map +1 -1
- package/packages/jam/block/work-result.js +6 -0
- package/packages/jam/block-json/block.d.ts +125 -0
- package/packages/jam/block-json/block.d.ts.map +1 -1
- package/packages/jam/block-json/block.js +9 -2
- package/packages/jam/block-json/work-result.d.ts.map +1 -1
- package/packages/jam/block-json/work-result.js +6 -6
- package/packages/jam/database-lmdb/states.test.js +2 -3
- package/packages/jam/executor/index.d.ts +4 -0
- package/packages/jam/executor/index.d.ts.map +1 -0
- package/packages/jam/executor/index.js +2 -0
- package/packages/jam/{transition/accumulate → executor}/pvm-executor.d.ts +19 -16
- package/packages/jam/executor/pvm-executor.d.ts.map +1 -0
- package/packages/jam/{transition/accumulate → executor}/pvm-executor.js +46 -3
- package/packages/jam/fuzz-proto/v1/handler.d.ts +1 -1
- package/packages/jam/fuzz-proto/v1/handler.d.ts.map +1 -1
- package/packages/jam/fuzz-proto/v1/handler.js +43 -19
- package/packages/jam/in-core/externalities/refine.d.ts +24 -0
- package/packages/jam/in-core/externalities/refine.d.ts.map +1 -0
- package/packages/jam/in-core/externalities/refine.js +36 -0
- package/packages/jam/in-core/in-core.d.ts +60 -0
- package/packages/jam/in-core/in-core.d.ts.map +1 -0
- package/packages/jam/in-core/in-core.js +294 -0
- package/packages/jam/in-core/in-core.test.d.ts +2 -0
- package/packages/jam/in-core/in-core.test.d.ts.map +1 -0
- package/packages/jam/in-core/in-core.test.js +81 -0
- package/packages/jam/in-core/index.d.ts +2 -0
- package/packages/jam/in-core/index.d.ts.map +1 -0
- package/packages/jam/in-core/index.js +1 -0
- package/packages/jam/jam-host-calls/accumulate/bless.d.ts.map +1 -1
- package/packages/jam/jam-host-calls/accumulate/bless.js +6 -10
- package/packages/jam/jam-host-calls/accumulate/bless.test.js +32 -73
- package/packages/jam/jam-host-calls/accumulate/new.d.ts.map +1 -1
- package/packages/jam/jam-host-calls/accumulate/new.js +2 -4
- package/packages/jam/jam-host-calls/accumulate/new.test.js +4 -5
- package/packages/jam/jam-host-calls/general/fetch.d.ts +1 -57
- package/packages/jam/jam-host-calls/general/fetch.d.ts.map +1 -1
- package/packages/jam/jam-host-calls/general/fetch.js +6 -29
- package/packages/jam/jam-host-calls/general/fetch.test.js +2 -58
- package/packages/jam/jamnp-s/peers.d.ts.map +1 -1
- package/packages/jam/jamnp-s/peers.js +10 -0
- package/packages/jam/jamnp-s/protocol/ce-128-block-request.d.ts +1 -1
- package/packages/jam/jamnp-s/protocol/ce-128-block-request.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/ce-128-block-request.js +10 -8
- package/packages/jam/jamnp-s/protocol/ce-129-state-request.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/ce-129-state-request.js +11 -9
- package/packages/jam/jamnp-s/protocol/ce-131-ce-132-safrole-ticket-distribution.d.ts +3 -3
- package/packages/jam/jamnp-s/protocol/ce-131-ce-132-safrole-ticket-distribution.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/ce-131-ce-132-safrole-ticket-distribution.js +2 -2
- package/packages/jam/jamnp-s/protocol/ce-133-work-package-submission.d.ts +5 -5
- package/packages/jam/jamnp-s/protocol/ce-133-work-package-submission.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/ce-133-work-package-submission.js +2 -2
- package/packages/jam/jamnp-s/protocol/ce-134-work-package-sharing.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/ce-134-work-package-sharing.js +8 -6
- package/packages/jam/jamnp-s/protocol/ce-135-work-report-distribution.d.ts +3 -3
- package/packages/jam/jamnp-s/protocol/ce-135-work-report-distribution.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/ce-135-work-report-distribution.js +2 -2
- package/packages/jam/jamnp-s/protocol/ce-135-work-report-distribution.test.js +2 -2
- package/packages/jam/jamnp-s/protocol/stream.d.ts +13 -7
- package/packages/jam/jamnp-s/protocol/stream.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/stream.js +5 -4
- package/packages/jam/jamnp-s/protocol/test-utils.d.ts +1 -1
- package/packages/jam/jamnp-s/protocol/test-utils.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/test-utils.js +9 -12
- package/packages/jam/jamnp-s/protocol/up-0-block-announcement.d.ts +1 -1
- package/packages/jam/jamnp-s/protocol/up-0-block-announcement.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/up-0-block-announcement.js +1 -1
- package/packages/jam/jamnp-s/stream-manager.d.ts.map +1 -1
- package/packages/jam/jamnp-s/stream-manager.js +7 -5
- package/packages/jam/jamnp-s/stream-manager.test.js +8 -5
- package/packages/jam/jamnp-s/tasks/sync.js +1 -1
- package/packages/jam/node/jam-config.d.ts +4 -1
- package/packages/jam/node/jam-config.d.ts.map +1 -1
- package/packages/jam/node/jam-config.js +6 -2
- package/packages/jam/node/main.d.ts.map +1 -1
- package/packages/jam/node/main.js +5 -4
- package/packages/jam/node/package.json +1 -1
- package/packages/jam/rpc-validation/types.d.ts +7 -3
- package/packages/jam/rpc-validation/types.d.ts.map +1 -1
- package/packages/jam/rpc-validation/validation.d.ts +254 -36
- package/packages/jam/rpc-validation/validation.d.ts.map +1 -1
- package/packages/jam/rpc-validation/validation.js +20 -2
- package/packages/jam/state/in-memory-state.d.ts.map +1 -1
- package/packages/jam/state/in-memory-state.js +2 -3
- package/packages/jam/state/privileged-services.d.ts +1 -1
- package/packages/jam/state/privileged-services.d.ts.map +1 -1
- package/packages/jam/state/privileged-services.js +1 -6
- package/packages/jam/state/service.d.ts +1 -1
- package/packages/jam/state/service.d.ts.map +1 -1
- package/packages/jam/state/statistics.d.ts +0 -8
- package/packages/jam/state/statistics.d.ts.map +1 -1
- package/packages/jam/state/statistics.js +14 -44
- package/packages/jam/state/statistics.test.js +1 -8
- package/packages/jam/state/test.utils.d.ts +1 -1
- package/packages/jam/state/test.utils.d.ts.map +1 -1
- package/packages/jam/state/test.utils.js +6 -25
- package/packages/jam/state-json/accounts.d.ts +10 -0
- package/packages/jam/state-json/accounts.d.ts.map +1 -1
- package/packages/jam/state-json/accounts.js +47 -19
- package/packages/jam/state-json/dump.d.ts.map +1 -1
- package/packages/jam/state-json/dump.js +5 -9
- package/packages/jam/state-json/dump.test.js +2 -10
- package/packages/jam/state-json/statistics.d.ts +1 -1
- package/packages/jam/state-json/statistics.d.ts.map +1 -1
- package/packages/jam/state-json/statistics.js +1 -13
- package/packages/jam/state-merkleization/in-memory-state-codec.d.ts +0 -2
- package/packages/jam/state-merkleization/in-memory-state-codec.d.ts.map +1 -1
- package/packages/jam/state-merkleization/serialize.d.ts +4 -4
- package/packages/jam/state-merkleization/serialize.d.ts.map +1 -1
- package/packages/jam/state-merkleization/serialize.js +5 -8
- package/packages/jam/state-merkleization/serialized-state-view.d.ts.map +1 -1
- package/packages/jam/state-merkleization/state-entries.test.js +1 -7
- package/packages/jam/state-vectors/index.d.ts +377 -5
- package/packages/jam/state-vectors/index.d.ts.map +1 -1
- package/packages/jam/state-vectors/index.js +3 -3
- package/packages/jam/transition/accumulate/accumulate-data.d.ts.map +1 -1
- package/packages/jam/transition/accumulate/accumulate-data.js +1 -2
- package/packages/jam/transition/accumulate/accumulate-queue.test.js +2 -2
- package/packages/jam/transition/accumulate/accumulate-state.d.ts +1 -2
- package/packages/jam/transition/accumulate/accumulate-state.d.ts.map +1 -1
- package/packages/jam/transition/accumulate/accumulate-utils.d.ts.map +1 -1
- package/packages/jam/transition/accumulate/accumulate-utils.js +2 -6
- package/packages/jam/transition/accumulate/accumulate-utils.test.js +4 -6
- package/packages/jam/transition/accumulate/accumulate.d.ts.map +1 -1
- package/packages/jam/transition/accumulate/accumulate.js +19 -33
- package/packages/jam/transition/accumulate/accumulate.test.js +2 -2
- package/packages/jam/transition/accumulate/accumulation-result-merge-utils.d.ts.map +1 -1
- package/packages/jam/transition/accumulate/accumulation-result-merge-utils.js +1 -2
- package/packages/jam/transition/accumulate/accumulation-result-merge-utils.test.js +1 -2
- package/packages/jam/transition/accumulate/index.d.ts +0 -1
- package/packages/jam/transition/accumulate/index.d.ts.map +1 -1
- package/packages/jam/transition/accumulate/index.js +0 -1
- package/packages/jam/transition/chain-stf.d.ts +3 -5
- package/packages/jam/transition/chain-stf.d.ts.map +1 -1
- package/packages/jam/transition/chain-stf.js +5 -29
- package/packages/jam/transition/disputes/disputes.test.data2.js +2 -2
- package/packages/jam/transition/externalities/accumulate-externalities.d.ts.map +1 -1
- package/packages/jam/transition/externalities/accumulate-externalities.js +22 -49
- package/packages/jam/transition/externalities/accumulate-externalities.test.js +8 -72
- package/packages/jam/transition/externalities/fetch-externalities.d.ts +8 -21
- package/packages/jam/transition/externalities/fetch-externalities.d.ts.map +1 -1
- package/packages/jam/transition/externalities/fetch-externalities.js +5 -53
- package/packages/jam/transition/externalities/fetch-externalities.test.js +201 -114
- package/packages/jam/transition/hasher.test.js +2 -2
- package/packages/jam/transition/reports/error.d.ts +3 -1
- package/packages/jam/transition/reports/error.d.ts.map +1 -1
- package/packages/jam/transition/reports/error.js +2 -0
- package/packages/jam/transition/reports/test.utils.d.ts.map +1 -1
- package/packages/jam/transition/reports/test.utils.js +2 -2
- package/packages/jam/transition/reports/verify-basic.d.ts.map +1 -1
- package/packages/jam/transition/reports/verify-basic.js +10 -0
- package/packages/jam/transition/reports/verify-basic.test.js +29 -0
- package/packages/jam/transition/statistics.d.ts +0 -7
- package/packages/jam/transition/statistics.d.ts.map +1 -1
- package/packages/jam/transition/statistics.js +2 -11
- package/packages/jam/transition/statistics.test.js +0 -40
- package/packages/workers/block-authorship/main.d.ts.map +1 -1
- package/packages/workers/block-authorship/main.js +23 -4
- package/packages/workers/block-authorship/package.json +1 -1
- package/packages/workers/block-authorship/protocol.d.ts +3 -1
- package/packages/workers/block-authorship/protocol.d.ts.map +1 -1
- package/packages/workers/block-authorship/protocol.js +6 -3
- package/packages/workers/importer/importer.d.ts.map +1 -1
- package/packages/workers/importer/importer.js +0 -1
- package/packages/workers/importer/package.json +1 -1
- package/packages/jam/transition/accumulate/deferred-transfers.d.ts +0 -36
- package/packages/jam/transition/accumulate/deferred-transfers.d.ts.map +0 -1
- package/packages/jam/transition/accumulate/deferred-transfers.js +0 -95
- package/packages/jam/transition/accumulate/pvm-executor.d.ts.map +0 -1
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { codecPerValidator, tryAsServiceGas, } from "#@typeberry/block";
|
|
2
2
|
import { codec } from "#@typeberry/codec";
|
|
3
3
|
import { tryAsU16, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
|
|
4
|
-
import { Compatibility, GpVersion } from "#@typeberry/utils";
|
|
5
4
|
import { codecPerCore } from "./common.js";
|
|
6
|
-
import { ignoreValueWithDefault } from "./service.js";
|
|
7
5
|
/**
|
|
8
6
|
* Activity Record of a single validator.
|
|
9
7
|
*
|
|
@@ -134,42 +132,20 @@ export class ServiceStatistics {
|
|
|
134
132
|
extrinsicCount;
|
|
135
133
|
accumulateCount;
|
|
136
134
|
accumulateGasUsed;
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
exports: codecVarU16,
|
|
149
|
-
accumulateCount: codec.varU32,
|
|
150
|
-
accumulateGasUsed: codecVarGas,
|
|
151
|
-
onTransfersCount: codec.varU32,
|
|
152
|
-
onTransfersGasUsed: codecVarGas,
|
|
153
|
-
}),
|
|
154
|
-
versions: {
|
|
155
|
-
[GpVersion.V0_7_1]: codec.Class(ServiceStatistics, {
|
|
156
|
-
providedCount: codecVarU16,
|
|
157
|
-
providedSize: codec.varU32,
|
|
158
|
-
refinementCount: codec.varU32,
|
|
159
|
-
refinementGasUsed: codecVarGas,
|
|
160
|
-
imports: codecVarU16,
|
|
161
|
-
extrinsicCount: codecVarU16,
|
|
162
|
-
extrinsicSize: codec.varU32,
|
|
163
|
-
exports: codecVarU16,
|
|
164
|
-
accumulateCount: codec.varU32,
|
|
165
|
-
accumulateGasUsed: codecVarGas,
|
|
166
|
-
onTransfersCount: ignoreValueWithDefault(tryAsU32(0)),
|
|
167
|
-
onTransfersGasUsed: ignoreValueWithDefault(tryAsServiceGas(0)),
|
|
168
|
-
}),
|
|
169
|
-
},
|
|
135
|
+
static Codec = codec.Class(ServiceStatistics, {
|
|
136
|
+
providedCount: codecVarU16,
|
|
137
|
+
providedSize: codec.varU32,
|
|
138
|
+
refinementCount: codec.varU32,
|
|
139
|
+
refinementGasUsed: codecVarGas,
|
|
140
|
+
imports: codecVarU16,
|
|
141
|
+
extrinsicCount: codecVarU16,
|
|
142
|
+
extrinsicSize: codec.varU32,
|
|
143
|
+
exports: codecVarU16,
|
|
144
|
+
accumulateCount: codec.varU32,
|
|
145
|
+
accumulateGasUsed: codecVarGas,
|
|
170
146
|
});
|
|
171
147
|
static create(v) {
|
|
172
|
-
return new ServiceStatistics(v.providedCount, v.providedSize, v.refinementCount, v.refinementGasUsed, v.imports, v.exports, v.extrinsicSize, v.extrinsicCount, v.accumulateCount, v.accumulateGasUsed
|
|
148
|
+
return new ServiceStatistics(v.providedCount, v.providedSize, v.refinementCount, v.refinementGasUsed, v.imports, v.exports, v.extrinsicSize, v.extrinsicCount, v.accumulateCount, v.accumulateGasUsed);
|
|
173
149
|
}
|
|
174
150
|
constructor(
|
|
175
151
|
/** `p.0` */
|
|
@@ -191,11 +167,7 @@ export class ServiceStatistics {
|
|
|
191
167
|
/** `a.0` */
|
|
192
168
|
accumulateCount,
|
|
193
169
|
/** `a.1` */
|
|
194
|
-
accumulateGasUsed
|
|
195
|
-
/** `t.0` @deprecated since 0.7.1 */
|
|
196
|
-
onTransfersCount,
|
|
197
|
-
/** `t.1` @deprecated since 0.7.1 */
|
|
198
|
-
onTransfersGasUsed) {
|
|
170
|
+
accumulateGasUsed) {
|
|
199
171
|
this.providedCount = providedCount;
|
|
200
172
|
this.providedSize = providedSize;
|
|
201
173
|
this.refinementCount = refinementCount;
|
|
@@ -206,14 +178,12 @@ export class ServiceStatistics {
|
|
|
206
178
|
this.extrinsicCount = extrinsicCount;
|
|
207
179
|
this.accumulateCount = accumulateCount;
|
|
208
180
|
this.accumulateGasUsed = accumulateGasUsed;
|
|
209
|
-
this.onTransfersCount = onTransfersCount;
|
|
210
|
-
this.onTransfersGasUsed = onTransfersGasUsed;
|
|
211
181
|
}
|
|
212
182
|
static empty() {
|
|
213
183
|
const zero = tryAsU32(0);
|
|
214
184
|
const zero16 = tryAsU16(0);
|
|
215
185
|
const zeroGas = tryAsServiceGas(0);
|
|
216
|
-
return new ServiceStatistics(zero16, zero, zero, zeroGas, zero16, zero16, zero, zero16, zero, zeroGas
|
|
186
|
+
return new ServiceStatistics(zero16, zero, zero, zeroGas, zero16, zero16, zero, zero16, zero, zeroGas);
|
|
217
187
|
}
|
|
218
188
|
}
|
|
219
189
|
/** `pi`: Statistics of each validator, cores statistics and services statistics. */
|
|
@@ -2,16 +2,9 @@ import { describe, it } from "node:test";
|
|
|
2
2
|
import { BytesBlob } from "#@typeberry/bytes";
|
|
3
3
|
import { Decoder } from "#@typeberry/codec";
|
|
4
4
|
import { tinyChainSpec } from "#@typeberry/config";
|
|
5
|
-
import { Compatibility, GpVersion } from "#@typeberry/utils";
|
|
6
5
|
import { StatisticsData } from "./statistics.js";
|
|
7
6
|
describe("Statistics", () => {
|
|
8
|
-
const STATISTICS =
|
|
9
|
-
fallback: "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e0000000000000000000100000000000001000000000000000000",
|
|
10
|
-
versions: {
|
|
11
|
-
// varu32 for serviceid + no onTransfer
|
|
12
|
-
[GpVersion.V0_7_1]: "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e000000000000000000010000000000000100000000000000",
|
|
13
|
-
},
|
|
14
|
-
});
|
|
7
|
+
const STATISTICS = "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e000000000000000000010000000000000100000000000000";
|
|
15
8
|
it("should decode statistics data with no error", () => {
|
|
16
9
|
Decoder.decodeObject(StatisticsData.Codec, BytesBlob.parseBlob(STATISTICS), tinyChainSpec);
|
|
17
10
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { InMemoryState } from "./index.js";
|
|
2
2
|
export declare const testState: () => InMemoryState;
|
|
3
|
-
export declare const TEST_STATE_ROOT
|
|
3
|
+
export declare const TEST_STATE_ROOT = "0x6bf5545f35877d3c3f7066287daf2c96a37e22cab92426b188e2afd38ec87a9a";
|
|
4
4
|
export declare const TEST_STATE: string[][];
|
|
5
5
|
//# sourceMappingURL=test.utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.utils.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state/test.utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"test.utils.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state/test.utils.ts"],"names":[],"mappings":"AAmBA,OAAO,EAUL,aAAa,EAYd,MAAM,YAAY,CAAC;AAKpB,eAAO,MAAM,SAAS,QAAO,aAuT5B,CAAC;AAqCF,eAAO,MAAM,eAAe,uEAAuE,CAAC;AAEpG,eAAO,MAAM,UAAU,YAsGtB,CAAC"}
|
|
@@ -6,9 +6,7 @@ import { asKnownSize, FixedSizeArray, HashDictionary, HashSet, SortedArray, Sort
|
|
|
6
6
|
import { tinyChainSpec } from "#@typeberry/config";
|
|
7
7
|
import { BANDERSNATCH_RING_ROOT_BYTES } from "#@typeberry/crypto/bandersnatch.js";
|
|
8
8
|
import { HASH_SIZE } from "#@typeberry/hash";
|
|
9
|
-
import { tryAsU16, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
|
|
10
|
-
import { MAX_VALUE } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
|
|
11
|
-
import { Compatibility, GpVersion } from "#@typeberry/utils";
|
|
9
|
+
import { MAX_VALUE_U32, tryAsU16, tryAsU32, tryAsU64 } from "#@typeberry/numbers";
|
|
12
10
|
import { AUTHORIZATION_QUEUE_SIZE, AvailabilityAssignment, accumulationOutputComparator, BlockState, CoreStatistics, DisputesRecords, ENTROPY_ENTRIES, hashComparator, InMemoryService, InMemoryState, LookupHistoryItem, PreimageItem, PrivilegedServices, RecentBlocks, SafroleSealingKeysData, ServiceAccountInfo, ServiceStatistics, StatisticsData, tryAsPerCore, ValidatorData, ValidatorStatistics, } from "./index.js";
|
|
13
11
|
const spec = tinyChainSpec;
|
|
14
12
|
// based on jamduna/assurances/state_snapshots/1_004.json
|
|
@@ -188,8 +186,6 @@ export const testState = () => {
|
|
|
188
186
|
refinementGasUsed: tryAsServiceGas(0),
|
|
189
187
|
accumulateCount: tryAsU32(0),
|
|
190
188
|
accumulateGasUsed: tryAsServiceGas(0),
|
|
191
|
-
onTransfersCount: tryAsU32(0),
|
|
192
|
-
onTransfersGasUsed: tryAsServiceGas(0),
|
|
193
189
|
}),
|
|
194
190
|
],
|
|
195
191
|
]),
|
|
@@ -271,7 +267,7 @@ export const testState = () => {
|
|
|
271
267
|
manager: tryAsServiceId(0),
|
|
272
268
|
assigners: tryAsPerCore(new Array(spec.coresCount).fill(tryAsServiceId(0)), spec),
|
|
273
269
|
delegator: tryAsServiceId(0),
|
|
274
|
-
registrar: tryAsServiceId(
|
|
270
|
+
registrar: tryAsServiceId(MAX_VALUE_U32),
|
|
275
271
|
autoAccumulateServices: new Map(),
|
|
276
272
|
}),
|
|
277
273
|
});
|
|
@@ -296,12 +292,7 @@ const testValidatorData = () => Decoder.decodeObject(codecPerValidator(Validator
|
|
|
296
292
|
const TEST_AVAILABILITY_ASSIGNMENT = "0xac9928d4eb0c942a07c40157fa4498b2efbbc65136819517dc94d50ff2ca9f490e010000ebb6b040a0ea039a8f9593e3a4b29005b1ebea1c5465c2753db1031a3ef30c85000000000000000000000000000000000000000000000000000000000000000000001a7d753af2e2be12f88dfcb7ca5c704641534094b061c8c3aa258d4b0acbf5c85e8f73cf5d9f94cb3a8313361a3b48e97968a9ac52ab9c29b4e88f4159c21560ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb53a31fd60656cb3de2c6ba9fafb8dee8d4c45d4bc87ca248cdda7625a68b987fb0e00000000000b27478648cd19b4f812f897a26976ecf312eac28508b4368d0c63ea949c7cb0000000010000000015f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf49795081584796f4f11ace690fc5a5bdb847db1e63cb36c97ef8f90f067a0846b654bf1c294260000000000000024ccbea4bf12716bc7f7583dd834aac2ca1b05af8dc5be285336156d0de73d9b9e20620000000000000010000000";
|
|
297
293
|
const TEST_VALIDATOR_DATA = "0x5e465beb01dbafe160ce8216047f2155dd0569f058afd52dcea601025a8d161d3b6a27bcceb6a42d62a3a8d02a6f0d73653215771de243a63ac048a18b59da29b27150a1f1cd24bccc792ba7ba4220a1e8c36636e35a969d1d14b4c89bce7d1d463474fb186114a89dd70e88506fefc9830756c27a7845bec1cb6ee31e07211afd0dde34f0dc5d89231993cd323973faa23d84d521fd574e840b8617c75d1a1d0102aa3c71999137001a77464ced6bb2885c460be760c709009e26395716a52c8c52e6e23906a455b4264e7d0c75466e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003d5e5a51aab2b048f8686ecd79712a80e3265a114cc73f14bdb2a59233fb66d022351e22105a19aabb42589162ad7f1ea0df1c25cebf0e4a9fcd261301274862a2534be5b2f761dc898160a9b4762eb46bd171222f6cdf87f5127a9e8970a54c44fe7b2e12dda098854a9aaab03c3a47953085668673a84b0cedb4b0391ed6ae2deb1c3e04f0bc618a2bc1287d8599e8a1c47ff715cd4cbd3fe80e2607744d4514b491ed2ef76ae114ecb1af99ba6af32189bf0471c06aa3e6acdaf82e7a959cb24a5c1444cac3a6678f5182459fd8ce0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aa2b95f7572875b0d0f186552ae745ba8222fc0b5bd456554bfe51c68938f8bce68e0cf7f26c59f963b5846202d2327cc8bc0c4eff8cb9abd4012f9a71decf008faee314528448651e50bea6d2e7e5d3176698fea0b932405a4ec0a19775e72325e44a6d28f99fba887e04eb818f13d1b73f75f0161644283df61e7fbaad7713fae0ef79fe92499202834c97f512d744515a57971badf2df62e23697e9fe347f168fed0adb9ace131f49bbd500a324e2469569423f37c5d3b430990204ae17b383fcd582cb864168c8b46be8d779e7ca00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007f6190116d118d643a98878e294ccf62b509e214299931aad8ff9764181a4e33b3e0e096b02e2ec98a3441410aeddd78c95e27a0da6f411a09c631c0f2bea6e98dfdac3e2f604ecda637e4969a139ceb70c534bd5edc4210eb5ac71178c1d62f0c977197a2c6a9e8ada6a14395bc9aa3a384d35f40c3493e20cb7efaa799f66d1cedd5b2928f8e34438b07072bbae404d7dfcee3f457f9103173805ee163ba550854e4660ccec49e25fafdb00e6adfbc8e875de1a9541e1721e956b972ef2b135cc7f71682615e12bb7d6acd353d7681000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000048e5fcdce10e0b64ec4eebd0d9211c7bac2f27ce54bca6f7776ff6fee86ab3e35c7f34a4bd4f2d04076a8c6f9060a0c8d2c6bdd082ceb3eda7df381cb260faffb78a95d81f6c7cdc517a36d81191b6f7718dcf44e76c0ce9fb724d3aea39fdb3c5f4ee31eb1f45e55b783b687b1e9087b092a18341c7cda102b4100685b0a014d55f1ccdb7600ec0db14bb90f7fc3126dc2625945bb44f302fc80df0c225546c06fa1952ef05bdc83ceb7a23373de0637cd9914272e3e3d1a455db6c48cc6b2b2c17e1dcf7cd1586a235821308aee0010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f16e5352840afb47e206b5c89f560f2611835855cf2e6ebad1acc9520a72591d837ce344bc9defceb0d7de7e9e9925096768b7adb4dad932e532eb6551e0ea02b0b9121622bf8a9a9e811ee926740a876dd0d9036f2f3060ebfab0c7c489a338a7728ee2da4a265696edcc389fe02b2caf20b5b83aeb64aaf4184bedf127f4eea1d737875854411d58ca4a2b69b066b0a0c09d2a0b7121ade517687c51954df913fe930c227723dd8f58aa2415946044dc3fb15c367a2185d0fc1f7d2bb102ff14a230d5f81cfc8ad445e51efddbf4260000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
|
|
298
294
|
// from post state of jamduna/assurances/1_004.json
|
|
299
|
-
export const TEST_STATE_ROOT =
|
|
300
|
-
fallback: "0xa48088ed900219e5115670c1dff1ae69396b8ca152f6a3d279d770114c458059",
|
|
301
|
-
versions: {
|
|
302
|
-
[GpVersion.V0_7_1]: "0x6bf5545f35877d3c3f7066287daf2c96a37e22cab92426b188e2afd38ec87a9a",
|
|
303
|
-
},
|
|
304
|
-
});
|
|
295
|
+
export const TEST_STATE_ROOT = "0x6bf5545f35877d3c3f7066287daf2c96a37e22cab92426b188e2afd38ec87a9a";
|
|
305
296
|
export const TEST_STATE = [
|
|
306
297
|
[
|
|
307
298
|
"0x00c20098009400262ddad30703d028b614fe7572b765190496015086af3580e0",
|
|
@@ -385,21 +376,13 @@ export const TEST_STATE = [
|
|
|
385
376
|
["0x0b00000000000000000000000000000000000000000000000000000000000000", "0x10000000", "c11", ""],
|
|
386
377
|
[
|
|
387
378
|
"0x0c00000000000000000000000000000000000000000000000000000000000000",
|
|
388
|
-
|
|
389
|
-
? "0x00000000000000000000000000000000ffffffff00"
|
|
390
|
-
: "0x0000000000000000000000000000000000",
|
|
379
|
+
"0x00000000000000000000000000000000ffffffff00",
|
|
391
380
|
"c12",
|
|
392
381
|
"",
|
|
393
382
|
],
|
|
394
383
|
[
|
|
395
384
|
"0x0d00000000000000000000000000000000000000000000000000000000000000",
|
|
396
|
-
|
|
397
|
-
fallback: "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e0000000000000000000100000000000001000000000000000000",
|
|
398
|
-
versions: {
|
|
399
|
-
// varu32 for serviceid + no onTransfer
|
|
400
|
-
[GpVersion.V0_7_1]: "0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e000000000000000000010000000000000100000000000000",
|
|
401
|
-
},
|
|
402
|
-
}),
|
|
385
|
+
"0x010000000300000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000100000000000000030000000600000000000000000000000000000000000000010000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000810e000000000000000000010000000000000100000000000000",
|
|
403
386
|
"c13",
|
|
404
387
|
"",
|
|
405
388
|
],
|
|
@@ -408,9 +391,7 @@ export const TEST_STATE = [
|
|
|
408
391
|
["0x1000000000000000000000000000000000000000000000000000000000000000", "0x00", "c16", ""],
|
|
409
392
|
[
|
|
410
393
|
"0xff00000000000000000000000000000000000000000000000000000000000000",
|
|
411
|
-
|
|
412
|
-
? "0x0015f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf49795081500e40b54020000006400000000000000640000000000000010050000000000000004000000000000040000000a0000000f00000001000000"
|
|
413
|
-
: "0x15f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf49795081500e40b54020000006400000000000000640000000000000010050000000000000004000000000000040000000a0000000f00000001000000",
|
|
394
|
+
"0x0015f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf49795081500e40b54020000006400000000000000640000000000000010050000000000000004000000000000040000000a0000000f00000001000000",
|
|
414
395
|
"service_account",
|
|
415
396
|
"s=0|c=0x15f8485e3a88e86182e63280720d5ec9892578f0e577fb1bcdda5cf497950815 b=10000000000 g=100 m=100 l=1296 f=1024 i=4 r=10 a=15 p=1|clen=32",
|
|
416
397
|
],
|
|
@@ -16,6 +16,16 @@ declare class JsonStorageItem {
|
|
|
16
16
|
value: BytesBlob;
|
|
17
17
|
}
|
|
18
18
|
export declare class JsonService {
|
|
19
|
+
static fromJson: import("@typeberry/json-parser").FromJsonWithParser<unknown, InMemoryService>;
|
|
20
|
+
id: ServiceId;
|
|
21
|
+
data: {
|
|
22
|
+
service: ServiceAccountInfo;
|
|
23
|
+
storage?: JsonStorageItem[];
|
|
24
|
+
preimage_blobs?: JsonPreimageItem[];
|
|
25
|
+
preimage_requests?: LookupHistoryItem[];
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
export declare class JsonServicePre072 {
|
|
19
29
|
static fromJson: import("@typeberry/json-parser").FromJsonWithParser<unknown, InMemoryService>;
|
|
20
30
|
id: ServiceId;
|
|
21
31
|
data: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAKf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EACL,eAAe,EACf,iBAAiB,EAEjB,YAAY,EACZ,kBAAkB,EAGnB,MAAM,kBAAkB,CAAC;AA0D1B,cAAM,gBAAgB;IACpB,MAAM,CAAC,QAAQ,6EAMb;IAEF,IAAI,EAAG,YAAY,CAAC;IACpB,IAAI,EAAG,SAAS,CAAC;CAClB;AAED,cAAM,eAAe;IACnB,MAAM,CAAC,QAAQ;;;MAGb;IAEF,GAAG,EAAG,SAAS,CAAC;IAChB,KAAK,EAAG,SAAS,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/accounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,SAAS,EAKf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EACL,eAAe,EACf,iBAAiB,EAEjB,YAAY,EACZ,kBAAkB,EAGnB,MAAM,kBAAkB,CAAC;AA0D1B,cAAM,gBAAgB;IACpB,MAAM,CAAC,QAAQ,6EAMb;IAEF,IAAI,EAAG,YAAY,CAAC;IACpB,IAAI,EAAG,SAAS,CAAC;CAClB;AAED,cAAM,eAAe;IACnB,MAAM,CAAC,QAAQ;;;MAGb;IAEF,GAAG,EAAG,SAAS,CAAC;IAChB,KAAK,EAAG,SAAS,CAAC;CACnB;AAqBD,qBAAa,WAAW;IACtB,MAAM,CAAC,QAAQ,gFAuCb;IAEF,EAAE,EAAG,SAAS,CAAC;IACf,IAAI,EAAG;QACL,OAAO,EAAE,kBAAkB,CAAC;QAC5B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;QAC5B,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACpC,iBAAiB,CAAC,EAAE,iBAAiB,EAAE,CAAC;KACzC,CAAC;CACH;AAeD,qBAAa,iBAAiB;IAC5B,MAAM,CAAC,QAAQ,gFA0Cb;IAEF,EAAE,EAAG,SAAS,CAAC;IACf,IAAI,EAAG;QACL,OAAO,EAAE,kBAAkB,CAAC;QAC5B,SAAS,CAAC,EAAE,gBAAgB,EAAE,CAAC;QAC/B,OAAO,CAAC,EAAE,eAAe,EAAE,CAAC;QAC5B,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;QAClC,cAAc,CAAC,EAAE,gBAAgB,EAAE,CAAC;QACpC,gBAAgB,CAAC,EAAE,iBAAiB,EAAE,CAAC;KACxC,CAAC;CACH"}
|
|
@@ -5,10 +5,10 @@ import { HashDictionary } from "#@typeberry/collections";
|
|
|
5
5
|
import { json } from "#@typeberry/json-parser";
|
|
6
6
|
import { tryAsU32, tryAsU64 } from "#@typeberry/numbers";
|
|
7
7
|
import { InMemoryService, LookupHistoryItem, PreimageItem, ServiceAccountInfo, StorageItem, } from "#@typeberry/state";
|
|
8
|
-
import { asOpaqueType
|
|
8
|
+
import { asOpaqueType } from "#@typeberry/utils";
|
|
9
9
|
class JsonServiceInfo {
|
|
10
10
|
static fromJson = json.object({
|
|
11
|
-
|
|
11
|
+
version: "number",
|
|
12
12
|
code_hash: fromJson.bytes32(),
|
|
13
13
|
balance: json.fromNumber((x) => tryAsU64(x)),
|
|
14
14
|
min_item_gas: json.fromNumber((x) => tryAsServiceGas(x)),
|
|
@@ -61,33 +61,61 @@ class JsonStorageItem {
|
|
|
61
61
|
key;
|
|
62
62
|
value;
|
|
63
63
|
}
|
|
64
|
-
const
|
|
64
|
+
const preimageStatusFromJson = json.object({
|
|
65
65
|
key: {
|
|
66
66
|
hash: fromJson.bytes32(),
|
|
67
67
|
length: "number",
|
|
68
68
|
},
|
|
69
69
|
value: json.array("number"),
|
|
70
|
-
}, ({ key, value }) => new LookupHistoryItem(key.hash, key.length, value));
|
|
71
|
-
|
|
70
|
+
}, ({ key, value }) => new LookupHistoryItem(key.hash, tryAsU32(key.length), value));
|
|
71
|
+
export class JsonService {
|
|
72
|
+
static fromJson = json.object({
|
|
73
|
+
id: "number",
|
|
74
|
+
data: {
|
|
75
|
+
service: JsonServiceInfo.fromJson,
|
|
76
|
+
storage: json.optional(json.array(JsonStorageItem.fromJson)),
|
|
77
|
+
preimage_blobs: json.optional(json.array(JsonPreimageItem.fromJson)),
|
|
78
|
+
preimage_requests: json.optional(json.array(preimageStatusFromJson)),
|
|
79
|
+
},
|
|
80
|
+
}, ({ id, data }) => {
|
|
81
|
+
const preimages = HashDictionary.fromEntries((data.preimage_blobs ?? []).map((x) => [x.hash, x]));
|
|
82
|
+
const lookupHistory = HashDictionary.new();
|
|
83
|
+
for (const item of data.preimage_requests ?? []) {
|
|
84
|
+
const data = lookupHistory.get(item.hash) ?? [];
|
|
85
|
+
data.push(item);
|
|
86
|
+
lookupHistory.set(item.hash, data);
|
|
87
|
+
}
|
|
88
|
+
const storage = new Map();
|
|
89
|
+
const entries = (data.storage ?? []).map(({ key, value }) => {
|
|
90
|
+
const opaqueKey = asOpaqueType(key);
|
|
91
|
+
return [opaqueKey, StorageItem.create({ key: opaqueKey, value })];
|
|
92
|
+
});
|
|
93
|
+
for (const [key, item] of entries) {
|
|
94
|
+
storage.set(key.toString(), item);
|
|
95
|
+
}
|
|
96
|
+
return new InMemoryService(id, {
|
|
97
|
+
info: data.service,
|
|
98
|
+
preimages,
|
|
99
|
+
storage,
|
|
100
|
+
lookupHistory,
|
|
101
|
+
});
|
|
102
|
+
});
|
|
103
|
+
id;
|
|
104
|
+
data;
|
|
105
|
+
}
|
|
106
|
+
const preimageStatusFromJson072 = json.object({
|
|
72
107
|
hash: fromJson.bytes32(),
|
|
73
108
|
status: json.array("number"),
|
|
74
109
|
}, ({ hash, status }) => new LookupHistoryItem(hash, tryAsU32(0), status));
|
|
75
|
-
export class
|
|
110
|
+
export class JsonServicePre072 {
|
|
76
111
|
static fromJson = json.object({
|
|
77
112
|
id: "number",
|
|
78
|
-
data:
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}
|
|
85
|
-
: {
|
|
86
|
-
service: JsonServiceInfo.fromJson,
|
|
87
|
-
preimages: json.optional(json.array(JsonPreimageItem.fromJson)),
|
|
88
|
-
storage: json.optional(json.array(JsonStorageItem.fromJson)),
|
|
89
|
-
lookup_meta: json.optional(json.array(lookupMetaFromJson)),
|
|
90
|
-
},
|
|
113
|
+
data: {
|
|
114
|
+
service: JsonServiceInfo.fromJson,
|
|
115
|
+
storage: json.optional(json.array(JsonStorageItem.fromJson)),
|
|
116
|
+
preimages_blob: json.optional(json.array(JsonPreimageItem.fromJson)),
|
|
117
|
+
preimages_status: json.optional(json.array(preimageStatusFromJson072)),
|
|
118
|
+
},
|
|
91
119
|
}, ({ id, data }) => {
|
|
92
120
|
const preimages = HashDictionary.fromEntries((data.preimages ?? data.preimages_blob ?? []).map((x) => [x.hash, x]));
|
|
93
121
|
const lookupHistory = HashDictionary.new();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/dump.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dump.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/dump.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAGnD,OAAO,EAKL,aAAa,EAMd,MAAM,kBAAkB,CAAC;AA2C1B,eAAO,MAAM,qBAAqB,GAAI,MAAM,SAAS,gFAwGlD,CAAC"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { tryAsPerEpochBlock, tryAsServiceGas
|
|
1
|
+
import { tryAsPerEpochBlock, tryAsServiceGas } from "#@typeberry/block";
|
|
2
2
|
import { fromJson } from "#@typeberry/block-json";
|
|
3
3
|
import { Bytes } from "#@typeberry/bytes";
|
|
4
4
|
import { asKnownSize, HashSet, SortedArray } from "#@typeberry/collections";
|
|
5
5
|
import { BANDERSNATCH_RING_ROOT_BYTES } from "#@typeberry/crypto/bandersnatch.js";
|
|
6
6
|
import { json } from "#@typeberry/json-parser";
|
|
7
7
|
import { AUTHORIZATION_QUEUE_SIZE, accumulationOutputComparator, InMemoryState, MAX_AUTH_POOL_SIZE, PrivilegedServices, RecentBlocks, tryAsPerCore, } from "#@typeberry/state";
|
|
8
|
-
import {
|
|
9
|
-
import { JsonService } from "./accounts.js";
|
|
8
|
+
import { JsonServicePre072 } from "./accounts.js";
|
|
10
9
|
import { accumulationOutput } from "./accumulation-output.js";
|
|
11
10
|
import { availabilityAssignmentFromJson } from "./availability-assignment.js";
|
|
12
11
|
import { disputesRecordsFromJson } from "./disputes.js";
|
|
@@ -36,18 +35,15 @@ export const fullStateDumpFromJson = (spec) => json.object({
|
|
|
36
35
|
chi_m: "number",
|
|
37
36
|
chi_a: json.array("number"),
|
|
38
37
|
chi_v: "number",
|
|
39
|
-
chi_r:
|
|
38
|
+
chi_r: "number",
|
|
40
39
|
chi_g: json.nullable(json.map("number", json.fromNumber((v) => tryAsServiceGas(v)))),
|
|
41
40
|
},
|
|
42
41
|
pi: JsonStatisticsData.fromJson,
|
|
43
42
|
omega: json.array(json.array(notYetAccumulatedFromJson)),
|
|
44
43
|
xi: json.array(json.array(fromJson.bytes32())),
|
|
45
44
|
theta: json.nullable(json.array(accumulationOutput)),
|
|
46
|
-
accounts: json.array(
|
|
45
|
+
accounts: json.array(JsonServicePre072.fromJson),
|
|
47
46
|
}, ({ alpha, varphi, beta, gamma, psi, eta, iota, kappa, lambda, rho, tau, chi, pi, omega, xi, theta, accounts, }) => {
|
|
48
|
-
if (Compatibility.isGreaterOrEqual(GpVersion.V0_7_1) && chi.chi_r === undefined) {
|
|
49
|
-
throw new Error("Registrar is required in Privileges GP ^0.7.1");
|
|
50
|
-
}
|
|
51
47
|
return InMemoryState.new(spec, {
|
|
52
48
|
authPools: tryAsPerCore(alpha.map((perCore) => {
|
|
53
49
|
if (perCore.length > MAX_AUTH_POOL_SIZE) {
|
|
@@ -77,7 +73,7 @@ export const fullStateDumpFromJson = (spec) => json.object({
|
|
|
77
73
|
manager: chi.chi_m,
|
|
78
74
|
assigners: chi.chi_a,
|
|
79
75
|
delegator: chi.chi_v,
|
|
80
|
-
registrar: chi.chi_r
|
|
76
|
+
registrar: chi.chi_r,
|
|
81
77
|
autoAccumulateServices: chi.chi_g ?? new Map(),
|
|
82
78
|
}),
|
|
83
79
|
statistics: JsonStatisticsData.toStatisticsData(spec, pi),
|
|
@@ -4,7 +4,6 @@ import { tinyChainSpec } from "#@typeberry/config";
|
|
|
4
4
|
import { Blake2b } from "#@typeberry/hash";
|
|
5
5
|
import { parseFromJson } from "#@typeberry/json-parser";
|
|
6
6
|
import { StateEntries } from "#@typeberry/state-merkleization";
|
|
7
|
-
import { Compatibility, GpVersion } from "#@typeberry/utils";
|
|
8
7
|
import { fullStateDumpFromJson } from "./dump.js";
|
|
9
8
|
let blake2b;
|
|
10
9
|
before(async () => {
|
|
@@ -13,19 +12,12 @@ before(async () => {
|
|
|
13
12
|
describe("JSON state dump", () => {
|
|
14
13
|
it("should load full JSON state dump", async () => {
|
|
15
14
|
const spec = tinyChainSpec;
|
|
16
|
-
const dumpFile =
|
|
17
|
-
? "./dump-071.example.json"
|
|
18
|
-
: "./dump.example.json";
|
|
15
|
+
const dumpFile = "./dump.example.json";
|
|
19
16
|
const testState = await import(dumpFile);
|
|
20
17
|
const fromJson = fullStateDumpFromJson(spec);
|
|
21
18
|
const parsedState = parseFromJson(testState.default, fromJson);
|
|
22
19
|
const rootHash = StateEntries.serializeInMemory(spec, blake2b, parsedState).getRootHash(blake2b);
|
|
23
|
-
const expectedRoot =
|
|
24
|
-
fallback: "0xf0c62b7961a17dba89a886c17dc881d7fb9e230f2cbf62316f2123a7fdbcfad5",
|
|
25
|
-
versions: {
|
|
26
|
-
[GpVersion.V0_7_1]: "0xeab8f2d4aebacd4ddcb73d8b5a388e5723aff1d2bc3f4aab40e931addf1862dc",
|
|
27
|
-
},
|
|
28
|
-
});
|
|
20
|
+
const expectedRoot = "0xeab8f2d4aebacd4ddcb73d8b5a388e5723aff1d2bc3f4aab40e931addf1862dc";
|
|
29
21
|
strictEqual(rootHash.toString(), expectedRoot);
|
|
30
22
|
});
|
|
31
23
|
});
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type ServiceGas, type ServiceId } from "#@typeberry/block";
|
|
2
2
|
import type { ChainSpec } from "#@typeberry/config";
|
|
3
3
|
import { type FromJson } from "#@typeberry/json-parser";
|
|
4
|
-
import {
|
|
4
|
+
import type { U16, U32 } from "#@typeberry/numbers";
|
|
5
5
|
import { CoreStatistics, ServiceStatistics, StatisticsData, ValidatorStatistics } from "#@typeberry/state";
|
|
6
6
|
export declare class JsonValidatorStatistics {
|
|
7
7
|
static fromJson: import("@typeberry/json-parser").FromJsonWithParser<unknown, ValidatorStatistics>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statistics.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/statistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAsC,MAAM,kBAAkB,CAAC;AACvG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,EAAQ,MAAM,wBAAwB,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"statistics.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-json/statistics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAsC,MAAM,kBAAkB,CAAC;AACvG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,KAAK,QAAQ,EAAQ,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAgB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAExH,qBAAa,uBAAuB;IAClC,MAAM,CAAC,QAAQ,oFAmBb;IAEF,MAAM,EAAG,GAAG,CAAC;IACb,OAAO,EAAG,GAAG,CAAC;IACd,UAAU,EAAG,GAAG,CAAC;IACjB,eAAe,EAAG,GAAG,CAAC;IACtB,UAAU,EAAG,GAAG,CAAC;IACjB,UAAU,EAAG,GAAG,CAAC;CAClB;AAED,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,+EAuBb;IAEF,OAAO,EAAG,GAAG,CAAC;IACd,UAAU,EAAG,GAAG,CAAC;IACjB,OAAO,EAAG,GAAG,CAAC;IACd,OAAO,EAAG,GAAG,CAAC;IACd,cAAc,EAAG,GAAG,CAAC;IACrB,eAAe,EAAG,GAAG,CAAC;IACtB,WAAW,EAAG,GAAG,CAAC;IAClB,QAAQ,EAAG,UAAU,CAAC;CACvB;AAuDD,MAAM,MAAM,sBAAsB,GAAG;IACnC,EAAE,EAAE,SAAS,CAAC;IACd,MAAM,EAAE,iBAAiB,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,sBAAsB,CAG3E,CAAC;AAEF,qBAAa,kBAAkB;IAC7B,YAAY,EAAG,mBAAmB,EAAE,CAAC;IACrC,SAAS,EAAG,mBAAmB,EAAE,CAAC;IAClC,KAAK,EAAG,cAAc,EAAE,GAAG,IAAI,CAAC;IAChC,QAAQ,EAAG,sBAAsB,EAAE,GAAG,IAAI,CAAC;IAE3C,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAK3C;IAEF,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,kBAAkB;CAcxE"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { tryAsPerValidator, tryAsServiceGas } from "#@typeberry/block";
|
|
2
2
|
import { json } from "#@typeberry/json-parser";
|
|
3
|
-
import { tryAsU32 } from "#@typeberry/numbers";
|
|
4
3
|
import { CoreStatistics, ServiceStatistics, StatisticsData, tryAsPerCore, ValidatorStatistics } from "#@typeberry/state";
|
|
5
|
-
import { Compatibility, GpVersion } from "#@typeberry/utils";
|
|
6
4
|
export class JsonValidatorStatistics {
|
|
7
5
|
static fromJson = json.object({
|
|
8
6
|
blocks: "number",
|
|
@@ -71,13 +69,7 @@ class JsonServiceStatistics {
|
|
|
71
69
|
extrinsic_count: "number",
|
|
72
70
|
accumulate_count: "number",
|
|
73
71
|
accumulate_gas_used: json.fromBigInt(tryAsServiceGas),
|
|
74
|
-
|
|
75
|
-
? {}
|
|
76
|
-
: {
|
|
77
|
-
on_transfers_count: "number",
|
|
78
|
-
on_transfers_gas_used: json.fromBigInt(tryAsServiceGas),
|
|
79
|
-
}),
|
|
80
|
-
}, ({ provided_count, provided_size, refinement_count, refinement_gas_used, imports, exports, extrinsic_size, extrinsic_count, accumulate_count, accumulate_gas_used, on_transfers_count, on_transfers_gas_used, }) => {
|
|
72
|
+
}, ({ provided_count, provided_size, refinement_count, refinement_gas_used, imports, exports, extrinsic_size, extrinsic_count, accumulate_count, accumulate_gas_used, }) => {
|
|
81
73
|
return ServiceStatistics.create({
|
|
82
74
|
providedCount: provided_count,
|
|
83
75
|
providedSize: provided_size,
|
|
@@ -89,8 +81,6 @@ class JsonServiceStatistics {
|
|
|
89
81
|
extrinsicCount: extrinsic_count,
|
|
90
82
|
accumulateCount: accumulate_count,
|
|
91
83
|
accumulateGasUsed: accumulate_gas_used,
|
|
92
|
-
onTransfersCount: on_transfers_count ?? tryAsU32(0),
|
|
93
|
-
onTransfersGasUsed: on_transfers_gas_used ?? tryAsServiceGas(0),
|
|
94
84
|
});
|
|
95
85
|
});
|
|
96
86
|
provided_count;
|
|
@@ -103,8 +93,6 @@ class JsonServiceStatistics {
|
|
|
103
93
|
extrinsic_count;
|
|
104
94
|
accumulate_count;
|
|
105
95
|
accumulate_gas_used;
|
|
106
|
-
on_transfers_count;
|
|
107
|
-
on_transfers_gas_used;
|
|
108
96
|
}
|
|
109
97
|
export const serviceStatisticsEntryFromJson = {
|
|
110
98
|
id: "number",
|
|
@@ -177,8 +177,6 @@ export declare const inMemoryStateCodec: (spec: ChainSpec) => Descriptor<InMemor
|
|
|
177
177
|
exports: Descriptor<import("@typeberry/numbers").U16, import("@typeberry/numbers").U32>;
|
|
178
178
|
accumulateCount: Descriptor<import("@typeberry/numbers").U32, import("@typeberry/numbers").U32>;
|
|
179
179
|
accumulateGasUsed: Descriptor<bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">, bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">>;
|
|
180
|
-
onTransfersCount: Descriptor<import("@typeberry/numbers").U32, import("@typeberry/numbers").U32>;
|
|
181
|
-
onTransfersGasUsed: Descriptor<bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">, bigint & import("@typeberry/numbers").WithBytesRepresentation<8> & import("@typeberry/utils").WithOpaque<"ServiceGas[u64]">>;
|
|
182
180
|
}>>>;
|
|
183
181
|
}>>;
|
|
184
182
|
accumulationQueue: Descriptor<import("@typeberry/state").AccumulationQueue, import("@typeberry/codec").SequenceView<readonly import("@typeberry/state").NotYetAccumulatedReport[], import("@typeberry/codec").SequenceView<import("@typeberry/state").NotYetAccumulatedReport, import("@typeberry/codec").ViewOf<import("@typeberry/state").NotYetAccumulatedReport, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-memory-state-codec.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/in-memory-state-codec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,0BAA0B,EAAuB,MAAM,iCAAiC,CAAC;AACvG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAS,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAe,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnD,OAAO,EACL,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAElB,WAAW,EAEX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAU1B,wCAAwC;AACxC,eAAO,MAAM,QAAQ,GAAI,CAAC,EACxB,OAAO,UAAU,CAAC,CAAC,CAAC,EACpB,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,EAC9B,8BAgBG,0BAA0B,CAAC,CAAC,CAAM,KACpC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CA0C3B,CAAC;AA2CF,cAAM,gBAAiB,SAAQ,eAAe;IAC5C,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;QAQT;IAEH,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC;CAGjE;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS
|
|
1
|
+
{"version":3,"file":"in-memory-state-codec.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/in-memory-state-codec.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,0BAA0B,EAAuB,MAAM,iCAAiC,CAAC;AACvG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAS,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAe,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAKnD,OAAO,EACL,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAElB,WAAW,EAEX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAU1B,wCAAwC;AACxC,eAAO,MAAM,QAAQ,GAAI,CAAC,EACxB,OAAO,UAAU,CAAC,CAAC,CAAC,EACpB,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,EAC9B,8BAgBG,0BAA0B,CAAC,CAAC,CAAM,KACpC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CA0C3B,CAAC;AA2CF,cAAM,gBAAiB,SAAQ,eAAe;IAC5C,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;QAQT;IAEH,OAAO;IAIP,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,WAAW,CAAC,gBAAgB,CAAC;CAGjE;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqD/C,CAAC"}
|
|
@@ -50,7 +50,7 @@ export declare namespace serialize {
|
|
|
50
50
|
const recentlyAccumulated: StateCodec<State["recentlyAccumulated"], ReturnType<StateView["recentlyAccumulatedView"]>>;
|
|
51
51
|
/** C(16): https://graypaper.fluffylabs.dev/#/38c4e62/3b46033b4603?v=0.7.0 */
|
|
52
52
|
const accumulationOutputLog: StateCodec<State["accumulationOutputLog"]>;
|
|
53
|
-
/** C(255, s): https://graypaper.fluffylabs.dev/#/
|
|
53
|
+
/** C(255, s): https://graypaper.fluffylabs.dev/#/ab2cdbd/3b7d033b7d03?v=0.7.2 */
|
|
54
54
|
const serviceData: (serviceId: ServiceId) => {
|
|
55
55
|
key: import("@typeberry/hash").OpaqueHash & import("@typeberry/utils").WithOpaque<"stateKey">;
|
|
56
56
|
Codec: Descriptor<ServiceAccountInfo, import("@typeberry/codec").ViewOf<ServiceAccountInfo, {
|
|
@@ -66,17 +66,17 @@ export declare namespace serialize {
|
|
|
66
66
|
parentService: Descriptor<number & import("@typeberry/numbers").WithBytesRepresentation<4> & import("@typeberry/utils").WithOpaque<"ServiceId[u32]">, Bytes<4>>;
|
|
67
67
|
}>>;
|
|
68
68
|
};
|
|
69
|
-
/** https://graypaper.fluffylabs.dev/#/
|
|
69
|
+
/** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bac033bac03?v=0.7.2 */
|
|
70
70
|
const serviceStorage: (blake2b: Blake2b, serviceId: ServiceId, key: StorageKey) => {
|
|
71
71
|
key: import("@typeberry/hash").OpaqueHash & import("@typeberry/utils").WithOpaque<"stateKey">;
|
|
72
72
|
Codec: Descriptor<BytesBlob, BytesBlob>;
|
|
73
73
|
};
|
|
74
|
-
/** https://graypaper.fluffylabs.dev/#/
|
|
74
|
+
/** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bc9033bc903?v=0.7.2 */
|
|
75
75
|
const servicePreimages: (blake2b: Blake2b, serviceId: ServiceId, hash: PreimageHash) => {
|
|
76
76
|
key: import("@typeberry/hash").OpaqueHash & import("@typeberry/utils").WithOpaque<"stateKey">;
|
|
77
77
|
Codec: Descriptor<BytesBlob, BytesBlob>;
|
|
78
78
|
};
|
|
79
|
-
/** https://graypaper.fluffylabs.dev/#/
|
|
79
|
+
/** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bea033b0904?v=0.7.2 */
|
|
80
80
|
const serviceLookupHistory: (blake2b: Blake2b, serviceId: ServiceId, hash: PreimageHash, len: U32) => {
|
|
81
81
|
key: import("@typeberry/hash").OpaqueHash & import("@typeberry/utils").WithOpaque<"stateKey">;
|
|
82
82
|
Codec: Descriptor<readonly U32[], import("@typeberry/codec").SequenceView<U32, Bytes<4>>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/serialize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,SAAS,EAAY,MAAM,kBAAkB,CAAC;AAEzE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAS,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,KAAK,OAAO,EAAa,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAML,eAAe,EAGf,YAAY,EACZ,KAAK,gBAAgB,EACrB,kBAAkB,EAClB,KAAK,KAAK,EACV,cAAc,EACd,KAAK,kBAAkB,EACvB,KAAK,UAAU,EAEhB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"serialize.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/serialize.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ import { accumulationQueueCodec, authPoolsCodec, authQueuesCodec, availabilityAs
|
|
|
7
7
|
import { AccumulationOutput, accumulationOutputComparator } from "#@typeberry/state/accumulation-output.js";
|
|
8
8
|
import { recentlyAccumulatedCodec } from "#@typeberry/state/recently-accumulated.js";
|
|
9
9
|
import { SafroleData } from "#@typeberry/state/safrole-data.js";
|
|
10
|
-
import { Compatibility, GpVersion } from "#@typeberry/utils";
|
|
11
10
|
import { StateKeyIdx, stateKeys } from "./keys.js";
|
|
12
11
|
/** Serialization for particular state entries. */
|
|
13
12
|
export var serialize;
|
|
@@ -116,24 +115,22 @@ export var serialize;
|
|
|
116
115
|
Codec: codec.sequenceVarLen(AccumulationOutput.Codec).convert((i) => i.array, (o) => SortedArray.fromSortedArray(accumulationOutputComparator, o)),
|
|
117
116
|
extract: (s) => s.accumulationOutputLog,
|
|
118
117
|
};
|
|
119
|
-
/** C(255, s): https://graypaper.fluffylabs.dev/#/
|
|
118
|
+
/** C(255, s): https://graypaper.fluffylabs.dev/#/ab2cdbd/3b7d033b7d03?v=0.7.2 */
|
|
120
119
|
serialize.serviceData = (serviceId) => ({
|
|
121
120
|
key: stateKeys.serviceInfo(serviceId),
|
|
122
|
-
Codec:
|
|
123
|
-
? codecWithVersion(ServiceAccountInfo.Codec)
|
|
124
|
-
: ServiceAccountInfo.Codec,
|
|
121
|
+
Codec: codecWithVersion(ServiceAccountInfo.Codec),
|
|
125
122
|
});
|
|
126
|
-
/** https://graypaper.fluffylabs.dev/#/
|
|
123
|
+
/** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bac033bac03?v=0.7.2 */
|
|
127
124
|
serialize.serviceStorage = (blake2b, serviceId, key) => ({
|
|
128
125
|
key: stateKeys.serviceStorage(blake2b, serviceId, key),
|
|
129
126
|
Codec: dumpCodec,
|
|
130
127
|
});
|
|
131
|
-
/** https://graypaper.fluffylabs.dev/#/
|
|
128
|
+
/** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bc9033bc903?v=0.7.2 */
|
|
132
129
|
serialize.servicePreimages = (blake2b, serviceId, hash) => ({
|
|
133
130
|
key: stateKeys.servicePreimage(blake2b, serviceId, hash),
|
|
134
131
|
Codec: dumpCodec,
|
|
135
132
|
});
|
|
136
|
-
/** https://graypaper.fluffylabs.dev/#/
|
|
133
|
+
/** https://graypaper.fluffylabs.dev/#/ab2cdbd/3bea033b0904?v=0.7.2 */
|
|
137
134
|
serialize.serviceLookupHistory = (blake2b, serviceId, hash, len) => ({
|
|
138
135
|
key: stateKeys.serviceLookupHistory(blake2b, serviceId, hash, len),
|
|
139
136
|
Codec: codec.readonlyArray(codec.sequenceVarLen(codec.u32)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialized-state-view.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/serialized-state-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAA+B,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,2BAA2B,EAC3B,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAG1C;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,gCAAgC;IAChC,GAAG,CAAC,GAAG,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC;CACtC;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,sBAAsB,CAAE,YAAW,SAAS;IAEnF,OAAO,CAAC,QAAQ,CAAC,IAAI;IACd,OAAO,EAAE,CAAC;IACjB,oDAAoD;IACpD,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAJT,IAAI,EAAE,SAAS,EACzB,OAAO,EAAE,CAAC;IACjB,oDAAoD;IACnC,oBAAoB,EAAE,SAAS,EAAE,EACjC,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC;IAG/D,OAAO,CAAC,YAAY;IAoBpB,0BAA0B,IAAI,2BAA2B;IAIzD,2BAA2B,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI7E,wBAAwB,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI1E,yBAAyB,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI3E,aAAa,IAAI,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAI9E,cAAc,IAAI,YAAY,CAAC,kBAAkB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAIhF,gBAAgB,IAAI,gBAAgB;IAIpC,cAAc,IAAI,kBAAkB;IAIpC,qBAAqB,IAAI,qBAAqB;IAI9C,uBAAuB,IAAI,uBAAuB;IAIlD,eAAe,IAAI,eAAe;IAIlC,kBAAkB,CAAC,EAAE,EAAE,SAAS,GAAG,sBAAsB,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"serialized-state-view.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/state-merkleization/serialized-state-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAA+B,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,2BAA2B,EAC3B,gBAAgB,EAChB,uBAAuB,EACvB,eAAe,EACf,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAG1C;;;;GAIG;AACH,MAAM,WAAW,sBAAsB;IACrC,gCAAgC;IAChC,GAAG,CAAC,GAAG,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,CAAC;CACtC;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,sBAAsB,CAAE,YAAW,SAAS;IAEnF,OAAO,CAAC,QAAQ,CAAC,IAAI;IACd,OAAO,EAAE,CAAC;IACjB,oDAAoD;IACpD,OAAO,CAAC,QAAQ,CAAC,oBAAoB;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAJT,IAAI,EAAE,SAAS,EACzB,OAAO,EAAE,CAAC;IACjB,oDAAoD;IACnC,oBAAoB,EAAE,SAAS,EAAE,EACjC,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC;IAG/D,OAAO,CAAC,YAAY;IAoBpB,0BAA0B,IAAI,2BAA2B;IAIzD,2BAA2B,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI7E,wBAAwB,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI1E,yBAAyB,IAAI,YAAY,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAI3E,aAAa,IAAI,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAI9E,cAAc,IAAI,YAAY,CAAC,kBAAkB,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAIhF,gBAAgB,IAAI,gBAAgB;IAIpC,cAAc,IAAI,kBAAkB;IAIpC,qBAAqB,IAAI,qBAAqB;IAI9C,uBAAuB,IAAI,uBAAuB;IAIlD,eAAe,IAAI,eAAe;IAIlC,kBAAkB,CAAC,EAAE,EAAE,SAAS,GAAG,sBAAsB,GAAG,IAAI;CAYjE"}
|
|
@@ -6,7 +6,6 @@ import { tinyChainSpec } from "#@typeberry/config";
|
|
|
6
6
|
import { Blake2b, HASH_SIZE, TRUNCATED_HASH_SIZE } from "#@typeberry/hash";
|
|
7
7
|
import { tryAsPerCore } from "#@typeberry/state/common.js";
|
|
8
8
|
import { TEST_STATE, TEST_STATE_ROOT, testState } from "#@typeberry/state/test.utils.js";
|
|
9
|
-
import { Compatibility, GpVersion } from "#@typeberry/utils";
|
|
10
9
|
import { serializeStateUpdate } from "./serialize-state-update.js";
|
|
11
10
|
import { SerializedState } from "./serialized-state.js";
|
|
12
11
|
import { StateEntries } from "./state-entries.js";
|
|
@@ -43,12 +42,7 @@ describe("State Serialization", () => {
|
|
|
43
42
|
// check the value
|
|
44
43
|
const state = SerializedState.fromStateEntries(spec, blake2b, serialized);
|
|
45
44
|
assert.deepStrictEqual(state.authPools, authPools);
|
|
46
|
-
const expectedRoot =
|
|
47
|
-
fallback: "0xcf33ddfb0987283f7614652d7eb4d3509e5efd93466a4b28ab4865cc912a66e1",
|
|
48
|
-
versions: {
|
|
49
|
-
[GpVersion.V0_7_1]: "0xf1dff0f8d8d5470aa6fc381d07e644f5b2f7a32bf06a7cf1dc664fe4b6298402",
|
|
50
|
-
},
|
|
51
|
-
});
|
|
45
|
+
const expectedRoot = "0xf1dff0f8d8d5470aa6fc381d07e644f5b2f7a32bf06a7cf1dc664fe4b6298402";
|
|
52
46
|
assert.strictEqual(serialized.getRootHash(blake2b).toString(), expectedRoot);
|
|
53
47
|
});
|
|
54
48
|
});
|