Skip to content

Commit e08880e

Browse files
MartianGreedMartianGreed
authored
chore: bump dojo.c + fix node worker (#447)
1 parent 586caf7 commit e08880e

File tree

6 files changed

+147
-125
lines changed

6 files changed

+147
-125
lines changed

‎.changeset/pretty-waves-listen.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
"@dojoengine/torii-wasm": patch
3+
"@dojoengine/core": patch
4+
"@dojoengine/create-burner": patch
5+
"@dojoengine/create-dojo": patch
6+
"@dojoengine/predeployed-connector": patch
7+
"@dojoengine/react": patch
8+
"@dojoengine/sdk": patch
9+
"@dojoengine/state": patch
10+
"@dojoengine/torii-client": patch
11+
"@dojoengine/utils": patch
12+
"@dojoengine/utils-wasm": patch
13+
---
14+
15+
chore: bump dojo.c + fix node worker

‎examples/example-node-worker/main.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ import {
33
ToriiQueryBuilder,
44
createWorker,
55
init,
6-
type ParsedEntity,
76
getModel,
87
HistoricalToriiQueryBuilder,
9-
StandardizedQueryResult,
8+
type StandardizedQueryResult,
109
} from "@dojoengine/sdk/node";
1110
import { SigningKey } from "@dojoengine/torii-wasm/node";
1211
import { dojoConfig } from "./dojoConfig.ts";
@@ -16,12 +15,12 @@ import {
1615
type SchemaType,
1716
} from "./src/typescript/models.gen.ts";
1817
import { addAddressPadding, type BigNumberish } from "starknet";
19-
import { w3cwebsocket } from "websocket";
18+
import ws from "websocket";
2019
import { env } from "./env.ts";
2120

2221
// Those lines are require so that websocket works.
2322
// @ts-ignore
24-
global.Websocket = w3cwebsocket;
23+
global.Websocket = ws.w3cwebsocket;
2524
// @ts-ignore
2625
global.WorkerGlobalScope = global;
2726

@@ -39,7 +38,7 @@ const sdk = await init({
3938
},
4039

4140
identity: env.IDENTITY,
42-
signer: SigningKey.fromSecretScalar(env.SECRET_KEY),
41+
signer: new SigningKey(env.SECRET_KEY),
4342
});
4443

4544
type PositionCount = {

‎examples/example-node-worker/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"bun": "IDENTITY=0x0127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec SECRET_KEY=0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912 bun run main.ts",
8-
"node": "IDENTITY=0x0127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec SECRET_KEY=0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912 node main.ts",
8+
"node": "IDENTITY=0x0127fd5f1fe78a71f8bcd1fec63e3fe2f0486b6ecd5c86a0466c3a21fa5cfcec SECRET_KEY=0xc5b2fcab997346f3ea1c00b002ecf6f382c5f9c9659a3894eb783c5320f912 node --experimental-transform-types main.ts ",
99
"build": "tsc -b"
1010
},
1111
"dependencies": {

‎examples/example-node-worker/src/typescript/models.gen.ts

Lines changed: 125 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,180 @@
11
import type { SchemaType as ISchemaType } from "@dojoengine/sdk";
22

3-
import { CairoCustomEnum, CairoOption, CairoOptionVariant, BigNumberish } from 'starknet';
3+
import {
4+
CairoCustomEnum,
5+
CairoOption,
6+
CairoOptionVariant,
7+
type BigNumberish,
8+
} from "starknet";
49

510
// Type definition for `dojo_starter::models::DirectionsAvailable` struct
611
export interface DirectionsAvailable {
7-
player: string;
8-
directions: Array<DirectionEnum>;
12+
player: string;
13+
directions: Array<DirectionEnum>;
914
}
1015

1116
// Type definition for `dojo_starter::models::DirectionsAvailableValue` struct
1217
export interface DirectionsAvailableValue {
13-
directions: Array<DirectionEnum>;
18+
directions: Array<DirectionEnum>;
1419
}
1520

1621
// Type definition for `dojo_starter::models::Moves` struct
1722
export interface Moves {
18-
player: string;
19-
remaining: BigNumberish;
20-
last_direction: CairoOption<DirectionEnum>;
21-
can_move: boolean;
23+
player: string;
24+
remaining: BigNumberish;
25+
last_direction: CairoOption<DirectionEnum>;
26+
can_move: boolean;
2227
}
2328

2429
// Type definition for `dojo_starter::models::MovesValue` struct
2530
export interface MovesValue {
26-
remaining: BigNumberish;
27-
last_direction: CairoOption<DirectionEnum>;
28-
can_move: boolean;
31+
remaining: BigNumberish;
32+
last_direction: CairoOption<DirectionEnum>;
33+
can_move: boolean;
2934
}
3035

3136
// Type definition for `dojo_starter::models::Position` struct
3237
export interface Position {
33-
player: string;
34-
vec: Vec2;
38+
player: string;
39+
vec: Vec2;
3540
}
3641

3742
// Type definition for `dojo_starter::models::PositionCount` struct
3843
export interface PositionCount {
39-
identity: string;
40-
positition: Array<[BigNumberish, BigNumberish]>;
44+
identity: string;
45+
positition: Array<[BigNumberish, BigNumberish]>;
4146
}
4247

4348
// Type definition for `dojo_starter::models::PositionCountValue` struct
4449
export interface PositionCountValue {
45-
positition: Array<[BigNumberish, BigNumberish]>;
50+
positition: Array<[BigNumberish, BigNumberish]>;
4651
}
4752

4853
// Type definition for `dojo_starter::models::PositionValue` struct
4954
export interface PositionValue {
50-
vec: Vec2;
55+
vec: Vec2;
5156
}
5257

5358
// Type definition for `dojo_starter::models::Vec2` struct
5459
export interface Vec2 {
55-
x: BigNumberish;
56-
y: BigNumberish;
60+
x: BigNumberish;
61+
y: BigNumberish;
5762
}
5863

5964
// Type definition for `dojo_starter::systems::actions::actions::Moved` struct
6065
export interface Moved {
61-
player: string;
62-
direction: DirectionEnum;
66+
player: string;
67+
direction: DirectionEnum;
6368
}
6469

6570
// Type definition for `dojo_starter::systems::actions::actions::MovedValue` struct
6671
export interface MovedValue {
67-
direction: DirectionEnum;
72+
direction: DirectionEnum;
6873
}
6974

7075
// Type definition for `dojo_starter::models::Direction` enum
71-
export const direction = [
72-
'Left',
73-
'Right',
74-
'Up',
75-
'Down',
76-
] as const;
77-
export type Direction = { [key in typeof direction[number]]: string };
76+
export const direction = ["Left", "Right", "Up", "Down"] as const;
77+
export type Direction = { [key in (typeof direction)[number]]: string };
7878
export type DirectionEnum = CairoCustomEnum;
7979

8080
export interface SchemaType extends ISchemaType {
81-
dojo_starter: {
82-
DirectionsAvailable: DirectionsAvailable,
83-
DirectionsAvailableValue: DirectionsAvailableValue,
84-
Moves: Moves,
85-
MovesValue: MovesValue,
86-
Position: Position,
87-
PositionCount: PositionCount,
88-
PositionCountValue: PositionCountValue,
89-
PositionValue: PositionValue,
90-
Vec2: Vec2,
91-
Moved: Moved,
92-
MovedValue: MovedValue,
93-
},
81+
dojo_starter: {
82+
DirectionsAvailable: DirectionsAvailable;
83+
DirectionsAvailableValue: DirectionsAvailableValue;
84+
Moves: Moves;
85+
MovesValue: MovesValue;
86+
Position: Position;
87+
PositionCount: PositionCount;
88+
PositionCountValue: PositionCountValue;
89+
PositionValue: PositionValue;
90+
Vec2: Vec2;
91+
Moved: Moved;
92+
MovedValue: MovedValue;
93+
};
9494
}
9595
export const schema: SchemaType = {
96-
dojo_starter: {
97-
DirectionsAvailable: {
98-
player: "",
99-
directions: [new CairoCustomEnum({
100-
Left: "",
101-
Right: undefined,
102-
Up: undefined,
103-
Down: undefined, })],
104-
},
105-
DirectionsAvailableValue: {
106-
directions: [new CairoCustomEnum({
107-
Left: "",
108-
Right: undefined,
109-
Up: undefined,
110-
Down: undefined, })],
111-
},
112-
Moves: {
113-
player: "",
114-
remaining: 0,
115-
last_direction: new CairoOption(CairoOptionVariant.None),
116-
can_move: false,
117-
},
118-
MovesValue: {
119-
remaining: 0,
120-
last_direction: new CairoOption(CairoOptionVariant.None),
121-
can_move: false,
122-
},
123-
Position: {
124-
player: "",
125-
vec: { x: 0, y: 0, },
126-
},
127-
PositionCount: {
128-
identity: "",
129-
positition: [[0, 0]],
130-
},
131-
PositionCountValue: {
132-
positition: [[0, 0]],
133-
},
134-
PositionValue: {
135-
vec: { x: 0, y: 0, },
136-
},
137-
Vec2: {
138-
x: 0,
139-
y: 0,
140-
},
141-
Moved: {
142-
player: "",
143-
direction: new CairoCustomEnum({
144-
Left: "",
145-
Right: undefined,
146-
Up: undefined,
147-
Down: undefined, }),
148-
},
149-
MovedValue: {
150-
direction: new CairoCustomEnum({
151-
Left: "",
152-
Right: undefined,
153-
Up: undefined,
154-
Down: undefined, }),
155-
},
156-
},
96+
dojo_starter: {
97+
DirectionsAvailable: {
98+
player: "",
99+
directions: [
100+
new CairoCustomEnum({
101+
Left: "",
102+
Right: undefined,
103+
Up: undefined,
104+
Down: undefined,
105+
}),
106+
],
107+
},
108+
DirectionsAvailableValue: {
109+
directions: [
110+
new CairoCustomEnum({
111+
Left: "",
112+
Right: undefined,
113+
Up: undefined,
114+
Down: undefined,
115+
}),
116+
],
117+
},
118+
Moves: {
119+
player: "",
120+
remaining: 0,
121+
last_direction: new CairoOption(CairoOptionVariant.None),
122+
can_move: false,
123+
},
124+
MovesValue: {
125+
remaining: 0,
126+
last_direction: new CairoOption(CairoOptionVariant.None),
127+
can_move: false,
128+
},
129+
Position: {
130+
player: "",
131+
vec: { x: 0, y: 0 },
132+
},
133+
PositionCount: {
134+
identity: "",
135+
positition: [[0, 0]],
136+
},
137+
PositionCountValue: {
138+
positition: [[0, 0]],
139+
},
140+
PositionValue: {
141+
vec: { x: 0, y: 0 },
142+
},
143+
Vec2: {
144+
x: 0,
145+
y: 0,
146+
},
147+
Moved: {
148+
player: "",
149+
direction: new CairoCustomEnum({
150+
Left: "",
151+
Right: undefined,
152+
Up: undefined,
153+
Down: undefined,
154+
}),
155+
},
156+
MovedValue: {
157+
direction: new CairoCustomEnum({
158+
Left: "",
159+
Right: undefined,
160+
Up: undefined,
161+
Down: undefined,
162+
}),
163+
},
164+
},
157165
};
158166
export enum ModelsMapping {
159-
Direction = 'dojo_starter-Direction',
160-
DirectionsAvailable = 'dojo_starter-DirectionsAvailable',
161-
DirectionsAvailableValue = 'dojo_starter-DirectionsAvailableValue',
162-
Moves = 'dojo_starter-Moves',
163-
MovesValue = 'dojo_starter-MovesValue',
164-
Position = 'dojo_starter-Position',
165-
PositionCount = 'dojo_starter-PositionCount',
166-
PositionCountValue = 'dojo_starter-PositionCountValue',
167-
PositionValue = 'dojo_starter-PositionValue',
168-
Vec2 = 'dojo_starter-Vec2',
169-
Moved = 'dojo_starter-Moved',
170-
MovedValue = 'dojo_starter-MovedValue',
171-
}
167+
Direction = "dojo_starter-Direction",
168+
DirectionsAvailable = "dojo_starter-DirectionsAvailable",
169+
DirectionsAvailableValue = "dojo_starter-DirectionsAvailableValue",
170+
Moves = "dojo_starter-Moves",
171+
MovesValue = "dojo_starter-MovesValue",
172+
Position = "dojo_starter-Position",
173+
PositionCount = "dojo_starter-PositionCount",
174+
PositionCountValue = "dojo_starter-PositionCountValue",
175+
PositionValue = "dojo_starter-PositionValue",
176+
Vec2 = "dojo_starter-Vec2",
177+
Moved = "dojo_starter-Moved",
178+
MovedValue = "dojo_starter-MovedValue",
179+
}
180+

‎examples/example-node-worker/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
"skipLibCheck": true,
1212
"strict": true,
1313
"strictNullChecks": true,
14-
"esModuleInterop": true,
15-
"allowImportingTsExtensions": true
14+
"esModuleInterop": true
1615
},
1716
"include": ["../*.ts"],
1817
"references": []

‎packages/torii-wasm/dojo.c

0 commit comments

Comments
 (0)