From 2013116f8f21796a12c3071869e8ee4df20bbad2 Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Tue, 3 Oct 2023 16:30:27 +0100 Subject: [PATCH] createContract -> getContract everywhere --- e2e/packages/client-vanilla/src/mud/setupNetwork.ts | 4 ++-- e2e/packages/test-data/generate-test-data.ts | 4 ++-- .../minimal/packages/client-phaser/src/mud/setupNetwork.ts | 4 ++-- .../minimal/packages/client-react/src/mud/setupNetwork.ts | 4 ++-- .../minimal/packages/client-vanilla/src/mud/setupNetwork.ts | 4 ++-- packages/cli/src/utils/utils/deployContract.ts | 4 ++-- packages/common/src/index.ts | 2 +- templates/phaser/packages/client/src/mud/createSystemCalls.ts | 2 +- templates/phaser/packages/client/src/mud/setupNetwork.ts | 4 ++-- templates/react/packages/client/src/mud/createSystemCalls.ts | 2 +- templates/react/packages/client/src/mud/setupNetwork.ts | 4 ++-- .../threejs/packages/client/src/mud/createSystemCalls.ts | 2 +- templates/threejs/packages/client/src/mud/setupNetwork.ts | 4 ++-- .../vanilla/packages/client/src/mud/createSystemCalls.ts | 2 +- templates/vanilla/packages/client/src/mud/setupNetwork.ts | 4 ++-- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/e2e/packages/client-vanilla/src/mud/setupNetwork.ts b/e2e/packages/client-vanilla/src/mud/setupNetwork.ts index 34cb6e7329..17c1586374 100644 --- a/e2e/packages/client-vanilla/src/mud/setupNetwork.ts +++ b/e2e/packages/client-vanilla/src/mud/setupNetwork.ts @@ -4,7 +4,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs"; import { getNetworkConfig } from "./getNetworkConfig"; import { world } from "./world"; import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json"; -import { createBurnerAccount, createContract, transportObserver } from "@latticexyz/common"; +import { createBurnerAccount, getContract, transportObserver } from "@latticexyz/common"; import mudConfig from "contracts/mud.config"; export type SetupNetworkResult = Awaited>; @@ -26,7 +26,7 @@ export async function setupNetwork() { account: burnerAccount, }); - const worldContract = createContract({ + const worldContract = getContract({ address: networkConfig.worldAddress as Hex, abi: IWorldAbi, publicClient, diff --git a/e2e/packages/test-data/generate-test-data.ts b/e2e/packages/test-data/generate-test-data.ts index 4b146a12c3..87a9e659e2 100644 --- a/e2e/packages/test-data/generate-test-data.ts +++ b/e2e/packages/test-data/generate-test-data.ts @@ -13,7 +13,7 @@ import { numberToHex, } from "viem"; import { mudFoundry } from "@latticexyz/common/chains"; -import { createContract } from "@latticexyz/common"; +import { getContract } from "@latticexyz/common"; import { storeEventsAbi } from "@latticexyz/store"; import { privateKeyToAccount } from "viem/accounts"; import IWorldAbi from "../contracts/out/IWorld.sol/IWorld.abi.json"; @@ -63,7 +63,7 @@ const walletClient = createWalletClient({ account, }); -const worldContract = createContract({ +const worldContract = getContract({ address: worldAddress, abi: IWorldAbi, publicClient, diff --git a/examples/minimal/packages/client-phaser/src/mud/setupNetwork.ts b/examples/minimal/packages/client-phaser/src/mud/setupNetwork.ts index 144ecd4a33..6c8e716ef3 100644 --- a/examples/minimal/packages/client-phaser/src/mud/setupNetwork.ts +++ b/examples/minimal/packages/client-phaser/src/mud/setupNetwork.ts @@ -4,7 +4,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs"; import { getNetworkConfig } from "./getNetworkConfig"; import { world } from "./world"; import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json"; -import { createBurnerAccount, createContract, transportObserver, ContractWrite } from "@latticexyz/common"; +import { createBurnerAccount, getContract, transportObserver, ContractWrite } from "@latticexyz/common"; import { Subject, share } from "rxjs"; import mudConfig from "contracts/mud.config"; @@ -28,7 +28,7 @@ export async function setupNetwork() { }); const write$ = new Subject(); - const worldContract = createContract({ + const worldContract = getContract({ address: networkConfig.worldAddress as Hex, abi: IWorldAbi, publicClient, diff --git a/examples/minimal/packages/client-react/src/mud/setupNetwork.ts b/examples/minimal/packages/client-react/src/mud/setupNetwork.ts index 895bf70553..1353c0803c 100644 --- a/examples/minimal/packages/client-react/src/mud/setupNetwork.ts +++ b/examples/minimal/packages/client-react/src/mud/setupNetwork.ts @@ -4,7 +4,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs"; import { getNetworkConfig } from "./getNetworkConfig"; import { world } from "./world"; import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json"; -import { ContractWrite, createBurnerAccount, createContract, transportObserver } from "@latticexyz/common"; +import { ContractWrite, createBurnerAccount, getContract, transportObserver } from "@latticexyz/common"; import { Subject, share } from "rxjs"; import mudConfig from "contracts/mud.config"; import { createClient as createFaucetClient } from "@latticexyz/faucet"; @@ -29,7 +29,7 @@ export async function setupNetwork() { }); const write$ = new Subject(); - const worldContract = createContract({ + const worldContract = getContract({ address: networkConfig.worldAddress as Hex, abi: IWorldAbi, publicClient, diff --git a/examples/minimal/packages/client-vanilla/src/mud/setupNetwork.ts b/examples/minimal/packages/client-vanilla/src/mud/setupNetwork.ts index 144ecd4a33..6c8e716ef3 100644 --- a/examples/minimal/packages/client-vanilla/src/mud/setupNetwork.ts +++ b/examples/minimal/packages/client-vanilla/src/mud/setupNetwork.ts @@ -4,7 +4,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs"; import { getNetworkConfig } from "./getNetworkConfig"; import { world } from "./world"; import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json"; -import { createBurnerAccount, createContract, transportObserver, ContractWrite } from "@latticexyz/common"; +import { createBurnerAccount, getContract, transportObserver, ContractWrite } from "@latticexyz/common"; import { Subject, share } from "rxjs"; import mudConfig from "contracts/mud.config"; @@ -28,7 +28,7 @@ export async function setupNetwork() { }); const write$ = new Subject(); - const worldContract = createContract({ + const worldContract = getContract({ address: networkConfig.worldAddress as Hex, abi: IWorldAbi, publicClient, diff --git a/packages/cli/src/utils/utils/deployContract.ts b/packages/cli/src/utils/utils/deployContract.ts index 219032127f..e1bec26ebd 100644 --- a/packages/cli/src/utils/utils/deployContract.ts +++ b/packages/cli/src/utils/utils/deployContract.ts @@ -26,8 +26,8 @@ export async function deployContract(input: TxConfig & { nonce: number; contract throw new MUDError( `Error deploying ${contract.name}: invalid bytecode. Note that linking of public libraries is not supported yet, make sure none of your libraries use "external" functions.` ); - } else if (error?.message.includes("CreateContractLimit")) { - throw new MUDError(`Error deploying ${contract.name}: CreateContractLimit exceeded.`); + } else if (error?.message.includes("getContractLimit")) { + throw new MUDError(`Error deploying ${contract.name}: getContractLimit exceeded.`); } else throw error; } } diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index b772a50ba8..98fa9fdf7f 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -14,4 +14,4 @@ export * from "./transportObserver"; export * from "./writeContract"; /** @deprecated use `getContract` instead */ -export { createContract } from "./createContract"; +export { getContract } from "./getContract"; diff --git a/templates/phaser/packages/client/src/mud/createSystemCalls.ts b/templates/phaser/packages/client/src/mud/createSystemCalls.ts index 9a1c478041..b308bd73b2 100644 --- a/templates/phaser/packages/client/src/mud/createSystemCalls.ts +++ b/templates/phaser/packages/client/src/mud/createSystemCalls.ts @@ -24,7 +24,7 @@ export function createSystemCalls( * SetupNetworkResult, as defined in setupNetwork.ts * * - Out of this parameter, we only care about two fields: - * - worldContract (which comes from createContract, see + * - worldContract (which comes from getContract, see * https://github.com/latticexyz/mud/blob/26dabb34321eedff7a43f3fcb46da4f3f5ba3708/templates/phaser/packages/client/src/mud/setupNetwork.ts#L31). * - waitForTransaction (which comes from syncToRecs, see * https://github.com/latticexyz/mud/blob/26dabb34321eedff7a43f3fcb46da4f3f5ba3708/templates/phaser/packages/client/src/mud/setupNetwork.ts#L39). diff --git a/templates/phaser/packages/client/src/mud/setupNetwork.ts b/templates/phaser/packages/client/src/mud/setupNetwork.ts index 6fe7d00e2c..0b037665d0 100644 --- a/templates/phaser/packages/client/src/mud/setupNetwork.ts +++ b/templates/phaser/packages/client/src/mud/setupNetwork.ts @@ -9,7 +9,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs"; import { getNetworkConfig } from "./getNetworkConfig"; import { world } from "./world"; import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json"; -import { createBurnerAccount, createContract, transportObserver, ContractWrite } from "@latticexyz/common"; +import { createBurnerAccount, getContract, transportObserver, ContractWrite } from "@latticexyz/common"; import { Subject, share } from "rxjs"; /* @@ -58,7 +58,7 @@ export async function setupNetwork() { /* * Create an object for communicating with the deployed World. */ - const worldContract = createContract({ + const worldContract = getContract({ address: networkConfig.worldAddress as Hex, abi: IWorldAbi, publicClient, diff --git a/templates/react/packages/client/src/mud/createSystemCalls.ts b/templates/react/packages/client/src/mud/createSystemCalls.ts index 9858910ed2..d351f67040 100644 --- a/templates/react/packages/client/src/mud/createSystemCalls.ts +++ b/templates/react/packages/client/src/mud/createSystemCalls.ts @@ -18,7 +18,7 @@ export function createSystemCalls( * SetupNetworkResult, as defined in setupNetwork.ts * * - Out of this parameter, we only care about two fields: - * - worldContract (which comes from createContract, see + * - worldContract (which comes from getContract, see * https://github.com/latticexyz/mud/blob/26dabb34321eedff7a43f3fcb46da4f3f5ba3708/templates/react/packages/client/src/mud/setupNetwork.ts#L31). * - waitForTransaction (which comes from syncToRecs, see * https://github.com/latticexyz/mud/blob/26dabb34321eedff7a43f3fcb46da4f3f5ba3708/templates/react/packages/client/src/mud/setupNetwork.ts#L39). diff --git a/templates/react/packages/client/src/mud/setupNetwork.ts b/templates/react/packages/client/src/mud/setupNetwork.ts index 15d3555441..fe78721b3f 100644 --- a/templates/react/packages/client/src/mud/setupNetwork.ts +++ b/templates/react/packages/client/src/mud/setupNetwork.ts @@ -10,7 +10,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs"; import { getNetworkConfig } from "./getNetworkConfig"; import { world } from "./world"; import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json"; -import { createBurnerAccount, createContract, transportObserver, ContractWrite } from "@latticexyz/common"; +import { createBurnerAccount, getContract, transportObserver, ContractWrite } from "@latticexyz/common"; import { Subject, share } from "rxjs"; @@ -60,7 +60,7 @@ export async function setupNetwork() { /* * Create an object for communicating with the deployed World. */ - const worldContract = createContract({ + const worldContract = getContract({ address: networkConfig.worldAddress as Hex, abi: IWorldAbi, publicClient, diff --git a/templates/threejs/packages/client/src/mud/createSystemCalls.ts b/templates/threejs/packages/client/src/mud/createSystemCalls.ts index b87d86253d..782f61d94b 100644 --- a/templates/threejs/packages/client/src/mud/createSystemCalls.ts +++ b/templates/threejs/packages/client/src/mud/createSystemCalls.ts @@ -17,7 +17,7 @@ export function createSystemCalls( * SetupNetworkResult, as defined in setupNetwork.ts * * - Out of this parameter, we only care about two fields: - * - worldContract (which comes from createContract, see + * - worldContract (which comes from getContract, see * https://github.com/latticexyz/mud/blob/26dabb34321eedff7a43f3fcb46da4f3f5ba3708/templates/threejs/packages/client/src/mud/setupNetwork.ts#L31). * - waitForTransaction (which comes from syncToRecs, see * https://github.com/latticexyz/mud/blob/26dabb34321eedff7a43f3fcb46da4f3f5ba3708/templates/threejs/packages/client/src/mud/setupNetwork.ts#L39). diff --git a/templates/threejs/packages/client/src/mud/setupNetwork.ts b/templates/threejs/packages/client/src/mud/setupNetwork.ts index eb8a98ae84..274a46b80e 100644 --- a/templates/threejs/packages/client/src/mud/setupNetwork.ts +++ b/templates/threejs/packages/client/src/mud/setupNetwork.ts @@ -9,7 +9,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs"; import { getNetworkConfig } from "./getNetworkConfig"; import { world } from "./world"; import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json"; -import { createBurnerAccount, createContract, transportObserver, ContractWrite } from "@latticexyz/common"; +import { createBurnerAccount, getContract, transportObserver, ContractWrite } from "@latticexyz/common"; import { Subject, share } from "rxjs"; /* @@ -58,7 +58,7 @@ export async function setupNetwork() { /* * Create an object for communicating with the deployed World. */ - const worldContract = createContract({ + const worldContract = getContract({ address: networkConfig.worldAddress as Hex, abi: IWorldAbi, publicClient, diff --git a/templates/vanilla/packages/client/src/mud/createSystemCalls.ts b/templates/vanilla/packages/client/src/mud/createSystemCalls.ts index 9a364b4920..22449a324f 100644 --- a/templates/vanilla/packages/client/src/mud/createSystemCalls.ts +++ b/templates/vanilla/packages/client/src/mud/createSystemCalls.ts @@ -18,7 +18,7 @@ export function createSystemCalls( * SetupNetworkResult, as defined in setupNetwork.ts * * - Out of this parameter, we only care about two fields: - * - worldContract (which comes from createContract, see + * - worldContract (which comes from getContract, see * https://github.com/latticexyz/mud/blob/26dabb34321eedff7a43f3fcb46da4f3f5ba3708/templates/vanilla/packages/client/src/mud/setupNetwork.ts#L31). * - waitForTransaction (which comes from syncToRecs, see * https://github.com/latticexyz/mud/blob/26dabb34321eedff7a43f3fcb46da4f3f5ba3708/templates/vanilla/packages/client/src/mud/setupNetwork.ts#L39). diff --git a/templates/vanilla/packages/client/src/mud/setupNetwork.ts b/templates/vanilla/packages/client/src/mud/setupNetwork.ts index 15d3555441..fe78721b3f 100644 --- a/templates/vanilla/packages/client/src/mud/setupNetwork.ts +++ b/templates/vanilla/packages/client/src/mud/setupNetwork.ts @@ -10,7 +10,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs"; import { getNetworkConfig } from "./getNetworkConfig"; import { world } from "./world"; import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json"; -import { createBurnerAccount, createContract, transportObserver, ContractWrite } from "@latticexyz/common"; +import { createBurnerAccount, getContract, transportObserver, ContractWrite } from "@latticexyz/common"; import { Subject, share } from "rxjs"; @@ -60,7 +60,7 @@ export async function setupNetwork() { /* * Create an object for communicating with the deployed World. */ - const worldContract = createContract({ + const worldContract = getContract({ address: networkConfig.worldAddress as Hex, abi: IWorldAbi, publicClient,