@typeberry/lib 0.5.2 → 0.5.3-aa4626d
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 +9 -5
- package/packages/core/collections/blob-dictionary.d.ts.map +1 -1
- package/packages/core/collections/blob-dictionary.js +3 -3
- package/packages/core/crypto/bandersnatch.d.ts +2 -1
- package/packages/core/crypto/bandersnatch.d.ts.map +1 -1
- package/packages/core/crypto/bandersnatch.js +9 -2
- package/packages/core/crypto/key-derivation.test.js +8 -7
- package/packages/core/hash/hash.d.ts.map +1 -1
- package/packages/core/hash/hash.js +1 -0
- package/packages/core/networking/package.json +1 -1
- 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/bin.js +6 -6
- package/packages/core/pvm-host-calls/ecalli-io-tracker.d.ts +32 -0
- package/packages/core/pvm-host-calls/ecalli-io-tracker.d.ts.map +1 -0
- package/packages/core/pvm-host-calls/ecalli-io-tracker.js +14 -0
- package/packages/core/pvm-host-calls/ecalli-trace-logger.d.ts +139 -0
- package/packages/core/pvm-host-calls/ecalli-trace-logger.d.ts.map +1 -0
- package/packages/core/pvm-host-calls/ecalli-trace-logger.js +209 -0
- package/packages/core/pvm-host-calls/ecalli-trace-logger.test.d.ts +2 -0
- package/packages/core/pvm-host-calls/ecalli-trace-logger.test.d.ts.map +1 -0
- package/packages/core/pvm-host-calls/ecalli-trace-logger.test.js +231 -0
- package/packages/core/pvm-host-calls/host-call-memory.d.ts +2 -0
- package/packages/core/pvm-host-calls/host-call-memory.d.ts.map +1 -1
- package/packages/core/pvm-host-calls/host-call-memory.js +12 -2
- package/packages/core/pvm-host-calls/host-call-registers.d.ts +6 -0
- package/packages/core/pvm-host-calls/host-call-registers.d.ts.map +1 -1
- package/packages/core/pvm-host-calls/host-call-registers.js +24 -0
- package/packages/core/pvm-host-calls/host-calls-executor.d.ts +37 -0
- package/packages/core/pvm-host-calls/host-calls-executor.d.ts.map +1 -0
- package/packages/core/pvm-host-calls/host-calls-executor.js +129 -0
- package/packages/core/pvm-host-calls/host-calls.d.ts +20 -26
- package/packages/core/pvm-host-calls/host-calls.d.ts.map +1 -1
- package/packages/core/pvm-host-calls/host-calls.js +40 -112
- package/packages/core/pvm-host-calls/index.d.ts +7 -6
- package/packages/core/pvm-host-calls/index.d.ts.map +1 -1
- package/packages/core/pvm-host-calls/index.js +7 -6
- package/packages/core/pvm-host-calls/{interpreter-instance-manager.d.ts → pvm-instance-manager.d.ts} +3 -3
- package/packages/core/pvm-host-calls/pvm-instance-manager.d.ts.map +1 -0
- package/packages/core/pvm-host-calls/{interpreter-instance-manager.js → pvm-instance-manager.js} +2 -2
- 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/jam/block/work-item.d.ts +13 -4
- package/packages/jam/block/work-item.d.ts.map +1 -1
- 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/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 +4 -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 +48 -5
- 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.test.js +4 -5
- package/packages/jam/jamnp-s/protocol/ce-133-work-package-submission.d.ts +3 -3
- package/packages/jam/jamnp-s/protocol/ce-133-work-package-submission.d.ts.map +1 -1
- package/packages/jam/jamnp-s/protocol/ce-135-work-report-distribution.test.js +2 -2
- package/packages/jam/node/main-importer.d.ts.map +1 -1
- package/packages/jam/node/main-importer.js +3 -1
- 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/safrole/bandersnatch-vrf.d.ts +2 -0
- package/packages/jam/safrole/bandersnatch-vrf.d.ts.map +1 -1
- package/packages/jam/safrole/bandersnatch-vrf.js +11 -0
- package/packages/jam/safrole/bandersnatch-vrf.test.js +3 -3
- package/packages/jam/safrole/bandersnatch-wasm.d.ts +1 -0
- package/packages/jam/safrole/bandersnatch-wasm.d.ts.map +1 -1
- package/packages/jam/safrole/bandersnatch-wasm.js +8 -5
- package/packages/jam/safrole/safrole-seal.d.ts +1 -3
- package/packages/jam/safrole/safrole-seal.d.ts.map +1 -1
- package/packages/jam/safrole/safrole-seal.js +14 -25
- package/packages/jam/safrole/safrole-seal.test.js +4 -10
- 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/test.utils.d.ts.map +1 -1
- package/packages/jam/state/test.utils.js +2 -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-utils.test.js +2 -2
- package/packages/jam/transition/accumulate/accumulate.d.ts.map +1 -1
- package/packages/jam/transition/accumulate/accumulate.js +8 -13
- 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/deferred-transfers.d.ts +1 -1
- package/packages/jam/transition/accumulate/deferred-transfers.d.ts.map +1 -1
- package/packages/jam/transition/accumulate/deferred-transfers.js +6 -7
- package/packages/jam/transition/disputes/disputes.d.ts.map +1 -1
- package/packages/jam/transition/disputes/disputes.js +5 -4
- package/packages/jam/transition/disputes/disputes.test.data2.js +2 -2
- package/packages/jam/transition/externalities/fetch-externalities.d.ts +7 -1
- package/packages/jam/transition/externalities/fetch-externalities.d.ts.map +1 -1
- package/packages/jam/transition/externalities/fetch-externalities.js +4 -0
- package/packages/jam/transition/externalities/fetch-externalities.test.js +2 -2
- package/packages/jam/transition/hasher.test.js +2 -2
- package/packages/jam/transition/reports/test.utils.d.ts.map +1 -1
- package/packages/jam/transition/reports/test.utils.js +2 -2
- package/packages/workers/block-authorship/package.json +1 -1
- package/packages/workers/importer/package.json +1 -1
- package/packages/core/pvm-host-calls/host-calls-manager.d.ts +0 -23
- package/packages/core/pvm-host-calls/host-calls-manager.d.ts.map +0 -1
- package/packages/core/pvm-host-calls/host-calls-manager.js +0 -44
- package/packages/core/pvm-host-calls/interpreter-instance-manager.d.ts.map +0 -1
- package/packages/jam/transition/accumulate/pvm-executor.d.ts.map +0 -1
|
@@ -0,0 +1,294 @@
|
|
|
1
|
+
import { tryAsCoreIndex, tryAsServiceGas, } from "#@typeberry/block";
|
|
2
|
+
import { W_C } from "#@typeberry/block/gp-constants.js";
|
|
3
|
+
import { WorkPackageInfo, } from "#@typeberry/block/refine-context.js";
|
|
4
|
+
import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
|
|
5
|
+
import { WorkExecResult, WorkExecResultKind, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
|
|
6
|
+
import { Bytes, BytesBlob } from "#@typeberry/bytes";
|
|
7
|
+
import { codec, Encoder } from "#@typeberry/codec";
|
|
8
|
+
import { asKnownSize, FixedSizeArray } from "#@typeberry/collections";
|
|
9
|
+
import { PvmExecutor, ReturnStatus } from "#@typeberry/executor";
|
|
10
|
+
import { HASH_SIZE } from "#@typeberry/hash";
|
|
11
|
+
import { Logger } from "#@typeberry/logger";
|
|
12
|
+
import { tryAsU8, tryAsU16, tryAsU32 } from "#@typeberry/numbers";
|
|
13
|
+
import { FetchExternalities } from "#@typeberry/transition/externalities/fetch-externalities.js";
|
|
14
|
+
import { assertEmpty, assertNever, Result } from "#@typeberry/utils";
|
|
15
|
+
import { RefineExternalitiesImpl } from "./externalities/refine.js";
|
|
16
|
+
export var RefineError;
|
|
17
|
+
(function (RefineError) {
|
|
18
|
+
/** State for context anchor block or lookup anchor is not found in the DB. */
|
|
19
|
+
RefineError[RefineError["StateMissing"] = 0] = "StateMissing";
|
|
20
|
+
/** Posterior state root of context anchor block does not match the one in the DB. */
|
|
21
|
+
RefineError[RefineError["StateRootMismatch"] = 1] = "StateRootMismatch";
|
|
22
|
+
/** Lookup anchor state-slot does not match the one given in context. */
|
|
23
|
+
RefineError[RefineError["InvalidLookupAnchorSlot"] = 2] = "InvalidLookupAnchorSlot";
|
|
24
|
+
/** Authorization error. */
|
|
25
|
+
RefineError[RefineError["AuthorizationError"] = 3] = "AuthorizationError";
|
|
26
|
+
})(RefineError || (RefineError = {}));
|
|
27
|
+
var ServiceCodeError;
|
|
28
|
+
(function (ServiceCodeError) {
|
|
29
|
+
/** Service id is not found in the state. */
|
|
30
|
+
ServiceCodeError[ServiceCodeError["ServiceNotFound"] = 0] = "ServiceNotFound";
|
|
31
|
+
/** Expected service code does not match the state one. */
|
|
32
|
+
ServiceCodeError[ServiceCodeError["ServiceCodeMismatch"] = 1] = "ServiceCodeMismatch";
|
|
33
|
+
/** Code preimage missing. */
|
|
34
|
+
ServiceCodeError[ServiceCodeError["ServiceCodeMissing"] = 2] = "ServiceCodeMissing";
|
|
35
|
+
/** Code blob is too big. */
|
|
36
|
+
ServiceCodeError[ServiceCodeError["ServiceCodeTooBig"] = 3] = "ServiceCodeTooBig";
|
|
37
|
+
})(ServiceCodeError || (ServiceCodeError = {}));
|
|
38
|
+
var AuthorizationError;
|
|
39
|
+
(function (AuthorizationError) {
|
|
40
|
+
})(AuthorizationError || (AuthorizationError = {}));
|
|
41
|
+
const logger = Logger.new(import.meta.filename, "refine");
|
|
42
|
+
/** https://graypaper.fluffylabs.dev/#/ab2cdbd/2ffe002ffe00?v=0.7.2 */
|
|
43
|
+
const ARGS_CODEC = codec.object({
|
|
44
|
+
core: codec.varU32.convert((x) => tryAsU32(x), (x) => tryAsCoreIndex(x)),
|
|
45
|
+
workItemIndex: codec.varU32,
|
|
46
|
+
serviceId: codec.varU32.asOpaque(),
|
|
47
|
+
payloadLength: codec.varU32,
|
|
48
|
+
packageHash: codec.bytes(HASH_SIZE).asOpaque(),
|
|
49
|
+
});
|
|
50
|
+
export class InCore {
|
|
51
|
+
chainSpec;
|
|
52
|
+
states;
|
|
53
|
+
pvmBackend;
|
|
54
|
+
blake2b;
|
|
55
|
+
constructor(chainSpec, states, pvmBackend, blake2b) {
|
|
56
|
+
this.chainSpec = chainSpec;
|
|
57
|
+
this.states = states;
|
|
58
|
+
this.pvmBackend = pvmBackend;
|
|
59
|
+
this.blake2b = blake2b;
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* Work-report computation function.
|
|
63
|
+
*
|
|
64
|
+
* Note this requires all of the imports and extrinsics to be already fetched
|
|
65
|
+
* and only performs the refinement.
|
|
66
|
+
*
|
|
67
|
+
* Any validation must be done externally!
|
|
68
|
+
*
|
|
69
|
+
* https://graypaper.fluffylabs.dev/#/ab2cdbd/1b7f021b7f02?v=0.7.2
|
|
70
|
+
*/
|
|
71
|
+
async refine(workPackageAndHash, core, imports, extrinsics) {
|
|
72
|
+
const workPackageHash = workPackageAndHash.hash;
|
|
73
|
+
const { context, authorization, authCodeHash, authCodeHost, parametrization, items, ...rest } = workPackageAndHash.data;
|
|
74
|
+
assertEmpty(rest);
|
|
75
|
+
// TODO [ToDr] Verify BEEFY root
|
|
76
|
+
// TODO [ToDr] Verify prerequisites
|
|
77
|
+
logger.log `[core:${core}] Attempting to refine work package with ${items.length} items.`;
|
|
78
|
+
// TODO [ToDr] GP link
|
|
79
|
+
// Verify anchor block
|
|
80
|
+
const state = this.states.getState(context.anchor);
|
|
81
|
+
if (state === null) {
|
|
82
|
+
return Result.error(RefineError.StateMissing, () => `State at anchor block ${context.anchor} is missing.`);
|
|
83
|
+
}
|
|
84
|
+
const stateRoot = await this.states.getStateRoot(state);
|
|
85
|
+
if (!stateRoot.isEqualTo(context.stateRoot)) {
|
|
86
|
+
return Result.error(RefineError.StateRootMismatch, () => `State at ${context.anchor} does not match expected root hash. Ours: ${stateRoot}, expected: ${context.stateRoot}`);
|
|
87
|
+
}
|
|
88
|
+
// TODO [ToDr] GP link
|
|
89
|
+
// Verify lookup anchor state
|
|
90
|
+
const lookupState = this.states.getState(context.lookupAnchor);
|
|
91
|
+
if (lookupState === null) {
|
|
92
|
+
return Result.error(RefineError.StateMissing, () => `Lookup state at block ${context.lookupAnchor} is missing.`);
|
|
93
|
+
}
|
|
94
|
+
// TODO [ToDr] GP link
|
|
95
|
+
if (lookupState.timeslot !== context.lookupAnchorSlot) {
|
|
96
|
+
return Result.error(RefineError.InvalidLookupAnchorSlot, () => `Lookup anchor slot does not match the one is state. Ours: ${lookupState.timeslot}, expected: ${context.lookupAnchorSlot}`);
|
|
97
|
+
}
|
|
98
|
+
// Check authorization
|
|
99
|
+
const authResult = await this.authorizePackage(authorization, authCodeHost, authCodeHash, parametrization);
|
|
100
|
+
if (authResult.isError) {
|
|
101
|
+
return Result.error(RefineError.AuthorizationError, () => `Authorization error: ${AuthorizationError[authResult.error]}: ${authResult.details()}.`);
|
|
102
|
+
}
|
|
103
|
+
logger.log `[core:${core}] Authorized. Proceeding with work items verification. Anchor=${context.anchor}`;
|
|
104
|
+
// Verify the work items
|
|
105
|
+
const refineResults = [];
|
|
106
|
+
for (const [idx, item] of items.entries()) {
|
|
107
|
+
logger.info `[core:${core}][i:${idx}] Refining item for service ${item.service}.`;
|
|
108
|
+
refineResults.push(await this.refineItem(state, idx, item, imports, extrinsics, core, workPackageHash));
|
|
109
|
+
}
|
|
110
|
+
// amalgamate the work report now
|
|
111
|
+
return Result.ok(this.amalgamateWorkReport(asKnownSize(refineResults), authResult.ok, workPackageHash, context, core));
|
|
112
|
+
}
|
|
113
|
+
amalgamateWorkReport(refineResults, authResult, workPackageHash, context, coreIndex) {
|
|
114
|
+
// unzip exports and work results for each work item
|
|
115
|
+
const exports = refineResults.map((x) => x.exports);
|
|
116
|
+
const results = refineResults.map((x) => x.result);
|
|
117
|
+
const { authorizerHash, authorizationGasUsed, authorizationOutput, ...authRest } = authResult;
|
|
118
|
+
assertEmpty(authRest);
|
|
119
|
+
// TODO [ToDr] Compute erasure root
|
|
120
|
+
const erasureRoot = Bytes.zero(HASH_SIZE);
|
|
121
|
+
// TODO [ToDr] Compute exports root
|
|
122
|
+
const exportsRoot = Bytes.zero(HASH_SIZE).asOpaque();
|
|
123
|
+
const exportsCount = exports.reduce((acc, x) => acc + x.length, 0);
|
|
124
|
+
// TODO [ToDr] Segment root lookup computation?
|
|
125
|
+
const segmentRootLookup = [
|
|
126
|
+
WorkPackageInfo.create({
|
|
127
|
+
workPackageHash,
|
|
128
|
+
segmentTreeRoot: exportsRoot,
|
|
129
|
+
}),
|
|
130
|
+
];
|
|
131
|
+
// TODO [ToDr] Auditable work bundle length?
|
|
132
|
+
const workBundleLength = tryAsU32(0);
|
|
133
|
+
return {
|
|
134
|
+
report: WorkReport.create({
|
|
135
|
+
workPackageSpec: WorkPackageSpec.create({
|
|
136
|
+
length: workBundleLength,
|
|
137
|
+
hash: workPackageHash,
|
|
138
|
+
erasureRoot,
|
|
139
|
+
exportsRoot,
|
|
140
|
+
// safe to convert, since we have limit on number of
|
|
141
|
+
// exports per item and a limit for number of items
|
|
142
|
+
exportsCount: tryAsU16(exportsCount),
|
|
143
|
+
}),
|
|
144
|
+
context,
|
|
145
|
+
coreIndex,
|
|
146
|
+
authorizerHash,
|
|
147
|
+
authorizationGasUsed,
|
|
148
|
+
authorizationOutput,
|
|
149
|
+
segmentRootLookup,
|
|
150
|
+
// safe to convert, since we know that number of work items is limited
|
|
151
|
+
results: FixedSizeArray.new(results, tryAsU8(refineResults.length)),
|
|
152
|
+
}),
|
|
153
|
+
exports: asKnownSize(exports),
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
async authorizePackage(_authorization, _authCodeHost, _authCodeHash, _parametrization) {
|
|
157
|
+
// TODO [ToDr] Check authorization?
|
|
158
|
+
const authorizerHash = Bytes.zero(HASH_SIZE).asOpaque();
|
|
159
|
+
const authorizationGasUsed = tryAsServiceGas(0);
|
|
160
|
+
const authorizationOutput = BytesBlob.empty();
|
|
161
|
+
return Result.ok({
|
|
162
|
+
authorizerHash,
|
|
163
|
+
authorizationGasUsed,
|
|
164
|
+
authorizationOutput,
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
async refineItem(state, idx, item, allImports, allExtrinsics, coreIndex, workPackageHash) {
|
|
168
|
+
const payloadHash = this.blake2b.hashBytes(item.payload);
|
|
169
|
+
const baseResult = {
|
|
170
|
+
serviceId: item.service,
|
|
171
|
+
codeHash: item.codeHash,
|
|
172
|
+
payloadHash,
|
|
173
|
+
gas: item.refineGasLimit,
|
|
174
|
+
};
|
|
175
|
+
const imports = allImports[idx];
|
|
176
|
+
const extrinsics = allExtrinsics[idx];
|
|
177
|
+
const baseLoad = {
|
|
178
|
+
importedSegments: tryAsU32(imports.length),
|
|
179
|
+
extrinsicCount: tryAsU32(extrinsics.length),
|
|
180
|
+
extrinsicSize: tryAsU32(extrinsics.reduce((acc, x) => acc + x.length, 0)),
|
|
181
|
+
};
|
|
182
|
+
const maybeCode = this.getServiceCode(state, idx, item);
|
|
183
|
+
if (maybeCode.isError) {
|
|
184
|
+
const error = maybeCode.error === ServiceCodeError.ServiceCodeTooBig
|
|
185
|
+
? WorkExecResultKind.codeOversize
|
|
186
|
+
: WorkExecResultKind.badCode;
|
|
187
|
+
return {
|
|
188
|
+
exports: [],
|
|
189
|
+
result: WorkResult.create({
|
|
190
|
+
...baseResult,
|
|
191
|
+
result: WorkExecResult.error(error),
|
|
192
|
+
load: WorkRefineLoad.create({
|
|
193
|
+
...baseLoad,
|
|
194
|
+
gasUsed: tryAsServiceGas(item.refineGasLimit),
|
|
195
|
+
exportedSegments: tryAsU32(0),
|
|
196
|
+
}),
|
|
197
|
+
}),
|
|
198
|
+
};
|
|
199
|
+
}
|
|
200
|
+
const code = maybeCode.ok;
|
|
201
|
+
const externalities = this.createRefineExternalities({
|
|
202
|
+
payload: item.payload,
|
|
203
|
+
imports: allImports,
|
|
204
|
+
extrinsics: allExtrinsics,
|
|
205
|
+
});
|
|
206
|
+
const executor = await PvmExecutor.createRefineExecutor(item.service, code, externalities, this.pvmBackend);
|
|
207
|
+
const args = Encoder.encodeObject(ARGS_CODEC, {
|
|
208
|
+
serviceId: item.service,
|
|
209
|
+
core: coreIndex,
|
|
210
|
+
workItemIndex: tryAsU32(idx),
|
|
211
|
+
payloadLength: tryAsU32(item.payload.length),
|
|
212
|
+
packageHash: workPackageHash,
|
|
213
|
+
});
|
|
214
|
+
const execResult = await executor.run(args, item.refineGasLimit);
|
|
215
|
+
// TODO [ToDr] get exports from externalities
|
|
216
|
+
const exports = [];
|
|
217
|
+
if (exports.length !== item.exportCount) {
|
|
218
|
+
return {
|
|
219
|
+
exports,
|
|
220
|
+
result: WorkResult.create({
|
|
221
|
+
...baseResult,
|
|
222
|
+
result: WorkExecResult.error(WorkExecResultKind.incorrectNumberOfExports),
|
|
223
|
+
load: WorkRefineLoad.create({
|
|
224
|
+
...baseLoad,
|
|
225
|
+
gasUsed: tryAsServiceGas(item.refineGasLimit),
|
|
226
|
+
exportedSegments: tryAsU32(0),
|
|
227
|
+
}),
|
|
228
|
+
}),
|
|
229
|
+
};
|
|
230
|
+
}
|
|
231
|
+
const result = this.extractWorkResult(execResult);
|
|
232
|
+
return {
|
|
233
|
+
exports,
|
|
234
|
+
result: WorkResult.create({
|
|
235
|
+
...baseResult,
|
|
236
|
+
result,
|
|
237
|
+
load: WorkRefineLoad.create({
|
|
238
|
+
...baseLoad,
|
|
239
|
+
gasUsed: tryAsServiceGas(execResult.consumedGas),
|
|
240
|
+
exportedSegments: tryAsU32(exports.length),
|
|
241
|
+
}),
|
|
242
|
+
}),
|
|
243
|
+
};
|
|
244
|
+
}
|
|
245
|
+
extractWorkResult(execResult) {
|
|
246
|
+
if (execResult.status === ReturnStatus.OK) {
|
|
247
|
+
const slice = execResult.memorySlice;
|
|
248
|
+
// TODO [ToDr] Verify the output size and change digestTooBig?
|
|
249
|
+
return WorkExecResult.ok(BytesBlob.blobFrom(slice));
|
|
250
|
+
}
|
|
251
|
+
switch (execResult.status) {
|
|
252
|
+
case ReturnStatus.OOG:
|
|
253
|
+
return WorkExecResult.error(WorkExecResultKind.outOfGas);
|
|
254
|
+
case ReturnStatus.PANIC:
|
|
255
|
+
return WorkExecResult.error(WorkExecResultKind.panic);
|
|
256
|
+
default:
|
|
257
|
+
assertNever(execResult);
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
getServiceCode(state, idx, item) {
|
|
261
|
+
const serviceId = item.service;
|
|
262
|
+
const service = state.getService(serviceId);
|
|
263
|
+
// TODO [ToDr] GP link
|
|
264
|
+
// missing service
|
|
265
|
+
if (service === null) {
|
|
266
|
+
return Result.error(ServiceCodeError.ServiceNotFound, () => `[i:${idx}] Service ${serviceId} is missing in state.`);
|
|
267
|
+
}
|
|
268
|
+
// TODO [ToDr] GP link
|
|
269
|
+
// TODO [ToDr] shall we rather use the old codehash instead
|
|
270
|
+
if (!service.getInfo().codeHash.isEqualTo(item.codeHash)) {
|
|
271
|
+
return Result.error(ServiceCodeError.ServiceCodeMismatch, () => `[i:${idx}] Service ${serviceId} has invalid code hash. Ours: ${service.getInfo().codeHash}, expected: ${item.codeHash}`);
|
|
272
|
+
}
|
|
273
|
+
const code = service.getPreimage(item.codeHash.asOpaque());
|
|
274
|
+
if (code === null) {
|
|
275
|
+
return Result.error(ServiceCodeError.ServiceCodeMissing, () => `[i:${idx}] Code ${item.codeHash} for service ${serviceId} was not found.`);
|
|
276
|
+
}
|
|
277
|
+
if (code.length > W_C) {
|
|
278
|
+
return Result.error(ServiceCodeError.ServiceCodeTooBig, () => `[i:${idx}] Code ${item.codeHash} for service ${serviceId} is too big! ${code.length} bytes vs ${W_C} bytes max.`);
|
|
279
|
+
}
|
|
280
|
+
return Result.ok(code);
|
|
281
|
+
}
|
|
282
|
+
createRefineExternalities(args) {
|
|
283
|
+
// TODO [ToDr] Pass all required fetch data
|
|
284
|
+
const fetchExternalities = FetchExternalities.createForRefine({
|
|
285
|
+
entropy: undefined,
|
|
286
|
+
...args,
|
|
287
|
+
}, this.chainSpec);
|
|
288
|
+
const refine = RefineExternalitiesImpl.create();
|
|
289
|
+
return {
|
|
290
|
+
fetchExternalities,
|
|
291
|
+
refine,
|
|
292
|
+
};
|
|
293
|
+
}
|
|
294
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"in-core.test.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/in-core/in-core.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import assert from "node:assert";
|
|
2
|
+
import { before, describe, it } from "node:test";
|
|
3
|
+
import { tryAsCoreIndex, tryAsServiceGas, tryAsServiceId, tryAsTimeSlot } from "#@typeberry/block";
|
|
4
|
+
import { RefineContext } from "#@typeberry/block/refine-context.js";
|
|
5
|
+
import { WorkItem } from "#@typeberry/block/work-item.js";
|
|
6
|
+
import { tryAsWorkItemsCount, WorkPackage } from "#@typeberry/block/work-package.js";
|
|
7
|
+
import { Bytes, BytesBlob } from "#@typeberry/bytes";
|
|
8
|
+
import { Encoder } from "#@typeberry/codec";
|
|
9
|
+
import { asKnownSize, FixedSizeArray } from "#@typeberry/collections";
|
|
10
|
+
import { PvmBackend, tinyChainSpec } from "#@typeberry/config";
|
|
11
|
+
import { InMemoryStates } from "#@typeberry/database";
|
|
12
|
+
import { Blake2b, HASH_SIZE, WithHash } from "#@typeberry/hash";
|
|
13
|
+
import { tryAsU16 } from "#@typeberry/numbers";
|
|
14
|
+
import { testState } from "#@typeberry/state/test.utils.js";
|
|
15
|
+
import { InCore, RefineError } from "./in-core.js";
|
|
16
|
+
let blake2b;
|
|
17
|
+
before(async () => {
|
|
18
|
+
blake2b = await Blake2b.createHasher();
|
|
19
|
+
});
|
|
20
|
+
function createWorkItem(serviceId = 1) {
|
|
21
|
+
return WorkItem.create({
|
|
22
|
+
service: tryAsServiceId(serviceId),
|
|
23
|
+
codeHash: Bytes.zero(HASH_SIZE).asOpaque(),
|
|
24
|
+
payload: BytesBlob.empty(),
|
|
25
|
+
refineGasLimit: tryAsServiceGas(1_000_000),
|
|
26
|
+
accumulateGasLimit: tryAsServiceGas(1_000_000),
|
|
27
|
+
importSegments: asKnownSize([]),
|
|
28
|
+
extrinsic: [],
|
|
29
|
+
exportCount: tryAsU16(0),
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
function createWorkPackage(anchorHash, stateRoot, lookupAnchorSlot = 0) {
|
|
33
|
+
return WorkPackage.create({
|
|
34
|
+
authorization: BytesBlob.empty(),
|
|
35
|
+
authCodeHost: tryAsServiceId(1),
|
|
36
|
+
authCodeHash: Bytes.zero(HASH_SIZE).asOpaque(),
|
|
37
|
+
parametrization: BytesBlob.empty(),
|
|
38
|
+
context: RefineContext.create({
|
|
39
|
+
anchor: anchorHash,
|
|
40
|
+
stateRoot,
|
|
41
|
+
beefyRoot: Bytes.zero(HASH_SIZE).asOpaque(),
|
|
42
|
+
lookupAnchor: anchorHash,
|
|
43
|
+
lookupAnchorSlot: tryAsTimeSlot(lookupAnchorSlot),
|
|
44
|
+
prerequisites: [],
|
|
45
|
+
}),
|
|
46
|
+
items: FixedSizeArray.new([createWorkItem()], tryAsWorkItemsCount(1)),
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
function hashWorkPackage(spec, workPackage) {
|
|
50
|
+
const workPackageHash = blake2b
|
|
51
|
+
.hashBytes(Encoder.encodeObject(WorkPackage.Codec, workPackage, spec))
|
|
52
|
+
.asOpaque();
|
|
53
|
+
return new WithHash(workPackageHash, workPackage);
|
|
54
|
+
}
|
|
55
|
+
describe("InCore", () => {
|
|
56
|
+
it("should return StateMissing error when anchor block state is not in DB", async () => {
|
|
57
|
+
const spec = tinyChainSpec;
|
|
58
|
+
const states = new InMemoryStates(spec);
|
|
59
|
+
const inCore = new InCore(spec, states, PvmBackend.BuiltIn, blake2b);
|
|
60
|
+
const anchorHash = Bytes.fill(HASH_SIZE, 1).asOpaque();
|
|
61
|
+
const stateRoot = Bytes.zero(HASH_SIZE).asOpaque();
|
|
62
|
+
const workPackage = createWorkPackage(anchorHash, stateRoot);
|
|
63
|
+
const result = await inCore.refine(hashWorkPackage(spec, workPackage), tryAsCoreIndex(0), asKnownSize([[]]), asKnownSize([[]]));
|
|
64
|
+
assert.strictEqual(result.isError, true);
|
|
65
|
+
assert.strictEqual(result.error, RefineError.StateMissing);
|
|
66
|
+
});
|
|
67
|
+
it("should refine work package and produce a report when state is set up", async () => {
|
|
68
|
+
const spec = tinyChainSpec;
|
|
69
|
+
const states = new InMemoryStates(spec);
|
|
70
|
+
const inCore = new InCore(spec, states, PvmBackend.BuiltIn, blake2b);
|
|
71
|
+
const anchorHash = Bytes.fill(HASH_SIZE, 1).asOpaque();
|
|
72
|
+
const state = testState();
|
|
73
|
+
await states.insertInitialState(anchorHash, state);
|
|
74
|
+
const correctStateRoot = await states.getStateRoot(state);
|
|
75
|
+
const workPackage = createWorkPackage(anchorHash, correctStateRoot, state.timeslot);
|
|
76
|
+
const result = await inCore.refine(hashWorkPackage(spec, workPackage), tryAsCoreIndex(0), asKnownSize([[]]), asKnownSize([[]]));
|
|
77
|
+
assert.strictEqual(result.isOk, true);
|
|
78
|
+
assert.strictEqual(result.ok.report.coreIndex, 0);
|
|
79
|
+
assert.strictEqual(result.ok.report.results.length, 1);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/in-core/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from "./in-core.js";
|
|
@@ -3,14 +3,13 @@ import { describe, it } from "node:test";
|
|
|
3
3
|
import { tryAsServiceGas, tryAsServiceId } from "#@typeberry/block";
|
|
4
4
|
import { codec, Encoder } from "#@typeberry/codec";
|
|
5
5
|
import { tinyChainSpec } from "#@typeberry/config";
|
|
6
|
-
import { tryAsU64 } from "#@typeberry/numbers";
|
|
6
|
+
import { MAX_VALUE_U32, MAX_VALUE_U64, tryAsU64 } from "#@typeberry/numbers";
|
|
7
7
|
import { HostCallMemory, HostCallRegisters, PvmExecution } from "#@typeberry/pvm-host-calls";
|
|
8
8
|
import { tryAsGas } from "#@typeberry/pvm-interface";
|
|
9
9
|
import { gasCounter } from "#@typeberry/pvm-interpreter/gas.js";
|
|
10
10
|
import { MemoryBuilder, tryAsMemoryIndex } from "#@typeberry/pvm-interpreter/memory/index.js";
|
|
11
11
|
import { PAGE_SIZE } from "#@typeberry/pvm-interpreter/memory/memory-consts.js";
|
|
12
12
|
import { tryAsSbrkIndex } from "#@typeberry/pvm-interpreter/memory/memory-index.js";
|
|
13
|
-
import { MAX_VALUE, MAX_VALUE_U64 } from "#@typeberry/pvm-interpreter/ops/math-consts.js";
|
|
14
13
|
import { codecPerCore, tryAsPerCore } from "#@typeberry/state";
|
|
15
14
|
import { Compatibility, deepEqual, GpVersion, Result } from "#@typeberry/utils";
|
|
16
15
|
import { UpdatePrivilegesError } from "../externalities/partial-state.js";
|
|
@@ -99,7 +98,7 @@ describe("HostCalls: Bless", () => {
|
|
|
99
98
|
tryAsServiceId(5),
|
|
100
99
|
tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
|
|
101
100
|
tryAsServiceId(20),
|
|
102
|
-
tryAsServiceId(
|
|
101
|
+
tryAsServiceId(MAX_VALUE_U32),
|
|
103
102
|
new Map(entries),
|
|
104
103
|
],
|
|
105
104
|
]);
|
|
@@ -161,7 +160,7 @@ describe("HostCalls: Bless", () => {
|
|
|
161
160
|
tryAsServiceId(5),
|
|
162
161
|
tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
|
|
163
162
|
tryAsServiceId(20),
|
|
164
|
-
tryAsServiceId(
|
|
163
|
+
tryAsServiceId(MAX_VALUE_U32),
|
|
165
164
|
new Map(entries),
|
|
166
165
|
],
|
|
167
166
|
]);
|
|
@@ -197,7 +196,7 @@ describe("HostCalls: Bless", () => {
|
|
|
197
196
|
tryAsServiceId(5),
|
|
198
197
|
tryAsPerCore([tryAsServiceId(10), tryAsServiceId(15)], tinyChainSpec),
|
|
199
198
|
tryAsServiceId(20),
|
|
200
|
-
tryAsServiceId(
|
|
199
|
+
tryAsServiceId(MAX_VALUE_U32),
|
|
201
200
|
new Map(entries),
|
|
202
201
|
],
|
|
203
202
|
]);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { CoreIndex } from "#@typeberry/block";
|
|
2
|
-
import { type
|
|
2
|
+
import { type WorkPackageExtrinsics } from "#@typeberry/block/work-item.js";
|
|
3
3
|
import { WorkPackage } from "#@typeberry/block/work-package.js";
|
|
4
4
|
import type { BytesBlob } from "#@typeberry/bytes";
|
|
5
5
|
import { type CodecRecord } from "#@typeberry/codec";
|
|
@@ -55,7 +55,7 @@ export declare class CoreWorkPackage extends WithDebug {
|
|
|
55
55
|
export declare class ServerHandler implements StreamHandler<typeof STREAM_KIND> {
|
|
56
56
|
private readonly onWorkPackage;
|
|
57
57
|
kind: 133 & import("@typeberry/numbers").WithBytesRepresentation<1>;
|
|
58
|
-
constructor(onWorkPackage: (i: CoreIndex, w: WorkPackage, e:
|
|
58
|
+
constructor(onWorkPackage: (i: CoreIndex, w: WorkPackage, e: WorkPackageExtrinsics) => void);
|
|
59
59
|
readonly workPackages: Map<import("@typeberry/numbers").U32, CoreWorkPackage>;
|
|
60
60
|
onStreamMessage(sender: StreamMessageSender, message: BytesBlob): void;
|
|
61
61
|
onClose(streamId: StreamId): void;
|
|
@@ -64,6 +64,6 @@ export declare class ClientHandler implements StreamHandler<typeof STREAM_KIND>
|
|
|
64
64
|
kind: 133 & import("@typeberry/numbers").WithBytesRepresentation<1>;
|
|
65
65
|
onStreamMessage(sender: StreamMessageSender): void;
|
|
66
66
|
onClose(): void;
|
|
67
|
-
sendWorkPackage(sender: StreamMessageSender, coreIndex: CoreIndex, workPackage: WorkPackage, extrinsic:
|
|
67
|
+
sendWorkPackage(sender: StreamMessageSender, coreIndex: CoreIndex, workPackage: WorkPackage, extrinsic: WorkPackageExtrinsics): void;
|
|
68
68
|
}
|
|
69
69
|
//# sourceMappingURL=ce-133-work-package-submission.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ce-133-work-package-submission.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/protocol/ce-133-work-package-submission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"ce-133-work-package-submission.d.ts","sourceRoot":"","sources":["../../../../../../packages/jam/jamnp-s/protocol/ce-133-work-package-submission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,qBAAqB,EAA2B,MAAM,+BAA+B,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,WAAW,EAA2B,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,QAAQ,EAAE,KAAK,mBAAmB,EAAmB,MAAM,aAAa,CAAC;AAE3G;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,+DAAuB,CAAC;AAEhD,qBAAa,eAAgB,SAAQ,SAAS;aAW1B,SAAS,EAAE,SAAS;aACpB,WAAW,EAAE,WAAW;IAX1C,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAGT;IAEH,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,WAAW,CAAC,eAAe,CAAC;IAItE,OAAO;CAMR;AAID,qBAAa,aAAc,YAAW,aAAa,CAAC,OAAO,WAAW,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAF1C,IAAI,gEAAe;gBAEU,aAAa,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,qBAAqB,KAAK,IAAI;IAE5G,SAAgB,YAAY,yDAAwC;IAEpE,eAAe,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI;IAiBtE,OAAO,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAGlC;AAED,qBAAa,aAAc,YAAW,aAAa,CAAC,OAAO,WAAW,CAAC;IACrE,IAAI,gEAAe;IAEnB,eAAe,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI;IAKlD,OAAO,IAAI,IAAI;IAEf,eAAe,CACb,MAAM,EAAE,mBAAmB,EAC3B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,qBAAqB;CAUnC"}
|
|
@@ -5,7 +5,7 @@ import { Credential } from "#@typeberry/block/guarantees.js";
|
|
|
5
5
|
import { RefineContext } from "#@typeberry/block/refine-context.js";
|
|
6
6
|
import { tryAsWorkItemsCount } from "#@typeberry/block/work-package.js";
|
|
7
7
|
import { WorkPackageSpec, WorkReport } from "#@typeberry/block/work-report.js";
|
|
8
|
-
import { WorkExecResult,
|
|
8
|
+
import { WorkExecResult, WorkRefineLoad, WorkResult } from "#@typeberry/block/work-result.js";
|
|
9
9
|
import { Bytes, BytesBlob } from "#@typeberry/bytes";
|
|
10
10
|
import { asKnownSize, FixedSizeArray } from "#@typeberry/collections";
|
|
11
11
|
import { tinyChainSpec } from "#@typeberry/config";
|
|
@@ -36,7 +36,7 @@ const MOCK_WORK_RESULT = WorkResult.create({
|
|
|
36
36
|
codeHash: Bytes.zero(HASH_SIZE).asOpaque(),
|
|
37
37
|
payloadHash: Bytes.zero(HASH_SIZE),
|
|
38
38
|
gas: tryAsServiceGas(1000n),
|
|
39
|
-
result:
|
|
39
|
+
result: WorkExecResult.ok(BytesBlob.empty()),
|
|
40
40
|
load: WorkRefineLoad.create({
|
|
41
41
|
gasUsed: tryAsServiceGas(10000n),
|
|
42
42
|
importedSegments: tryAsU32(1),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-importer.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main-importer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAClC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"main-importer.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/node/main-importer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,MAAM,MAAM,eAAe,GAAG;IAC5B,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,CAAC;AAEF,wBAAsB,YAAY,CAChC,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAClC,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,OAAO,CAAC,CA+ElB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Bytes } from "#@typeberry/bytes";
|
|
2
2
|
import { PvmBackend } from "#@typeberry/config";
|
|
3
|
-
import { initWasm } from "#@typeberry/crypto";
|
|
3
|
+
import { bandersnatch, initWasm } from "#@typeberry/crypto";
|
|
4
4
|
import { Blake2b, HASH_SIZE } from "#@typeberry/hash";
|
|
5
5
|
import { createImporter } from "#@typeberry/importer";
|
|
6
6
|
import { CURRENT_SUITE, CURRENT_VERSION, Result, resultToString } from "#@typeberry/utils";
|
|
@@ -10,9 +10,11 @@ import packageJson from "./package.json" with { type: "json" };
|
|
|
10
10
|
const zeroHash = Bytes.zero(HASH_SIZE).asOpaque();
|
|
11
11
|
export async function mainImporter(config, withRelPath, options = {}) {
|
|
12
12
|
await initWasm();
|
|
13
|
+
const bandesnatchNative = bandersnatch.checkNativeBindings();
|
|
13
14
|
logger.info `🫐 Typeberry ${packageJson.version}. GP: ${CURRENT_VERSION} (${CURRENT_SUITE})`;
|
|
14
15
|
logger.info `🎸 Starting importer: ${config.nodeName}.`;
|
|
15
16
|
logger.info `🖥️ PVM Backend: ${PvmBackend[config.pvmBackend]}.`;
|
|
17
|
+
logger.info `🐇 Bandersnatch ${bandesnatchNative.isOk ? "native 🚀" : `using wasm: ${bandesnatchNative.error}`}`;
|
|
16
18
|
const chainSpec = getChainSpec(config.node.flavor);
|
|
17
19
|
const blake2b = await Blake2b.createHasher();
|
|
18
20
|
const nodeName = config.nodeName;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type { ChainSpec } from "#@typeberry/config";
|
|
1
|
+
import type { ChainSpec, PvmBackend } from "#@typeberry/config";
|
|
2
2
|
import type { BlocksDb, StatesDb } from "#@typeberry/database";
|
|
3
|
+
import type { Blake2b } from "#@typeberry/hash";
|
|
3
4
|
import type { EnumerableState, State } from "#@typeberry/state";
|
|
4
5
|
import type WebSocket from "ws";
|
|
5
6
|
import type { z } from "zod";
|
|
@@ -62,11 +63,14 @@ export type SchemaMapUnknown = Record<MethodName, {
|
|
|
62
63
|
}>;
|
|
63
64
|
export type InputOf<M extends MethodName> = z.infer<SchemaMap[M]["input"]>;
|
|
64
65
|
export type OutputOf<M extends MethodName> = z.infer<SchemaMap[M]["output"]>;
|
|
65
|
-
export
|
|
66
|
+
export interface HandlerContext {
|
|
66
67
|
db: DatabaseContext;
|
|
67
68
|
chainSpec: ChainSpec;
|
|
69
|
+
pvmBackend: PvmBackend;
|
|
70
|
+
blake2b: Blake2b;
|
|
68
71
|
subscription: SubscriptionHandlerApi;
|
|
69
|
-
}
|
|
72
|
+
}
|
|
73
|
+
export type GenericHandler<I, O> = (input: I, context: HandlerContext) => Promise<O>;
|
|
70
74
|
export type Handler<M extends MethodName> = GenericHandler<InputOf<M>, OutputOf<M>>;
|
|
71
75
|
export type HandlerMap = {
|
|
72
76
|
[N in MethodName]: Handler<N>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/rpc-validation/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../packages/jam/rpc-validation/types.ts"],"names":[],"mappings":"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"}
|