- update controller version

- update controller interface
Provable-Games · Oct 24, 2024 · 4dc7220 · 4dc7220
1 parent b908030
commit 4dc7220
Show file tree

Hide file tree

Showing 7 changed files with 198 additions and 41 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.11",
-    "@cartridge/connector": "^0.3.44",
+    "@cartridge/connector": "0.5.0-alpha.0",
     "@dojoengine/create-burner": "^1.0.0-alpha.9",
     "@fontsource/vt323": "^4.5.10",
     "@scure/starknet": "^1.0.0",

diff --git a/ui/src/app/components/onboarding/Sections/WalletSection.tsx b/ui/src/app/components/onboarding/Sections/WalletSection.tsx
@@ -1,10 +1,10 @@
 import { Button } from "@/app/components/buttons/Button";
 import { CompleteIcon } from "@/app/components/icons/Icons";
-import { displayAddress, padAddress, copyToClipboard } from "@/app/lib/utils";
-import { useConnect, useDisconnect } from "@starknet-react/core";
 import useNetworkAccount from "@/app/hooks/useNetworkAccount";
 import useUIStore from "@/app/hooks/useUIStore";
 import { getWalletConnectors } from "@/app/lib/connectors";
+import { copyToClipboard, displayAddress, padAddress } from "@/app/lib/utils";
+import { useConnect, useDisconnect } from "@starknet-react/core";
 
 interface WalletSectionProps {
   step: number;
@@ -18,7 +18,7 @@ const WalletSection = ({ step }: WalletSectionProps) => {
   const isController = useUIStore((state) => state.isController);
 
   const walletConnectors = getWalletConnectors(connectors);
-  const cartridgeConnector = connectors.find(
+  const controllerConnector = connectors.find(
     (connector) => connector.id === "controller"
   );
 
@@ -58,7 +58,7 @@ const WalletSection = ({ step }: WalletSectionProps) => {
           <Button
             onClick={() => {
               disconnect();
-              connect({ connector: cartridgeConnector });
+              connect({ connector: controllerConnector });
             }}
           >
             Login with Cartridge Controller
@@ -80,7 +80,7 @@ const WalletSection = ({ step }: WalletSectionProps) => {
           <Button
             onClick={() => {
               disconnect();
-              connect({ connector: cartridgeConnector });
+              connect({ connector: controllerConnector });
             }}
           >
             Login with Cartridge Controller

diff --git a/ui/src/app/components/profile/ProfileDialog.tsx b/ui/src/app/components/profile/ProfileDialog.tsx
@@ -7,7 +7,7 @@ import useUIStore from "@/app/hooks/useUIStore";
 import { checkCartridgeConnector } from "@/app/lib/connectors";
 import { copyToClipboard, displayAddress, padAddress } from "@/app/lib/utils";
 import { NullAdventurer } from "@/app/types";
-import CartridgeConnector from "@cartridge/connector";
+import ControllerConnector from "@cartridge/connector/controller";
 import { useConnect, useDisconnect } from "@starknet-react/core";
 import { useState } from "react";
 import { MdClose } from "react-icons/md";
@@ -118,7 +118,9 @@ export const ProfileDialog = ({
                 </div>
                 <Button
                   onClick={() =>
-                    (connector as unknown as CartridgeConnector).openMenu()
+                    (
+                      connector as unknown as ControllerConnector
+                    ).controller.openSettings()
                   }
                 >
                   Change Settings

diff --git a/ui/src/app/lib/connectors.ts b/ui/src/app/lib/connectors.ts
@@ -1,6 +1,5 @@
+import ControllerConnector from "@cartridge/connector/controller";
 import { Connector } from "@starknet-react/core";
-import CartridgeConnector from "@cartridge/connector";
-import { shortString } from "starknet";
 // import { WebWalletConnector } from "starknetkit/webwallet";
 
 export const checkArcadeConnector = (connector?: Connector) => {
@@ -49,13 +48,13 @@ export const providerInterfaceCamel = (provider: string) => {
 //   url: argentWebWalletUrl(),
 // });
 
-export const cartridgeConnector = (
+export const controllerConnector = (
   gameAddress: string,
   lordsAddress: string,
   ethAddress: string,
   rpcUrl: string
 ) =>
-  new CartridgeConnector({
+  new ControllerConnector({
     policies: [
       {
         target: gameAddress,
@@ -102,9 +101,6 @@ export const cartridgeConnector = (
         method: "approve",
       },
     ],
-    paymaster: {
-      caller: shortString.encodeShortString("ANY_CALLER"),
-    },
     rpc: rpcUrl,
     theme: "loot-survivor",
   }) as never as Connector;
diff --git a/ui/src/app/page.tsx b/ui/src/app/page.tsx
@@ -66,7 +66,7 @@ import {
 import { useSyscalls } from "@/app/lib/utils/syscalls";
 import { Menu, ZeroUpgrade } from "@/app/types";
 import { useQuery } from "@apollo/client";
-import CartridgeConnector from "@cartridge/connector";
+import ControllerConnector from "@cartridge/connector/controller";
 import { sepolia } from "@starknet-react/chains";
 import { useConnect, useContract, useProvider } from "@starknet-react/core";
 import { useCallback, useEffect, useMemo, useState } from "react";
@@ -276,7 +276,7 @@ function Home() {
   useEffect(() => {
     const init = async () => {
       const username = await (
-        connector as unknown as CartridgeConnector
+        connector as unknown as ControllerConnector
       ).username();
       setUsername(username || "");
       setControllerDelegate("");

diff --git a/ui/src/app/provider.tsx b/ui/src/app/provider.tsx
@@ -1,16 +1,15 @@
 "use client";
-import React from "react";
+import { controllerConnector } from "@/app/lib/connectors";
+import { Chain, mainnet, sepolia } from "@starknet-react/chains";
 import {
+  jsonRpcProvider,
   StarknetConfig,
   starkscan,
-  jsonRpcProvider,
+  useInjectedConnectors,
 } from "@starknet-react/core";
-import { mainnet, sepolia } from "@starknet-react/chains";
-import { Chain } from "@starknet-react/chains";
-import { networkConfig } from "./lib/networkConfig";
+import React from "react";
 import { Network } from "./hooks/useUIStore";
-import { useInjectedConnectors } from "@starknet-react/core";
-import { cartridgeConnector } from "@/app/lib/connectors";
+import { networkConfig } from "./lib/networkConfig";
 
 export function StarknetProvider({
   children,
@@ -38,7 +37,7 @@ export function StarknetProvider({
       chains={[network === "mainnet" ? mainnet : sepolia]}
       connectors={[
         ...connectors,
-        cartridgeConnector(
+        controllerConnector(
           networkConfig[network!].gameAddress,
           networkConfig[network!].lordsAddress,
           networkConfig[network!].ethAddress,