diff --git a/examples/example-vite-react-sql/package.json b/examples/example-vite-react-sql/package.json index ce68ee53..11b44d15 100644 --- a/examples/example-vite-react-sql/package.json +++ b/examples/example-vite-react-sql/package.json @@ -25,6 +25,7 @@ "drizzle-kit": "^0.30.1", "postcss": "^8.4.49", "tailwindcss": "^3.4.17", + "typescript": "^5.6.2", "vite": "^6.0.7", "vite-plugin-top-level-await": "^1.4.4", "vite-plugin-wasm": "^3.4.1" diff --git a/packages/create-burner/package.json b/packages/create-burner/package.json index 5261d4ff..faed48f4 100644 --- a/packages/create-burner/package.json +++ b/packages/create-burner/package.json @@ -42,9 +42,9 @@ "dependencies": { "@dojoengine/core": "workspace:*", "@scure/bip32": "^1.5.0", - "@starknet-react/core": "2.3.0", + "@starknet-react/core": "catalog:", "encoding": "^0.1.13", - "get-starknet-core": "^3.3.3", + "get-starknet-core": "catalog:", "js-cookie": "^3.0.5" } } diff --git a/packages/create-burner/src/connectors/burner.ts b/packages/create-burner/src/connectors/burner.ts index 5a808152..93b90bd4 100644 --- a/packages/create-burner/src/connectors/burner.ts +++ b/packages/create-burner/src/connectors/burner.ts @@ -1,4 +1,5 @@ import { Connector } from "@starknet-react/core"; +import { StarknetWindowObject } from "get-starknet-core"; import { Account, AccountInterface, shortString } from "starknet"; import { katanaIcon } from "./icons"; @@ -16,12 +17,8 @@ interface BurnerConnectorOptions { /** Non exported types from @starknet-react/core*/ /** Connector icons, as base64 encoded svg. */ -type ConnectorIcons = { - /** Dark-mode icon. */ - dark?: string; - /** Light-mode icon. */ - light?: string; -}; +type ConnectorIcons = StarknetWindowObject["icon"]; + /** Connector data. */ type ConnectorData = { /** Connector account. */ @@ -104,4 +101,16 @@ export class BurnerConnector extends Connector { } ); } + + async request(call: any) { + switch (call.type) { + case "wallet_requestAccounts": { + return [this._account.address]; + } + default: + throw new Error( + `BurnerConnector: request not implemented [${call.type}]` + ); + } + } } diff --git a/packages/create-burner/src/connectors/dojoBurnerSWO.ts b/packages/create-burner/src/connectors/dojoBurnerSWO.ts index 45e6979d..39e1f73b 100644 --- a/packages/create-burner/src/connectors/dojoBurnerSWO.ts +++ b/packages/create-burner/src/connectors/dojoBurnerSWO.ts @@ -1,4 +1,4 @@ -import { IStarknetWindowObject } from "get-starknet-core"; +import { StarknetWindowObject } from "get-starknet-core"; import { AccountInterface, RpcProvider } from "starknet"; import { BurnerManager } from ".."; @@ -8,7 +8,7 @@ const ID = "dojoburner"; const NAME = "Dojo Burner"; const VERSION = "0.0.1"; -export class DojoBurnerStarknetWindowObject implements IStarknetWindowObject { +export class DojoBurnerStarknetWindowObject implements StarknetWindowObject { id = ID; name = NAME; icon = katanaIcon; diff --git a/packages/create-burner/src/connectors/dojoPredeployedSWO.ts b/packages/create-burner/src/connectors/dojoPredeployedSWO.ts index da91811e..30250b19 100644 --- a/packages/create-burner/src/connectors/dojoPredeployedSWO.ts +++ b/packages/create-burner/src/connectors/dojoPredeployedSWO.ts @@ -1,4 +1,4 @@ -import { IStarknetWindowObject } from "get-starknet-core"; +import { StarknetWindowObject } from "get-starknet-core"; import { AccountInterface, RpcProvider } from "starknet"; import { PredeployedManager } from ".."; @@ -9,7 +9,7 @@ const NAME = "Dojo Predeployed"; const VERSION = "0.0.1"; export class DojoPredeployedStarknetWindowObject - implements IStarknetWindowObject + implements StarknetWindowObject { id = ID; name = NAME; diff --git a/packages/react/package.json b/packages/react/package.json index 1b295800..7c053b97 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -41,7 +41,7 @@ "@latticexyz/utils": "^2.2.8", "encoding": "^0.1.13", "fast-deep-equal": "^3.1.3", - "get-starknet-core": "^3.3.3", + "get-starknet-core": "catalog:", "js-cookie": "^3.0.5", "rxjs": "7.5.5", "zustand": "^4.5.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4deacdf1..d79dd3ff 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,6 +12,9 @@ catalogs: '@starknet-react/core': specifier: ^3.6.2 version: 3.6.2 + get-starknet-core: + specifier: ^4.0.0 + version: 4.0.0 starknet: specifier: 6.21.0 version: 6.21.0 @@ -887,6 +890,9 @@ importers: tailwindcss: specifier: ^3.4.17 version: 3.4.17 + typescript: + specifier: ^5.6.2 + version: 5.7.2 vite: specifier: ^6.0.7 version: 6.0.7(@types/node@22.10.5)(jiti@2.4.2)(terser@5.37.0)(tsx@4.19.2)(yaml@2.7.0) @@ -1243,14 +1249,14 @@ importers: specifier: ^1.5.0 version: 1.6.0 '@starknet-react/core': - specifier: 2.3.0 - version: 2.3.0(get-starknet-core@3.3.4(starknet@6.21.0(encoding@0.1.13)))(react@18.3.1)(starknet@6.21.0(encoding@0.1.13)) + specifier: 'catalog:' + version: 3.6.2(get-starknet-core@4.0.0)(react@18.3.1)(starknet@6.21.0(encoding@0.1.13))(typescript@5.7.2) encoding: specifier: ^0.1.13 version: 0.1.13 get-starknet-core: - specifier: ^3.3.3 - version: 3.3.4(starknet@6.21.0(encoding@0.1.13)) + specifier: 'catalog:' + version: 4.0.0 js-cookie: specifier: ^3.0.5 version: 3.0.5 @@ -1414,8 +1420,8 @@ importers: specifier: ^3.1.3 version: 3.1.3 get-starknet-core: - specifier: ^3.3.3 - version: 3.3.4(starknet@6.21.0(encoding@0.1.13)) + specifier: 'catalog:' + version: 4.0.0 js-cookie: specifier: ^3.0.5 version: 3.0.5 @@ -4073,12 +4079,6 @@ packages: '@mediapipe/tasks-vision@0.10.17': resolution: {integrity: sha512-CZWV/q6TTe8ta61cZXjfnnHsfWIdFhms03M9T7Cnd5y2mdpylJM0rF1qRq+wsQVRMLz1OYPVEBU9ph2Bx8cxrg==} - '@module-federation/runtime@0.1.21': - resolution: {integrity: sha512-/p4BhZ0SnjJuiL0wwu+FebFgIUJ9vM+oCY7CyprUHImyi/Y23ulI61WNWMVrKQGgdMoXQDQCL8RH4EnrVP2ZFw==} - - '@module-federation/sdk@0.1.21': - resolution: {integrity: sha512-r7xPiAm+O4e+8Zvw+8b4ToeD0D0VJD004nHmt+Y8r/l98J2eA6di72Vn1FeyjtQbCrFtiMw3ts/dlqtcmIBipw==} - '@monogrid/gainmap-js@3.1.0': resolution: {integrity: sha512-Obb0/gEd/HReTlg8ttaYk+0m62gQJmCblMOjHSMHRrBP2zdfKMHLCRbh/6ex9fSUJMKdjjIEiohwkbGD3wj2Nw==} peerDependencies: @@ -8942,11 +8942,6 @@ packages: resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==} engines: {node: '>=8'} - get-starknet-core@3.3.4: - resolution: {integrity: sha512-KEnzAMr4f7z7dMh4g5lWDZ+eXtOEl++VPN5Flmmj8HiPmRrPOINEIwwNL/dN+Ey1kBxQOtOMQwCxJ9qlkRIgFw==} - peerDependencies: - starknet: ^5.18.0 - get-starknet-core@4.0.0: resolution: {integrity: sha512-6pLmidQZkC3wZsrHY99grQHoGpuuXqkbSP65F8ov1/JsEI8DDLkhsAuLCKFzNOK56cJp+f1bWWfTJ57e9r5eqQ==} @@ -14674,7 +14669,7 @@ snapshots: '@cartridge/connector@0.3.46(encoding@0.1.13)(react@18.3.1)': dependencies: '@cartridge/controller': 0.3.46(encoding@0.1.13) - '@starknet-react/core': 2.3.0(get-starknet-core@3.3.4(starknet@6.21.0(encoding@0.1.13)))(react@18.3.1)(starknet@6.21.0(encoding@0.1.13)) + '@starknet-react/core': 2.3.0(react@18.3.1)(starknet@6.21.0(encoding@0.1.13)) starknet: 6.21.0(encoding@0.1.13) transitivePeerDependencies: - encoding @@ -16939,12 +16934,6 @@ snapshots: '@mediapipe/tasks-vision@0.10.17': {} - '@module-federation/runtime@0.1.21': - dependencies: - '@module-federation/sdk': 0.1.21 - - '@module-federation/sdk@0.1.21': {} - '@monogrid/gainmap-js@3.1.0(three@0.160.1)': dependencies: promise-worker-transferable: 1.0.4 @@ -18526,12 +18515,11 @@ snapshots: '@starknet-react/chains@3.1.0': {} - '@starknet-react/core@2.3.0(get-starknet-core@3.3.4(starknet@6.21.0(encoding@0.1.13)))(react@18.3.1)(starknet@6.21.0(encoding@0.1.13))': + '@starknet-react/core@2.3.0(react@18.3.1)(starknet@6.21.0(encoding@0.1.13))': dependencies: '@starknet-react/chains': 0.1.7 '@tanstack/react-query': 5.62.10(react@18.3.1) eventemitter3: 5.0.1 - get-starknet-core: 3.3.4(starknet@6.21.0(encoding@0.1.13)) immutable: 4.3.7 react: 18.3.1 starknet: 6.21.0(encoding@0.1.13) @@ -22978,11 +22966,6 @@ snapshots: get-port@5.1.1: {} - get-starknet-core@3.3.4(starknet@6.21.0(encoding@0.1.13)): - dependencies: - '@module-federation/runtime': 0.1.21 - starknet: 6.21.0(encoding@0.1.13) - get-starknet-core@4.0.0: dependencies: '@starknet-io/types-js': 0.7.10 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 84c0b970..b60a0672 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -4,6 +4,6 @@ packages: catalog: starknet: 6.21.0 - get-starknet-core: ^3.3.4 + get-starknet-core: ^4.0.0 "@starknet-react/core": ^3.6.2 "@starknet-react/chains": ^3.1.0