repo restructure (#26)

* refactoring the folder structure * removing mudConfigObject.ts to fix ts errors. We can add it back later if its required * adding lint to .ts files * adding non mud standard contracts * removing lib dependancies * forge install: openzeppelin-contracts v5.0.2 * forge install: forge-std v1.8.1 * updating the path for external dependancy * adding the unbaked deploy script whcih can be sorted later * decoupling forwarder from the rest of the contracts as it will be in root namespace renaming to core as 1. it has a GlobalStatic table which could store global values 2. contracts with root namespace can live here * modifying the frontier-world directory structure * name change to stick the standard * console.log name change * updating package.json * cleanup package.json commands * fixing build issues * reanming and creating test deploy scripts to validate * adding .env file to standard contracts * adding build command * updating `--fork-url` to `rpc-url`
projectawakening · Mar 26, 2024 · 8e00c6d · 8e00c6d
1 parent ff617df
commit 8e00c6d
Show file tree

Hide file tree

Showing 117 changed files with 14,887 additions and 492 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,5 @@
 **/worlds.json
 
 .nx/cache
-modules/smart-character/broadcast/
-world/base-world/broadcast/
-world/forwarder/broadcast/
-modules/.DS_Store
+.DS_Store
+**/**/broadcast/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "standard-contracts/lib/openzeppelin-contracts"]
+	path = standard-contracts/lib/openzeppelin-contracts
+	url = https://github.com/openzeppelin/openzeppelin-contracts
+[submodule "standard-contracts/lib/forge-std"]
+	path = standard-contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "solidity.compileUsingRemoteVersion": "v0.8.25+commit.b61c2a91"
+}
diff --git a/core/smart-object-framework/mud.config.ts b/core/smart-object-framework/mud.config.ts
diff --git a/modules/smart-character/.solhint.json b/modules/smart-character/.solhint.json
diff --git a/modules/smart-character/mud.config.ts b/modules/smart-character/mud.config.ts
diff --git a/modules/smart-character/mudConfigObject.ts b/modules/smart-character/mudConfigObject.ts
diff --git a/modules/smart-storage-unit/.env b/modules/smart-storage-unit/.env
diff --git a/modules/smart-storage-unit/.prettierrc b/modules/smart-storage-unit/.prettierrc
diff --git a/modules/smart-storage-unit/.solhint.json b/modules/smart-storage-unit/.solhint.json
diff --git a/modules/smart-storage-unit/mud.config.ts b/modules/smart-storage-unit/mud.config.ts
diff --git a/modules/smart-storage-unit/package.json b/modules/smart-storage-unit/package.json
diff --git a/common/README.md → mud-contracts/common/README.md b/common/README.md → mud-contracts/common/README.md
diff --git a/world/forwarder/.env → mud-contracts/core/.env b/world/forwarder/.env → mud-contracts/core/.env
@@ -9,6 +9,6 @@ DEBUG=mud:*
 #
 # Anvil default private key:
 PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
-FORWARDER_CONTRACT_ADDRESS=0x5FbDB2315678afecb367f032d93F642f64180aa3
+FORWARDER_ADDRESS=0x2f8D338360D095a72680A943A22fE6a0d398a0B4
 RPC_URL=http://127.0.0.1:8545
-WORLD_ADDRESS=0x0c5cd7c367a897786934581bc04ff8c299966c28
+WORLD_ADDRESS=0xd3c65837f8950dcfe67901f8037c9a4c6e1fbad8
diff --git a/core/smart-object-framework/.prettierrc → mud-contracts/core/.prettierrc b/core/smart-object-framework/.prettierrc → mud-contracts/core/.prettierrc
diff --git a/core/smart-object-framework/.solhint.json → mud-contracts/core/.solhint.json b/core/smart-object-framework/.solhint.json → mud-contracts/core/.solhint.json
diff --git a/world/forwarder/README.md → mud-contracts/core/README.md b/world/forwarder/README.md → mud-contracts/core/README.md
diff --git a/core/smart-object-framework/foundry.toml → mud-contracts/core/foundry.toml b/core/smart-object-framework/foundry.toml → mud-contracts/core/foundry.toml
diff --git a/world/forwarder/mudConfigObject.ts → mud-contracts/core/mud.config.ts b/world/forwarder/mudConfigObject.ts → mud-contracts/core/mud.config.ts
@@ -1,5 +1,6 @@
-export default {
-  namespace: "frontier",
+import { mudConfig } from "@latticexyz/world/register";
+
+export default mudConfig({
   tables: {
     GlobalStaticData: {
       keySchema: {
@@ -8,4 +9,4 @@ export default {
       valueSchema: "bool",
     },
   },
-};
+});