diff --git a/Makefile b/Makefile index 275bbc0..ed06b66 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ include .account export REPO = ghcr.io/pixelaw/core -CORE_VERSION = 0.1.11 +CORE_VERSION = 0.1.12 KEIKO_VERSION = v0.1.5 diff --git a/VERSION b/VERSION index 20f4951..0e24a92 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.11 +0.1.12 diff --git a/deployment/demo/Chart.yaml b/deployment/demo/Chart.yaml index 34ddcde..581978a 100644 --- a/deployment/demo/Chart.yaml +++ b/deployment/demo/Chart.yaml @@ -21,4 +21,4 @@ version: "0.0.45" # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.11" +appVersion: "0.1.12" diff --git a/deployment/test/Chart.yaml b/deployment/test/Chart.yaml index f8ecf80..5d28963 100644 --- a/deployment/test/Chart.yaml +++ b/deployment/test/Chart.yaml @@ -21,4 +21,4 @@ version: "0.0.45" # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.11" +appVersion: "0.1.12" diff --git a/web/src/App.tsx b/web/src/App.tsx index 33f3786..9dc9a05 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -98,9 +98,10 @@ function App() { } let errorMessage = '' - + if(setupQuery.isError){ + errorMessage = `setupQuery Error: ${setupQuery.error}` + } console.log({ setupQuery, checkManifests }) - if(setupQuery.error) console.error(setupQuery.error) if (checkRpcUrl.isError) { errorMessage = `PUBLIC_NODE_URL error: ${checkRpcUrl.error.message}. If this is happening in your local environment, Katana might not be up.` diff --git a/web/src/dojo/createSystemCalls.ts b/web/src/dojo/createSystemCalls.ts index 3a44844..6decaed 100644 --- a/web/src/dojo/createSystemCalls.ts +++ b/web/src/dojo/createSystemCalls.ts @@ -1,7 +1,6 @@ import { Account, num, TransactionStatus } from 'starknet' import { ZERO_ADDRESS } from '@/global/constants' import { IWorld } from '@/dojo/generated' -import { ContractComponents } from '@/dojo/contractComponents' const FAILURE_REASON_REGEX = /Failure reason: ".+"/; @@ -9,7 +8,6 @@ export type SystemCalls = ReturnType; export function createSystemCalls( { client }: { client: IWorld }, - contractComponents: ContractComponents, ) { /** diff --git a/web/src/dojo/setup.ts b/web/src/dojo/setup.ts index 7f699b7..b3428c4 100644 --- a/web/src/dojo/setup.ts +++ b/web/src/dojo/setup.ts @@ -15,7 +15,9 @@ import { PUBLIC_TORII } from '@/global/constants' export type SetupResult = Awaited>; export async function setup({ ...config }: DojoConfig) { - console.log("setup: createClient") + console.group('setup'); + + console.log("torii.createClient") // torii client const toriiClient = await torii.createClient([], { rpcUrl: config.rpcUrl, @@ -23,30 +25,31 @@ export async function setup({ ...config }: DojoConfig) { worldAddress: config.manifest.world.address || "", }); - console.log("setup: defineContractComponents") + console.log("defineContractComponents") // create contract components const contractComponents = defineContractComponents(world); - console.log("setup: createClientComponents") + console.log("createClientComponents") // create client components const clientComponents = createClientComponents({ contractComponents }); - console.log("getting entities") + console.log("getSyncEntities") // fetch all existing entities from torii await getSyncEntities(toriiClient, contractComponents as any); - console.log("getting entities: new DojoProvider") + console.log("new DojoProvider") // create dojo provider const dojoProvider = new DojoProvider(config.manifest, config.rpcUrl); - console.log("getting entities: setupWorld") + console.log("setupWorld") // setup world const client = await setupWorld(dojoProvider); + console.log("new BurnerManager") // create burner manager const burnerManager = new BurnerManager({ masterAccount: new Account( @@ -65,6 +68,7 @@ export async function setup({ ...config }: DojoConfig) { console.error(e); } } + console.log("burnerManager.init()") await burnerManager.init(); @@ -72,7 +76,7 @@ export async function setup({ ...config }: DojoConfig) { // Add in new queries or subscriptions in src/graphql/schema.graphql // then generate them using the codegen and fix-codegen commands in package.json const createGraphSdk = () => getSdk(new GraphQLClient(`${PUBLIC_TORII}/graphql`)); - + console.groupEnd(); return { client, clientComponents, @@ -80,8 +84,7 @@ export async function setup({ ...config }: DojoConfig) { // Define the graph SDK instance. graphSdk: createGraphSdk(), systemCalls: createSystemCalls( - { client }, - contractComponents + { client } ), config, dojoProvider,