Skip to content

Commit b79efcb

Browse files
authored
0.6.7 updates (#344)
* update privileged service and parallel accumulate * storage key type to Data, accounts updates, add lastAccOut * configs, recent hsitory * update pvm invocations * update lastAccAt * fix history item * remove wrong change * update submodules * clearer error name * update jamtestvectors * update jamduna * fix * fix stats tests * fix * regenerate chainspecs * fix memory tests
1 parent 9fd6011 commit b79efcb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+921
-764
lines changed

Blockchain/Sources/Blockchain/Config/ProtocolConfig+Preset.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extension Ref where T == ProtocolConfig {
4848
erasureCodedPieceSize: 2,
4949
maxWorkPackageImports: 3072,
5050
maxWorkPackageExports: 3072,
51-
maxEncodedWorkPackageSize: 12 * 1 << 20,
51+
maxEncodedWorkPackageSize: 13_794_305,
5252
segmentSize: 4104,
5353
maxWorkReportBlobSize: 48 * 1 << 10,
5454
erasureCodedSegmentSize: 6,
@@ -93,7 +93,7 @@ extension Ref where T == ProtocolConfig {
9393
erasureCodedPieceSize: 684,
9494
maxWorkPackageImports: 3072,
9595
maxWorkPackageExports: 3072,
96-
maxEncodedWorkPackageSize: 12 * 1 << 20,
96+
maxEncodedWorkPackageSize: 13_794_305,
9797
segmentSize: 4104,
9898
maxWorkReportBlobSize: 48 * 1 << 10,
9999
erasureCodedSegmentSize: 6,
@@ -137,7 +137,7 @@ extension Ref where T == ProtocolConfig {
137137
erasureCodedPieceSize: 4,
138138
maxWorkPackageImports: 3072,
139139
maxWorkPackageExports: 3072,
140-
maxEncodedWorkPackageSize: 12 * 1 << 20,
140+
maxEncodedWorkPackageSize: 13_794_305,
141141
segmentSize: 4104,
142142
maxWorkReportBlobSize: 48 * 1 << 10,
143143
erasureCodedSegmentSize: 1026,
@@ -181,7 +181,7 @@ extension Ref where T == ProtocolConfig {
181181
erasureCodedPieceSize: 8,
182182
maxWorkPackageImports: 3072,
183183
maxWorkPackageExports: 3072,
184-
maxEncodedWorkPackageSize: 12 * 1 << 20,
184+
maxEncodedWorkPackageSize: 13_794_305,
185185
segmentSize: 4104,
186186
maxWorkReportBlobSize: 48 * 1 << 10,
187187
erasureCodedSegmentSize: 513,
@@ -225,7 +225,7 @@ extension Ref where T == ProtocolConfig {
225225
erasureCodedPieceSize: 12,
226226
maxWorkPackageImports: 3072,
227227
maxWorkPackageExports: 3072,
228-
maxEncodedWorkPackageSize: 12 * 1 << 20,
228+
maxEncodedWorkPackageSize: 13_794_305,
229229
segmentSize: 4104,
230230
maxWorkReportBlobSize: 48 * 1 << 10,
231231
erasureCodedSegmentSize: 342,
@@ -269,7 +269,7 @@ extension Ref where T == ProtocolConfig {
269269
erasureCodedPieceSize: 24,
270270
maxWorkPackageImports: 3072,
271271
maxWorkPackageExports: 3072,
272-
maxEncodedWorkPackageSize: 12 * 1 << 20,
272+
maxEncodedWorkPackageSize: 13_794_305,
273273
segmentSize: 4104,
274274
maxWorkReportBlobSize: 48 * 1 << 10,
275275
erasureCodedSegmentSize: 171,
@@ -313,7 +313,7 @@ extension Ref where T == ProtocolConfig {
313313
erasureCodedPieceSize: 72,
314314
maxWorkPackageImports: 3072,
315315
maxWorkPackageExports: 3072,
316-
maxEncodedWorkPackageSize: 12 * 1 << 20,
316+
maxEncodedWorkPackageSize: 13_794_305,
317317
segmentSize: 4104,
318318
maxWorkReportBlobSize: 48 * 1 << 10,
319319
erasureCodedSegmentSize: 57,
@@ -357,7 +357,7 @@ extension Ref where T == ProtocolConfig {
357357
erasureCodedPieceSize: 228,
358358
maxWorkPackageImports: 3072,
359359
maxWorkPackageExports: 3072,
360-
maxEncodedWorkPackageSize: 12 * 1 << 20,
360+
maxEncodedWorkPackageSize: 13_794_305,
361361
segmentSize: 4104,
362362
maxWorkReportBlobSize: 48 * 1 << 10,
363363
erasureCodedSegmentSize: 18,
@@ -401,7 +401,7 @@ extension Ref where T == ProtocolConfig {
401401
erasureCodedPieceSize: 456,
402402
maxWorkPackageImports: 3072,
403403
maxWorkPackageExports: 3072,
404-
maxEncodedWorkPackageSize: 12 * 1 << 20,
404+
maxEncodedWorkPackageSize: 13_794_305,
405405
segmentSize: 4104,
406406
maxWorkReportBlobSize: 48 * 1 << 10,
407407
erasureCodedSegmentSize: 9,
@@ -445,7 +445,7 @@ extension Ref where T == ProtocolConfig {
445445
erasureCodedPieceSize: 684,
446446
maxWorkPackageImports: 3072,
447447
maxWorkPackageExports: 3072,
448-
maxEncodedWorkPackageSize: 12 * 1 << 20,
448+
maxEncodedWorkPackageSize: 13_794_305,
449449
segmentSize: 4104,
450450
maxWorkReportBlobSize: 48 * 1 << 10,
451451
erasureCodedSegmentSize: 6,

Blockchain/Sources/Blockchain/Config/ProtocolConfig.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public struct ProtocolConfig: Sendable, Codable, Equatable {
8686
/// WA = 64,000: The maximum size of is-authorized code in octets.
8787
public var maxIsAuthorizedCodeSize: Int
8888

89-
/// WB = 12 * 2^20: The maximum size of an encoded work-package together with its extrinsic data and import implications, in octets.
89+
/// WB = 13,794,305: The maximum size of an encoded work-package together with its extrinsic data and import implications, in octets.
9090
public var maxEncodedWorkPackageSize: Int
9191

9292
/// WC = 4,000,000: The maximum size of service code in octets.

Blockchain/Sources/Blockchain/RuntimeProtocols/AccumulateFunction.swift

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public struct DeferredTransfers: Codable {
4141
}
4242
}
4343

44-
/// U: a characterization (i.e. values capable of representing) of state components
45-
/// which are both needed and mutable by the accumulation process.
44+
/// Characterization (i.e. values capable of representing) of state components
45+
/// which are both needed and mutable by the accumulation process.
4646
public struct AccumulateState {
4747
/// d (all service accounts)
4848
public var accounts: ServiceAccountsMutRef
@@ -58,8 +58,14 @@ public struct AccumulateState {
5858
>,
5959
ProtocolConfig.TotalNumberOfCores
6060
>
61-
/// x
62-
public var privilegedServices: PrivilegedServices
61+
// m
62+
public var manager: ServiceIndex
63+
// a
64+
public var assigners: ConfigFixedSizeArray<ServiceIndex, ProtocolConfig.TotalNumberOfCores>
65+
// v
66+
public var delegator: ServiceIndex
67+
// z
68+
public var alwaysAcc: [ServiceIndex: Gas]
6369

6470
public var entropy: Data32 // eta'_0
6571

@@ -68,7 +74,10 @@ public struct AccumulateState {
6874
accounts: ServiceAccountsMutRef(accounts.value),
6975
validatorQueue: validatorQueue,
7076
authorizationQueue: authorizationQueue,
71-
privilegedServices: privilegedServices,
77+
manager: manager,
78+
assigners: assigners,
79+
delegator: delegator,
80+
alwaysAcc: alwaysAcc,
7281
entropy: entropy
7382
)
7483
}

0 commit comments

Comments
 (0)