Skip to content

Commit 90a1dd8

Browse files
committed
Merge branch 'develop' into feature/enable-proving
# Conflicts: # package-lock.json # packages/sequencer/src/protocol/production/tasks/CircuitCompilerTask.ts
2 parents b88afdb + 2e78899 commit 90a1dd8

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

packages/common/src/config/ModuleContainer.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,8 +454,6 @@ export class ModuleContainer<
454454
);
455455
}
456456

457-
protected createSuperClassAliases(module: any) {}
458-
459457
/**
460458
* This is a placeholder for individual modules to override.
461459
* This method will be called whenever the underlying container fully

packages/common/src/utils.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ export function requireTrue(
1717
}
1818
}
1919

20+
/**
21+
* Utility function to split an array of type T into a record <K, T[]> based on a
22+
* function T => K that determines the key of each record
23+
*/
2024
export function splitArray<T, K extends string | number>(
2125
arr: T[],
2226
split: (t: T) => K

packages/sequencer/src/protocol/production/tasks/CircuitCompilerTask.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ export type CompiledCircuitsRecord = {
2121
runtimeCircuits: VKRecord;
2222
};
2323

24-
type VKRecordLite = Record<string, { vk: { hash: string; data: string } }>;
24+
type VKRecordLite = Record<
25+
string,
26+
{ vk: { hash: string; data: string }; index: string }
27+
>;
2528

2629
export class UndefinedSerializer implements TaskSerializer<undefined> {
2730
public toJSON(parameters: undefined): string {

packages/sequencer/test/settlement/MinaActionsHashList.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import "reflect-metadata";
12
import {
23
ACTIONS_EMPTY_HASH,
34
MinaActions,

0 commit comments

Comments
 (0)