Adapt lib to SessionPolicies type

packages/controller/src/controller.ts

@@ -5,7 +5,6 @@ import { KeychainIFrame, ProfileIFrame } from "./iframe";
 import { NotReadyToConnect } from "./errors";
 import {
   Keychain,
-  Policy,
   ResponseCodes,
   ConnectReply,
   ProbeReply,
@@ -112,7 +111,7 @@ export default class ControllerProvider extends BaseProvider {
 
     try {
       let response = await this.keychain.connect(
-        this.options.policies || [],
+        this.options.policies || {},
         this.rpc.toString(),
       );
       if (response.code !== ResponseCodes.SUCCESS) {
@@ -182,7 +181,7 @@ export default class ControllerProvider extends BaseProvider {
     return true;
   }
 
-  revoke(origin: string, _policy: Policy[]) {
+  revoke(origin: string) {
     if (!this.keychain) {
       console.error(new NotReadyToConnect().message);
       return null;

packages/controller/src/iframe/base.ts

@@ -1,5 +1,5 @@
 import { AsyncMethodReturns, connectToChild } from "@cartridge/penpal";
-import { defaultPresets } from "../presets";
+import { defaultTheme, verifiedConfigs } from "../verified";
 import { ControllerOptions, Modal } from "../types";
 
 export type IFrameOptions<CallSender> = Omit<
@@ -39,7 +39,9 @@ export class IFrame<CallSender extends {}> implements Modal {
       "theme",
       encodeURIComponent(
         JSON.stringify(
-          defaultPresets[theme ?? "cartridge"] ?? defaultPresets.cartridge,
+          theme && theme in verifiedConfigs
+            ? verifiedConfigs[theme]
+            : defaultTheme,
         ),
       ),
     );

packages/controller/src/index.ts

@@ -2,4 +2,4 @@ export { default } from "./controller";
 export * from "./errors";
 export * from "./types";
 
-export { defaultPresets } from "./presets";
+export { defaultTheme } from "./verified";

packages/controller/src/session/account.ts

@@ -7,7 +7,6 @@ import BaseProvider from "../provider";
 
 export * from "../errors";
 export * from "../types";
-export { defaultPresets } from "../presets";
 
 export default class SessionAccount extends WalletAccount {
   public controller: CartridgeSessionAccount;

packages/controller/src/session/index.ts

@@ -2,5 +2,3 @@ export { default } from "./provider";
 export * from "./provider";
 export * from "../errors";
 export * from "../types";
-
-export { defaultPresets } from "../presets";

packages/controller/src/session/provider.ts

@@ -1,10 +1,10 @@
-import { Policy } from "../types";
+import { SessionPolicies } from "../types";
 import { ec, stark, WalletAccount } from "starknet";
 
 import SessionAccount from "./account";
 import { KEYCHAIN_URL } from "../constants";
 import BaseProvider from "../provider";
-import { toWasmPolicies } from "src/utils";
+import { toWasmPolicies } from "../utils";
 
 interface SessionRegistration {
   username: string;
@@ -17,7 +17,7 @@ interface SessionRegistration {
 export type SessionOptions = {
   rpc: string;
   chainId: string;
-  policies: Policy[];
+  policies: SessionPolicies;
   redirectUrl: string;
 };
 
@@ -29,7 +29,7 @@ export default class SessionProvider extends BaseProvider {
 
   protected _username?: string;
   protected _redirectUrl: string;
-  protected _policies: Policy[];
+  protected _policies: SessionPolicies;
 
   constructor({ rpc, chainId, policies, redirectUrl }: SessionOptions) {
     super({ rpc });

packages/controller/src/telegram/provider.ts

@@ -6,8 +6,8 @@ import {
 } from "@telegram-apps/sdk";
 import { ec, stark, WalletAccount } from "starknet";
 
-import { KEYCHAIN_URL } from "src/constants";
-import { Policy } from "src/types";
+import { KEYCHAIN_URL } from "../constants";
+import { SessionPolicies } from "../types";
 import SessionAccount from "src/session/account";
 import BaseProvider from "src/provider";
 import { toWasmPolicies } from "src/utils";
@@ -24,7 +24,7 @@ export default class TelegramProvider extends BaseProvider {
   private _tmaUrl: string;
   protected _chainId: string;
   protected _username?: string;
-  protected _policies: Policy[];
+  protected _policies: SessionPolicies;
 
   constructor({
     rpc,
@@ -34,7 +34,7 @@ export default class TelegramProvider extends BaseProvider {
   }: {
     rpc: string;
     chainId: string;
-    policies: Policy[];
+    policies: SessionPolicies;
     tmaUrl: string;
   }) {
     super({

packages/controller/src/types.ts

@@ -32,7 +32,6 @@ export type VerifiedConfig = {
   theme?: ControllerThemePreset;
 };
 
-/** It must contain one field */
 export type SessionPolicies = {
   /** The key must be the contract address */
   contracts?: ContractPolicies;
@@ -176,7 +175,7 @@ export type ProviderOptions = {
 };
 
 export type KeychainOptions = IFrameOptions & {
-  policies?: SessionPolicies[];
+  policies?: SessionPolicies;
   /** The URL of keychain */
   url?: string;
   /** The origin of keychain */

packages/controller/src/utils.ts

@@ -6,7 +6,7 @@ import {
   typedData,
   TypedDataRevision,
 } from "starknet";
-import { Policy } from "./types";
+import { SessionPolicies } from "./types";
 import wasm from "@cartridge/account-wasm/controller";
 
 export function normalizeCalls(calls: Call | Call[]) {
@@ -19,29 +19,31 @@ export function normalizeCalls(calls: Call | Call[]) {
   });
 }
 
-export function toWasmPolicies(policies: Policy[]): wasm.Policy[] {
-  return policies.map((richPolicy) => {
-    if ("target" in richPolicy) {
-      return {
-        target: richPolicy.target,
-        method: richPolicy.method,
-      };
-    } else {
+export function toWasmPolicies(policies: SessionPolicies): wasm.Policy[] {
+  return [
+    ...Object.entries(policies.contracts ?? {}).flatMap(
+      ([target, { methods }]) =>
+        (Array.isArray(methods) ? methods : [methods]).map((m) => ({
+          target,
+          method: m.name,
+        })),
+    ),
+    ...(policies.messages ?? []).map((p) => {
       const domainHash = typedData.getStructHash(
-        richPolicy.types,
+        p.types,
         "StarknetDomain",
-        richPolicy.domain,
+        p.domain,
         TypedDataRevision.ACTIVE,
       );
       const typeHash = typedData.getTypeHash(
-        richPolicy.types,
-        richPolicy.primaryType,
+        p.types,
+        p.primaryType,
         TypedDataRevision.ACTIVE,
       );
 
       return {
         scope_hash: hash.computePoseidonHash(domainHash, typeHash),
       };
-    }
-  });
+    }),
+  ];
 }

packages/controller/src/verified.ts

@@ -1,5 +1,14 @@
 import { VerifiedConfigs } from "./types";
 
+export const defaultTheme = {
+  name: "Cartridge",
+  icon: "/whitelabel/cartridge/icon.svg",
+  cover: {
+    light: "/whitelabel/cartridge/cover-light.png",
+    dark: "/whitelabel/cartridge/cover-dark.png",
+  },
+};
+
 export const verifiedConfigs: VerifiedConfigs = {
   "force-prime": {
     origin: "",