Updated contracts and frontend create

Author: mfbz

contracts/HouseformManager.sol

@@ -9,9 +9,6 @@ import './HouseformShare.sol';
 contract HouseformManager is Ownable, ReentrancyGuard {
 	struct Project {
 		address payable builder;
-		string name;
-		string description;
-		string image;
 		uint currentAmount;
 		uint goalAmount;
 		uint saleAmount; // Amount at which the project is sold
@@ -32,21 +29,21 @@ contract HouseformManager is Ownable, ReentrancyGuard {
 	mapping(address => uint) builderProjectCount;
 
 	event ProjectCreated(
-		uint projectId,
-		string name,
-		string description,
-		string image,
-		uint goalAmount,
-		uint expectedProfit,
-		uint builderShares,
-		uint totalShares,
-		uint fundraisingDeadline
+		uint _projectId,
+		string _name,
+		string _description,
+		string _image,
+		uint _goalAmount,
+		uint _expectedProfit,
+		uint _builderShares,
+		uint _totalShares,
+		uint _fundraisingDeadline
 	);
-	event BuildingStarted(uint projectId, uint buildingStartedOn);
-	event BuildingCompleted(uint projectId, uint buildingCompletedOn, uint saleAmount);
-	event SharesBought(address account, uint projectId, uint shares);
-	event SharesRedeemed(address account, uint projectId, uint shares);
-	event FundraisingCompleted(uint projectId, uint fundraisingCompletedOn);
+	event BuildingStarted(uint _projectId, uint _buildingStartedOn);
+	event BuildingCompleted(uint _projectId, uint _buildingCompletedOn, uint _saleAmount);
+	event SharesBought(address _account, uint _projectId, uint _shares);
+	event SharesRedeemed(address _account, uint _projectId, uint _shares);
+	event FundraisingCompleted(uint _projectId, uint _fundraisingCompletedOn);
 
 	modifier projectExists(uint _projectId) {
 		// NB: project ids are incremental indexes of projects array
@@ -105,13 +102,13 @@ contract HouseformManager is Ownable, ReentrancyGuard {
 	}
 
 	function createProject(
-		uint _goalAmount,
 		string memory _name,
 		string memory _description,
 		string memory _image,
+		uint _goalAmount,
+		uint _expectedProfit,
 		uint _builderShares,
 		uint _totalShares,
-		uint _expectedProfit,
 		uint _fundraisingDeadline
 	) external nonReentrant {
 		// Validate inputs
@@ -126,9 +123,6 @@ contract HouseformManager is Ownable, ReentrancyGuard {
 		projects.push(
 			Project({
 				builder: payable(msg.sender),
-				name: _name,
-				description: _description,
-				image: _image,
 				currentAmount: 0,
 				goalAmount: _goalAmount,
 				saleAmount: 0,
@@ -148,6 +142,8 @@ contract HouseformManager is Ownable, ReentrancyGuard {
 		projectToBuilder[id] = msg.sender;
 		builderProjectCount[msg.sender]++;
 
+		// Set id metadata
+		shareContract.setMetadata(id, _name, _description, _image);
 		// Mint initial shares to builder
 		shareContract.mint(msg.sender, id, _builderShares, '');
 
@@ -286,6 +282,19 @@ contract HouseformManager is Ownable, ReentrancyGuard {
 		emit SharesRedeemed(msg.sender, _projectId, _shares);
 	}
 
+	function getProjects() external view returns (Project[] memory) {
+		Project[] memory projectsArray = new Project[](projects.length);
+		for (uint i = 0; i < projects.length; i++) {
+			projectsArray[i] = projects[i];
+		}
+		return projectsArray;
+	}
+
+	function getProject(uint _projectId) external view returns (Project memory) {
+		Project memory project = projects[_projectId];
+		return project;
+	}
+
 	function getShareCost(uint _projectId) public view returns (uint) {
 		Project memory project = projects[_projectId];
 		return project.goalAmount / project.totalShares;

contracts/HouseformShare.sol

@@ -4,36 +4,81 @@ pragma solidity ^0.8.20;
 import '@klaytn/contracts/KIP/token/KIP37/KIP37.sol';
 import '@klaytn/contracts/KIP/token/KIP37/extensions/KIP37Burnable.sol';
 import '@klaytn/contracts/access/Ownable.sol';
+import '@klaytn/contracts/utils/Base64.sol';
 
 // NB: The id of the token to be minted is the project id so that they can be easily referenced
 contract HouseformShare is KIP37, KIP37Burnable, Ownable {
+	struct Metadata {
+		string name;
+		string description;
+		string image;
+	}
+
 	string public name = 'HouseformShare';
 	string public symbol = 'HS';
 
+	mapping(uint => Metadata) public idToMetadata;
+
 	constructor() KIP37('') {}
 
-	function mint(address account, uint256 id, uint256 amount, bytes memory data) public onlyOwner {
-		_mint(account, id, amount, data);
+	function setMetadata(
+		uint _id,
+		string memory _name,
+		string memory _description,
+		string memory _image
+	) public onlyOwner {
+		idToMetadata[_id] = Metadata({name: _name, description: _description, image: _image});
+	}
+
+	function mint(address _account, uint256 _id, uint256 _amount, bytes memory _data) public onlyOwner {
+		_mint(_account, _id, _amount, _data);
 	}
 
-	function mintBatch(address to, uint256[] memory ids, uint256[] memory amounts, bytes memory data) public onlyOwner {
-		_mintBatch(to, ids, amounts, data);
+	function mintBatch(
+		address _to,
+		uint256[] memory _ids,
+		uint256[] memory _amounts,
+		bytes memory _data
+	) public onlyOwner {
+		_mintBatch(_to, _ids, _amounts, _data);
 	}
 
-	function burn(address account, uint256 id, uint256 amount) public override onlyOwner {
-		_burn(account, id, amount);
+	function burn(address _account, uint256 _id, uint256 _amount) public override onlyOwner {
+		_burn(_account, _id, _amount);
 	}
 
-	function burnBatch(address account, uint256[] memory ids, uint256[] memory amounts) public override onlyOwner {
-		_burnBatch(account, ids, amounts);
+	function burnBatch(address _account, uint256[] memory _ids, uint256[] memory _amounts) public override onlyOwner {
+		_burnBatch(_account, _ids, _amounts);
 	}
 
-	function balanceOf(address owner, uint256 id) public view override returns (uint256) {
-		return balanceOf(owner, id);
+	function uri(uint256 _id) public view override returns (string memory) {
+		Metadata memory metadata = idToMetadata[_id];
+		// Return stringified data uri
+		return
+			string(
+				abi.encodePacked(
+					'data:application/json;base64,',
+					Base64.encode(
+						bytes(
+							string(
+								abi.encodePacked(
+									'{ "name": "',
+									metadata.name,
+									'", "description": "',
+									metadata.description,
+									'", "image": "',
+									metadata.image,
+									'"}'
+								)
+							)
+						)
+					)
+				)
+			);
 	}
 
 	// Override required by Solidity
-	function supportsInterface(bytes4 interfaceId) public view override(KIP37, KIP37Burnable) returns (bool) {
-		return super.supportsInterface(interfaceId);
+	function supportsInterface(bytes4 _interfaceId) public view override(KIP37, KIP37Burnable) returns (bool) {
+		return super.supportsInterface(_interfaceId);
 	}
 }

hardhat.config.js

@@ -2,7 +2,15 @@ require('@nomicfoundation/hardhat-toolbox');
 require('dotenv').config();
 
 module.exports = {
-	solidity: '0.8.20',
+	solidity: {
+		version: '0.8.20',
+		settings: {
+			optimizer: {
+				enabled: true,
+				runs: 2000,
+			},
+		},
+	},
 	networks: {
 		baobab: {
 			url: process.env.HARDHAT_KLAYTN_BAOBAB_TESTNET_URL || '',

package-lock.json

@@ -17,15 +17,16 @@
 		"@openzeppelin/contracts": "^5.0.0",
 		"@web3modal/wagmi": "^3.3.2",
 		"antd": "^5.11.1",
-		"next": "14.0.2",
 		"dotenv": "^16.3.1",
+		"next": "14.0.2",
 		"react": "^18",
 		"react-dom": "^18",
 		"react-icons": "^4.11.0",
-		"viem": "^1.19.3",
-		"wagmi": "^1.4.7",
 		"rxjs": "^7.8.1",
-		"swr": "^2.2.4"
+		"swr": "^2.2.4",
+		"usehooks-ts": "^2.9.1",
+		"viem": "^1.19.3",
+		"wagmi": "^1.4.7"
 	},
 	"devDependencies": {
 		"@svgr/webpack": "^8.1.0",

package.json

@@ -3,8 +3,8 @@ const { ethers } = require('hardhat');
 // Load env variables
 require('dotenv').config();
 
-const managerContractAddress = '0x3a5CC2Be65e56d896f0D3adf427474c33239a1F9';
-const shareContractAddress = '0x873340073b531a2F76b8c0e7567A434f762Eae31';
+const managerContractAddress = '0x0d4eF3419af9a0FEE9cc7dBE3EAC4156399f457C';
+const shareContractAddress = '0x3ea99bEa8d5D1Cf76aF585ba207147C653297853';
 
 async function main() {
 	const managerContract = (await ethers.getContractFactory('HouseformManager')).attach(managerContractAddress);
@@ -13,6 +13,13 @@ async function main() {
 	console.log(`Share contract address: ${await managerContract.shareContract()}`);
 	console.log(`Share contract name: ${await shareContract.name()}`);
 	console.log(`Share contract symbol: ${await shareContract.symbol()}`);
+
+	console.log(`Projects: ${await managerContract.getProjects()}`);
+	//console.log(`Project metadata: ${await shareContract.uri(0)}`);
+
+	console.log(
+		`Balance of project #0 shares: ${await shareContract.balanceOf('0x93840623bc378e9ee5334c0eE4608CF877dC68D3', 0)}`,
+	);
 }
 
 main().catch((error) => {