-
- );
- }
-
- return (
-
-
- Oops! Something went wrong parsing session summary
- Please try it again.
-
- {Object.entries(summary.dojo).map(([address, { methods, meta }]) => (
-
-
-
- )
- }
- />
- ))}
-
- {Object.entries(summary.ERC721).map(([address, { methods }]) => (
-
-
- );
-}
-
-function Contract({
- address,
- title,
- methods: _methods,
- icon =
-
-
-
-
-
- {c.description}
-
-
- )}
-
- {c.name}
-
- {c.description && (
-
-
- {title}
-
-
- );
-}
diff --git a/packages/keychain/src/components/connect/CreateSession.stories.tsx b/packages/keychain/src/components/connect/CreateSession.stories.tsx
index f5341d698..a2409567b 100644
--- a/packages/keychain/src/components/connect/CreateSession.stories.tsx
+++ b/packages/keychain/src/components/connect/CreateSession.stories.tsx
@@ -1,5 +1,8 @@
import type { Meta, StoryObj } from "@storybook/react";
import { CreateSession } from "./CreateSession";
+import { ETH_CONTRACT_ADDRESS } from "@cartridge/utils";
+import { parseSessionPolicies } from "hooks/session";
+import { controllerConfigs } from "@cartridge/presets";
const meta: Meta
- {values.map((f) => (
-
-
- {f.name}: {f.value}
-
- ))}
-
+
+ {title}
+
+
+ );
+}
diff --git a/packages/keychain/src/components/session/UnverifiedSessionSummary.tsx b/packages/keychain/src/components/session/UnverifiedSessionSummary.tsx
new file mode 100644
index 000000000..56f7612dc
--- /dev/null
+++ b/packages/keychain/src/components/session/UnverifiedSessionSummary.tsx
@@ -0,0 +1,49 @@
+import React from "react";
+import { CardIcon, CoinsIcon, ScrollIcon } from "@cartridge/ui-next";
+import { toArray } from "@cartridge/controller";
+import { ParsedSessionPolicies } from "hooks/session";
+
+import { MessageCard } from "./MessageCard";
+import { ContractCard } from "./ContractCard";
+
+export function UnverifiedSessionSummary({
+ policies,
+}: {
+ policies: ParsedSessionPolicies;
+}) {
+ return (
+
+ {values.map((f) => (
+
+
+ {f.name}: {f.value}
+
+ ))}
+
+ {Object.entries(policies.contracts ?? {}).map(([address, contract]) => {
+ const methods = toArray(contract.methods);
+ const title = !contract.meta
+ ? "Contract"
+ : `${contract.meta.name} token`;
+ const icon = !contract.meta ? (
+
+
+ ) : contract.meta.logoUrl ? (
+
+
+ );
+
+ return (
+
+ );
+}
diff --git a/packages/keychain/src/components/session/VerifiedSessionSummary.tsx b/packages/keychain/src/components/session/VerifiedSessionSummary.tsx
new file mode 100644
index 000000000..f05a5e5f5
--- /dev/null
+++ b/packages/keychain/src/components/session/VerifiedSessionSummary.tsx
@@ -0,0 +1,20 @@
+import React from "react";
+import { ParsedSessionPolicies } from "hooks/session";
+import { CodeIcon } from "@cartridge/ui";
+import { AggregateCard } from "./AggregateCard";
+
+export function VerifiedSessionSummary({
+ game,
+ policies,
+}: {
+ game: String;
+ policies: ParsedSessionPolicies;
+}) {
+ return (
+
{icon}
-
+
+
) : (
(
{src ? (
) : props.children ? (
diff --git a/packages/utils/src/hooks/contract.ts b/packages/utils/src/hooks/contract.ts
deleted file mode 100644
index 40d77d443..000000000
--- a/packages/utils/src/hooks/contract.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import { getChecksumAddress, Provider } from "starknet";
-import useSWR from "swr";
-import { useEkuboMetadata } from "./balance";
-import { ERC20Metadata } from "../erc20";
-import { stringFromByteArray } from "../contract";
-import {
- ContractPolicies,
- ContractPolicy,
- SessionPolicies,
- SignMessagePolicy,
-} from "@cartridge/presets";
-
-export type SessionSummary = {
- default: ContractPolicies;
- dojo: Record;
- ERC20: Record<
- string,
- ContractPolicy & { meta?: Omit }
- >;
- ERC721: ContractPolicies;
- messages: SignMessagePolicy[] | undefined;
-};
-
-type ContractType = keyof SessionSummary;
-
-export function useSessionSummary({
- policies,
- provider,
-}: {
- policies: SessionPolicies;
- provider?: Provider;
-}) {
- const ekuboMeta = useEkuboMetadata();
-
- const res: SessionSummary = {
- default: {},
- dojo: {},
- ERC20: {},
- ERC721: {},
- messages: policies.messages,
- };
- const summary = useSWR(
- ekuboMeta && provider ? `tx-summary` : null,
- async () => {
- if (!provider) return res;
-
- const promises = Object.entries(policies.contracts ?? []).map(
- async ([contractAddress, policies]) => {
- const contractType = await checkContractType(
- provider,
- contractAddress,
- );
- switch (contractType) {
- case "ERC20":
- const meta = ekuboMeta.find(
- (m) =>
- getChecksumAddress(m.l2_token_address) ===
- getChecksumAddress(contractAddress),
- );
-
- res.ERC20[contractAddress] = {
- meta: meta && {
- address: contractAddress,
- name: meta.name,
- symbol: meta.symbol,
- decimals: meta.decimals,
- },
- ...policies,
- };
- return;
- case "ERC721":
- res.ERC721[contractAddress] = policies;
- return;
- case "default":
- default: {
- try {
- const dojoNameRes = await provider.callContract({
- contractAddress,
- entrypoint: "dojo_name",
- });
-
- res.dojo[contractAddress] = {
- meta: { dojoName: stringFromByteArray(dojoNameRes) },
- ...policies,
- };
- } catch {
- res.default[contractAddress] = policies;
- }
- return;
- }
- }
- },
- );
- await Promise.all(promises);
-
- return res;
- },
- {
- fallbackData: res,
- },
- );
-
- return summary;
-}
-
-// TODO: What the id?
-const IERC20_ID = "";
-const IERC721_ID =
- "0x33eb2f84c309543403fd69f0d0f363781ef06ef6faeb0131ff16ea3175bd943";
-
-async function checkContractType(
- provider: Provider,
- contractAddress: string,
-): Promise {
- try {
- // SNIP-5: check with via `support_interface` method
- const [erc20Res] = await provider.callContract({
- contractAddress,
- entrypoint: "supports_interface",
- calldata: [IERC20_ID], // ERC20 interface ID
- });
- if (!!erc20Res) {
- return "ERC20";
- }
-
- const [erc721Res] = await provider.callContract({
- contractAddress,
- entrypoint: "supports_interface",
- calldata: [IERC721_ID], // ERC721 interface ID
- });
- if (!!erc721Res) {
- return "ERC721";
- }
-
- return "default";
- } catch {
- try {
- await provider.callContract({
- contractAddress,
- entrypoint: "balanceOf",
- calldata: ["0x0"], // ERC721 interface ID
- });
-
- try {
- await provider.callContract({
- contractAddress,
- entrypoint: "decimals",
- });
-
- return "ERC20";
- } catch {
- await provider.callContract({
- contractAddress,
- entrypoint: "tokenId",
- calldata: ["0x0"],
- });
-
- return "ERC721";
- }
- } catch {
- return "default";
- }
- }
-}
diff --git a/packages/utils/src/hooks/index.ts b/packages/utils/src/hooks/index.ts
index fcc5b674a..e3f8abf55 100644
--- a/packages/utils/src/hooks/index.ts
+++ b/packages/utils/src/hooks/index.ts
@@ -1,4 +1,3 @@
export * from "./api";
export * from "./balance";
-export * from "./contract";
export * from "./countervalue";
diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json
index 150dc0e07..3e4bbc588 100644
--- a/packages/utils/tsconfig.json
+++ b/packages/utils/tsconfig.json
@@ -6,7 +6,5 @@
"rootDir": "./src",
"outDir": "./dist"
},
- "include": [
- "src/**/*"
- ]
+ "include": ["src/**/*"]
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9bab76ece..5ddfa8e79 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -467,6 +467,9 @@ importers:
'@types/node':
specifier: ^20.11.0
version: 20.16.11
+ starknet:
+ specifier: 6.11.0
+ version: 6.11.0
tsx:
specifier: ^4.7.0
version: 4.19.2