From 8efe0f37186f9375413e6d71693a9ae09baa5e57 Mon Sep 17 00:00:00 2001
From: osmannyildiz <iamosmannyildiz@gmail.com>
Date: Sun, 12 May 2024 12:56:46 +0300
Subject: [PATCH] put MessageBox in the MainModule (for now)

---
 copy_evm_deployments_to_frontend.sh             | 2 +-
 evm/ignition/modules/Main.ts                    | 4 +++-
 frontend/src/evm-output/deployed_addresses.json | 4 ++--
 frontend/src/web3.ts                            | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/copy_evm_deployments_to_frontend.sh b/copy_evm_deployments_to_frontend.sh
index eb37cf1..5d2db28 100755
--- a/copy_evm_deployments_to_frontend.sh
+++ b/copy_evm_deployments_to_frontend.sh
@@ -2,5 +2,5 @@ rm ./frontend/src/evm-output/*
 
 cp "./evm/ignition/deployments/chain-31337/deployed_addresses.json" "./frontend/src/evm-output/deployed_addresses.json"
 
-cp "./evm/ignition/deployments/chain-31337/artifacts/MessageBoxModule#MessageBox.json" "./frontend/src/evm-output/MessageBox.artifacts.json"
+cp "./evm/ignition/deployments/chain-31337/artifacts/MainModule#MessageBox.json" "./frontend/src/evm-output/MessageBox.artifacts.json"
 cp "./evm/ignition/deployments/chain-31337/artifacts/MainModule#PADToken.json" "./frontend/src/evm-output/PADToken.artifacts.json"
diff --git a/evm/ignition/modules/Main.ts b/evm/ignition/modules/Main.ts
index f8f65c9..9d22a5a 100644
--- a/evm/ignition/modules/Main.ts
+++ b/evm/ignition/modules/Main.ts
@@ -7,9 +7,11 @@ const MainModule = buildModule("MainModule", (m) => {
 		PAD_TOKEN_INITIAL_OWNER
 	);
 
+	const messageBox = m.contract("MessageBox", ["Hello OsiPad!"]); // TODO Remove
+
 	const padToken = m.contract("PADToken", [initialOwner]);
 
-	return { padToken };
+	return { messageBox, padToken };
 });
 
 export default MainModule;
diff --git a/frontend/src/evm-output/deployed_addresses.json b/frontend/src/evm-output/deployed_addresses.json
index 864e7c9..5882e35 100644
--- a/frontend/src/evm-output/deployed_addresses.json
+++ b/frontend/src/evm-output/deployed_addresses.json
@@ -1,4 +1,4 @@
 {
-  "MainModule#PADToken": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
-  "MessageBoxModule#MessageBox": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
+  "MainModule#MessageBox": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
+  "MainModule#PADToken": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
 }
diff --git a/frontend/src/web3.ts b/frontend/src/web3.ts
index de57eeb..2b7452e 100644
--- a/frontend/src/web3.ts
+++ b/frontend/src/web3.ts
@@ -16,7 +16,7 @@ if (window.ethereum) {
 
 export const messageBox = new web3!.eth.Contract(
 	messageBoxArtifacts.abi,
-	deployedAddresses["MessageBoxModule#MessageBox"]
+	deployedAddresses["MainModule#MessageBox"]
 );
 
 export const padToken = new web3!.eth.Contract(