Skip to content

Commit 9cb20cb

Browse files
JunichiSugiuraJunichiSugiura
committed
Import presets from controller
1 parent 570856e commit 9cb20cb

File tree

18 files changed

+120
-111
lines changed

18 files changed

+120
-111
lines changed

‎package.json

-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
"test:storybook": "pnpm turbo build:deps test:storybook",
3131
"test:storybook:update": "pnpm turbo build:deps test:storybook:update"
3232
},
33-
"dependencies": {
34-
"@cartridge/presets": "github:cartridge-gg/presets#555aa13"
35-
},
3633
"devDependencies": {
3734
"@changesets/changelog-github": "^0.4.2",
3835
"@changesets/cli": "^2.20.0",

‎packages/controller/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
"dependencies": {
6767
"@cartridge/account-wasm": "workspace:*",
6868
"@cartridge/penpal": "catalog:",
69+
"@cartridge/presets": "catalog:",
6970
"@starknet-io/types-js": "catalog:",
7071
"@telegram-apps/sdk": "^2.4.0",
7172
"base64url": "catalog:",

‎packages/keychain/.storybook/mock.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { constants, RpcProvider } from "starknet";
22
import Controller from "@cartridge/controller";
3-
import { SessionPolicies } from "@cartridge/presets";
3+
import { defaultTheme, SessionPolicies } from "@cartridge/controller";
44
import { Parameters } from "@storybook/react";
55
import { ConnectionContextValue } from "../src/components/provider/connection";
66
import { UpgradeInterface } from "../src/hooks/upgrade";
77
import { ConnectCtx, ConnectionCtx } from "../src/utils/connection/types";
8-
import { defaultTheme } from "@cartridge/presets";
98

109
export interface StoryParameters extends Parameters {
1110
connection?: {

‎packages/keychain/.storybook/provider.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { PropsWithChildren } from "react";
22
import { QueryClient, QueryClientProvider } from "react-query";
3-
import { controllerConfigs } from "@cartridge/presets";
3+
import { controllerConfigs } from "@cartridge/controller";
44
import { mainnet } from "@starknet-react/chains";
55
import { StarknetConfig, publicProvider, voyager } from "@starknet-react/core";
66
import { useThemeEffect } from "@cartridge/ui-next";

‎packages/keychain/src/components/connect/CreateSession.stories.tsx

+61-61
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react";
22
import { CreateSession } from "./CreateSession";
33
import { ETH_CONTRACT_ADDRESS } from "@cartridge/utils";
44
import { parseSessionPolicies } from "@/hooks/session";
5-
import { controllerConfigs } from "@cartridge/presets";
5+
import { controllerConfigs } from "@cartridge/controller";
66

77
const meta: Meta<typeof CreateSession> = {
88
component: CreateSession,
@@ -106,72 +106,72 @@ export const Default: Story = {
106106
],
107107
},
108108
"0x047d88C65A627b38d728a783382Af648D79AED80Bf396047F9E839e8501d7F6D":
109-
{
110-
name: "Pillage",
111-
description: "Allows you raid a structure and pillage resources",
112-
methods: [
113-
{
114-
name: "Battle Pillage",
115-
description: "Pillage a structure",
116-
entrypoint: "battle_pillage",
117-
},
118-
],
119-
},
109+
{
110+
name: "Pillage",
111+
description: "Allows you raid a structure and pillage resources",
112+
methods: [
113+
{
114+
name: "Battle Pillage",
115+
description: "Pillage a structure",
116+
entrypoint: "battle_pillage",
117+
},
118+
],
119+
},
120120
"0x001cE27792b23cE379398F5468b69739e89314b2657Cfa3A9c388BDFD33DcFbf":
121-
{
122-
name: "Battle contract",
123-
description: "Required to engage in battles",
124-
methods: [
125-
{
126-
name: "Battle Start",
127-
description: "Start a battle",
128-
entrypoint: "battle_start",
129-
isRequired: true,
130-
},
131-
{
132-
name: "Battle Force Start",
133-
description: "Force start a battle",
134-
entrypoint: "battle_force_start",
135-
},
136-
{
137-
name: "Battle Join",
138-
description: "Join a battle",
139-
entrypoint: "battle_join",
140-
},
141-
],
142-
},
121+
{
122+
name: "Battle contract",
123+
description: "Required to engage in battles",
124+
methods: [
125+
{
126+
name: "Battle Start",
127+
description: "Start a battle",
128+
entrypoint: "battle_start",
129+
isRequired: true,
130+
},
131+
{
132+
name: "Battle Force Start",
133+
description: "Force start a battle",
134+
entrypoint: "battle_force_start",
135+
},
136+
{
137+
name: "Battle Join",
138+
description: "Join a battle",
139+
entrypoint: "battle_join",
140+
},
141+
],
142+
},
143143
"0x04718f5a0Fc34cC1AF16A1cdee98fFB20C31f5cD61D6Ab07201858f4287c938D":
144-
{
145-
name: "STRK Token",
146-
description: "Starknet token contract",
147-
methods: [
148-
{
149-
name: "Mint",
150-
entrypoint: "mint",
151-
},
152-
{
153-
name: "Burn",
154-
entrypoint: "burn",
155-
},
156-
{
157-
name: "Allowance",
158-
entrypoint: "allowance",
159-
},
160-
],
161-
},
144+
{
145+
name: "STRK Token",
146+
description: "Starknet token contract",
147+
methods: [
148+
{
149+
name: "Mint",
150+
entrypoint: "mint",
151+
},
152+
{
153+
name: "Burn",
154+
entrypoint: "burn",
155+
},
156+
{
157+
name: "Allowance",
158+
entrypoint: "allowance",
159+
},
160+
],
161+
},
162162
"0x051Fea4450Da9D6aeE758BDEbA88B2f665bCbf549D2C61421AA724E9AC0Ced8F":
163-
{
164-
methods: [
165-
{
166-
entrypoint: "request_random",
167-
},
168-
],
169-
},
163+
{
164+
methods: [
165+
{
166+
entrypoint: "request_random",
167+
},
168+
],
169+
},
170170
},
171171
messages,
172172
},
173173
}),
174-
onConnect: () => {},
174+
onConnect: () => { },
175175
},
176176
};
177177

@@ -184,6 +184,6 @@ export const WithPreset: Story = {
184184
verified: true,
185185
policies: { ...controllerConfigs["dope-wars"].policies!, messages },
186186
}),
187-
onConnect: () => {},
187+
onConnect: () => { },
188188
},
189189
};

‎packages/keychain/src/components/session/ContractCard.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useConnection } from "@/hooks/connection";
22
import { useCreateSession } from "@/hooks/session";
3-
import type { Method } from "@cartridge/presets";
3+
import type { Method } from "@cartridge/controller";
44
import {
55
CodeIcon,
66
InfoIcon,
@@ -42,7 +42,7 @@ export function ContractCard({
4242
className="text-xs text-foreground-400 cursor-pointer hover:underline"
4343
href={
4444
controller?.chainId() === constants.StarknetChainId.SN_MAIN ||
45-
controller?.chainId() === constants.StarknetChainId.SN_SEPOLIA
45+
controller?.chainId() === constants.StarknetChainId.SN_SEPOLIA
4646
? explorer.contract(address)
4747
: `#`
4848
}

‎packages/keychain/src/components/session/MessageCard.tsx

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useCreateSession } from "@/hooks/session";
2-
import type { SignMessagePolicy } from "@cartridge/presets";
2+
import type { SignMessagePolicy } from "@cartridge/controller";
33
import {
44
Accordion,
55
AccordionContent,
@@ -91,24 +91,24 @@ export function MessageContent({
9191
{/* Domain section */}
9292
{Object.values(m.domain).filter((f) => typeof f !== "undefined")
9393
.length > 0 && (
94-
<CollapsibleRow
95-
key="domain"
96-
title="domain"
97-
enabled={m.authorized ?? true}
98-
>
99-
{m.domain.name && (
100-
<ValueRow
101-
values={[
102-
{
103-
name: "name",
104-
value: m.domain.name,
105-
},
106-
]}
107-
enabled={m.authorized ?? true}
108-
/>
109-
)}
110-
</CollapsibleRow>
111-
)}
94+
<CollapsibleRow
95+
key="domain"
96+
title="domain"
97+
enabled={m.authorized ?? true}
98+
>
99+
{m.domain.name && (
100+
<ValueRow
101+
values={[
102+
{
103+
name: "name",
104+
value: m.domain.name,
105+
},
106+
]}
107+
enabled={m.authorized ?? true}
108+
/>
109+
)}
110+
</CollapsibleRow>
111+
)}
112112

113113
<ValueRow
114114
values={[
@@ -135,13 +135,13 @@ export function MessageContent({
135135
{ name: "type", value: t.type },
136136
...(["enum", "merkletree"].includes(t.name)
137137
? [
138-
{
139-
name: "contains",
140-
value: (
141-
t as StarknetEnumType | StarknetMerkleType
142-
).contains,
143-
},
144-
]
138+
{
139+
name: "contains",
140+
value: (
141+
t as StarknetEnumType | StarknetMerkleType
142+
).contains,
143+
},
144+
]
145145
: []),
146146
]}
147147
enabled={m.authorized ?? true}

‎packages/keychain/src/context/theme.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ControllerTheme } from "@cartridge/presets";
1+
import { ControllerTheme } from "@cartridge/controller";
22
import { createContext } from "react";
33

44
export type VerifiableControllerTheme = ControllerTheme & {

‎packages/keychain/src/hooks/connection.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ import {
1010
ResponseCodes,
1111
toArray,
1212
toSessionPolicies,
13+
defaultTheme,
14+
controllerConfigs,
15+
Policies,
1316
} from "@cartridge/controller";
1417
import {
1518
ConnectionContext,
1619
ConnectionContextValue,
1720
} from "@/components/provider/connection";
1821
import { UpgradeInterface, useUpgrade } from "./upgrade";
19-
import { Policies } from "@cartridge/presets";
20-
import { defaultTheme, controllerConfigs } from "@cartridge/presets";
2122
import { ParsedSessionPolicies, parseSessionPolicies } from "./session";
2223
import { VerifiableControllerTheme } from "@/context/theme";
2324

‎packages/keychain/src/hooks/session.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
type SignMessagePolicy,
66
type TypedDataPolicy,
77
erc20Metadata,
8-
} from "@cartridge/presets";
8+
} from "@cartridge/controller";
99
import { CartridgeIcon, CoinsIcon } from "@cartridge/ui-next";
1010
import React, { createContext, useContext } from "react";
1111
import {

‎packages/keychain/src/utils/connection/connect.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { ConnectReply } from "@cartridge/controller";
1+
import { ConnectReply, Policies } from "@cartridge/controller";
22
import { ConnectCtx, ConnectionCtx } from "./types";
3-
import { Policies } from "@cartridge/presets";
43

54
export function connect({
65
setRpcUrl,

‎packages/keychain/src/utils/connection/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {
44
ExecuteReply,
55
ConnectError,
66
DeployReply,
7+
Policies,
78
} from "@cartridge/controller";
8-
import { Policies } from "@cartridge/presets";
99
import { Call, EstimateFee, Signature, TypedData } from "starknet";
1010

1111
export type ConnectionCtx =

‎packages/profile/src/components/provider/theme.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
defaultTheme,
33
controllerConfigs,
44
ControllerTheme,
5-
} from "@cartridge/presets";
5+
} from "@cartridge/controller";
66
import { useThemeEffect } from "@cartridge/ui-next";
77
import { useCallback, useEffect, useState } from "react";
88
import { useSearchParams } from "react-router-dom";

‎packages/profile/src/context/theme.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { createContext } from "react";
2-
import { defaultTheme, ControllerTheme } from "@cartridge/presets";
2+
import { defaultTheme, ControllerTheme } from "@cartridge/controller";
33

44
export type ColorScheme = "dark" | "light" | "system";
55

‎packages/ui-next/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
},
7272
"devDependencies": {
7373
"@cartridge/eslint": "workspace:^",
74+
"@cartridge/presets": "catalog:",
7475
"@cartridge/tsconfig": "workspace:*",
7576
"@storybook/addon-essentials": "catalog:",
7677
"@storybook/addon-themes": "catalog:",
@@ -107,4 +108,4 @@
107108
"viem": "catalog:"
108109
},
109110
"sideEffects": false
110-
}
111+
}

‎packages/utils/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"viem": "catalog:"
2929
},
3030
"devDependencies": {
31+
"@cartridge/presets": "catalog:",
3132
"@cartridge/tsconfig": "workspace:*",
3233
"@graphql-codegen/cli": "^2.6.2",
3334
"@graphql-codegen/typescript": "^2.4.8",

0 commit comments

Comments
 (0)