Minor bug fixes

.github/workflows/test.yml

@@ -7,6 +7,7 @@ on:
 
 env:
   FOUNDRY_PROFILE: ci
+  FOUNDRY_DISABLE_NIGHTLY_WARNING: true
 
 jobs:
   check:
@@ -23,7 +24,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: nightly
+          version: stable
 
       - name: Show Forge version
         run: |

script/DeployAllContracts.s.sol

@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import "forge-std/Script.sol";
+import "../src/TreeNft.sol";
+import "../src/token-contracts/CareToken.sol";
+import "../src/token-contracts/PlanterToken.sol";
+import "../src/token-contracts/LegacyToken.sol";
+import "../src/OrganisationFactory.sol";
+
+contract DeployAllContractsAtOnce is Script {
+    address public careTokenAddress;
+    address public planterTokenAddress;
+    address public verifierTokenAddress;
+    address public legacyTokenAddress;
+    address public treeNftAddress;
+
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        address deployer = vm.addr(deployerPrivateKey);
+
+        console.log("\n========== DEPLOYMENT INITIALIZED ==========");
+        console.log("Deployer Address:          ", deployer);
+        console.log("Deployer ETH Balance:      ", deployer.balance);
+        console.log("============================================\n");
+
+        vm.startBroadcast(deployerPrivateKey);
+        console.log(">> Step 1: Deploying ERC20 Token Contracts...");
+
+        CareToken careToken = new CareToken(deployer);
+        careTokenAddress = address(careToken);
+        console.log("  - CareToken deployed at:        ", careTokenAddress);
+
+        LegacyToken legacyToken = new LegacyToken(deployer);
+        legacyTokenAddress = address(legacyToken);
+        console.log("  - LegacyToken deployed at:      ", legacyTokenAddress);
+
+        console.log("\n>> Step 2: Deploying TreeNft Contract...");
+        TreeNft treeNft = new TreeNft(careTokenAddress, legacyTokenAddress);
+        treeNftAddress = address(treeNft);
+        console.log("  - TreeNft deployed at:          ", treeNftAddress);
+
+        console.log("\n>> Step 3: Transferring Token Ownership to TreeNft...");
+        careToken.transferOwnership(treeNftAddress);
+        console.log("  - CareToken ownership transferred.");
+        legacyToken.transferOwnership(treeNftAddress);
+        console.log("  - LegacyToken ownership transferred.");
+
+        console.log("\n>> Step 4: Deploying OrganisationFactory...");
+        OrganisationFactory orgFactory = new OrganisationFactory(treeNftAddress);
+        address orgFactoryAddress = address(orgFactory);
+        console.log("  - OrganisationFactory deployed at:", orgFactoryAddress);
+
+        vm.stopBroadcast();
+
+        console.log("\n========== DEPLOYMENT SUMMARY ==========");
+        console.log("CareToken Address:         ", careTokenAddress);
+        console.log("LegacyToken Address:       ", legacyTokenAddress);
+        console.log("TreeNft Address:           ", treeNftAddress);
+        console.log("OrganisationFactory:       ", orgFactoryAddress);
+        console.log("All token ownerships successfully transferred to TreeNft.");
+        console.log("=========================================\n");
+
+        verifyDeployment();
+    }
+
+    function verifyDeployment() internal view {
+        console.log(">> Verifying Deployment Integrity...");
+
+        TreeNft treeNft = TreeNft(treeNftAddress);
+
+        require(address(treeNft.careTokenContract()) == careTokenAddress, "CareToken address mismatch");
+        require(address(treeNft.legacyToken()) == legacyTokenAddress, "LegacyToken address mismatch");
+
+        CareToken careToken = CareToken(careTokenAddress);
+        require(careToken.owner() == treeNftAddress, "CareToken ownership not transferred");
+
+        CareToken legacyToken = CareToken(legacyTokenAddress);
+        require(legacyToken.owner() == treeNftAddress, "LegacyToken ownership not transferred");
+
+        console.log("Deployment verification passed.\n");
+    }
+}

script/DeployOrganisationFactory.s.sol

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import "forge-std/Script.sol";
+import "../src/TreeNft.sol";
+import "../src/OrganisationFactory.sol";
+
+contract DeployOrganisationFactory is Script {
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        address deployer = vm.addr(deployerPrivateKey);
+        address treeNftAddress = vm.envAddress("TREE_NFT_ADDRESS");
+
+        if (treeNftAddress.code.length <= 0) revert InvalidContractAddress();
+
+        console.log("\n========== DEPLOYMENT STARTED ==========");
+        console.log(">> Deployer Address:        ", deployer);
+        console.log(">> Deployer Balance (wei):  ", deployer.balance);
+        console.log(">> Linked TreeNFT Address:  ", treeNftAddress);
+        console.log("========================================\n");
+
+        vm.startBroadcast(deployerPrivateKey);
+
+        console.log("Deploying OrganisationFactory...");
+        OrganisationFactory orgFactory = new OrganisationFactory(treeNftAddress);
+        address orgFactoryAddress = address(orgFactory);
+        console.log("OrganisationFactory deployed at:", orgFactoryAddress);
+
+        vm.stopBroadcast();
+
+        console.log("\n========== DEPLOYMENT SUMMARY ==========");
+        console.log("OrganisationFactory Address: ", orgFactoryAddress);
+        console.log("Linked TreeNFT Address:      ", treeNftAddress);
+        console.log("Deployment completed successfully.");
+        console.log("========================================\n");
+    }
+}

script/DeployTreeNftContract.s.sol

@@ -5,13 +5,10 @@ import "forge-std/Script.sol";
 import "../src/TreeNft.sol";
 import "../src/token-contracts/CareToken.sol";
 import "../src/token-contracts/PlanterToken.sol";
-import "../src/token-contracts/VerifierToken.sol";
 import "../src/token-contracts/LegacyToken.sol";
 
 contract DeployTreeNft is Script {
     address public careTokenAddress;
-    address public planterTokenAddress;
-    address public verifierTokenAddress;
     address public legacyTokenAddress;
     address public treeNftAddress;
 
@@ -29,37 +26,22 @@ contract DeployTreeNft is Script {
         careTokenAddress = address(careToken);
         console.log("CareToken deployed at:", careTokenAddress);
 
-        PlanterToken planterToken = new PlanterToken(deployer);
-        planterTokenAddress = address(planterToken);
-        console.log("PlanterToken deployed at:", planterTokenAddress);
-
-        VerifierToken verifierToken = new VerifierToken(deployer);
-        verifierTokenAddress = address(verifierToken);
-        console.log("VerifierToken deployed at:", verifierTokenAddress);
-
         LegacyToken legacyToken = new LegacyToken(deployer);
         legacyTokenAddress = address(legacyToken);
         console.log("LegacyToken deployed at:", legacyTokenAddress);
         console.log("Step 2: Deploy TreeNft contract...");
 
-        TreeNft treeNft = new TreeNft(careTokenAddress, planterTokenAddress, verifierTokenAddress, legacyTokenAddress);
+        TreeNft treeNft = new TreeNft(careTokenAddress, legacyTokenAddress);
         treeNftAddress = address(treeNft);
         console.log("TreeNft deployed at:", treeNftAddress);
         console.log("Step 3: Transfer ownership to TreeNft contract...");
         careToken.transferOwnership(treeNftAddress);
         console.log("CareToken ownership transferred to TreeNft");
-        planterToken.transferOwnership(treeNftAddress);
-        console.log("PlanterToken ownership transferred to TreeNft");
-        verifierToken.transferOwnership(treeNftAddress);
-        console.log("VerifierToken ownership transferred to TreeNft");
         legacyToken.transferOwnership(treeNftAddress);
         console.log("LegacyToken ownership transferred to TreeNft");
-        vm.stopBroadcast();
 
         console.log("\n=== DEPLOYMENT SUMMARY ===");
         console.log("CareToken:", careTokenAddress);
-        console.log("PlanterToken:", planterTokenAddress);
-        console.log("VerifierToken:", verifierTokenAddress);
         console.log("LegacyToken:", legacyTokenAddress);
         console.log("TreeNft:", treeNftAddress);
         console.log("All token ownerships transferred to TreeNft!");
@@ -72,12 +54,14 @@ contract DeployTreeNft is Script {
         TreeNft treeNft = TreeNft(treeNftAddress);
 
         require(address(treeNft.careTokenContract()) == careTokenAddress, "CareToken address mismatch");
-        require(address(treeNft.planterTokenContract()) == planterTokenAddress, "PlanterToken address mismatch");
-        require(address(treeNft.verifierTokenContract()) == verifierTokenAddress, "VerifierToken address mismatch");
         require(address(treeNft.legacyToken()) == legacyTokenAddress, "LegacyToken address mismatch");
 
         CareToken careToken = CareToken(careTokenAddress);
-        require(careToken.owner() == treeNftAddress, "CareToken ownership not transferred");
+        if (careToken.owner() != treeNftAddress) revert OwnershipNotTransferred();
+
+        LegacyToken legacyToken = LegacyToken(legacyTokenAddress);
+        if (legacyToken.owner() != treeNftAddress) revert OwnershipNotTransferred();
+
         console.log("Deployment verification successful!");
     }
 }

src/Organisation.sol

@@ -257,9 +257,11 @@ contract Organisation {
         uint256 _longitude,
         string memory _species,
         string memory _imageURI,
-        string memory _qrIpfshash,
+        string memory _qrPhoto,
+        string memory _metadata,
         string[] memory photos,
-        string memory geoHash
+        string memory geoHash,
+        uint256 numberOfTrees
     ) public {
         if (_latitude > 180 * 1e6) revert InvalidCoordinates();
         if (_longitude > 360 * 1e6) revert InvalidCoordinates();
@@ -271,10 +273,13 @@ contract Organisation {
             longitude: _longitude,
             species: _species,
             imageUri: _imageURI,
-            qrIpfsHash: _qrIpfshash,
+            qrPhoto: _qrPhoto,
             photos: photos,
             geoHash: geoHash,
-            status: 0
+            metadata: _metadata,
+            status: 0,
+            numberOfTrees: numberOfTrees,
+            initiator: msg.sender
         });
         if (checkOwnership(msg.sender)) {
             s_treeProposalYesVoters[s_treePlantingProposalCounter].push(msg.sender);
@@ -285,9 +290,11 @@ contract Organisation {
                     proposal.longitude,
                     proposal.species,
                     proposal.imageUri,
-                    proposal.qrIpfsHash,
+                    proposal.qrPhoto,
+                    proposal.metadata,
                     proposal.geoHash,
-                    proposal.photos
+                    proposal.photos,
+                    proposal.numberOfTrees
                 );
             }
         }
@@ -397,9 +404,11 @@ contract Organisation {
                 proposal.longitude,
                 proposal.species,
                 proposal.imageUri,
-                proposal.qrIpfsHash,
+                proposal.qrPhoto,
+                proposal.metadata,
                 proposal.geoHash,
-                proposal.photos
+                proposal.photos,
+                proposal.numberOfTrees
             );
         } else if (s_treeProposalNoVoters[proposalID].length >= requiredVotes) {
             proposal.status = 2;

src/OrganisationFactory.sol

@@ -110,7 +110,7 @@ contract OrganisationFactory is Ownable {
                     contractAddress: orgAddress,
                     name: name,
                     description: description,
-                    photoIpfsHash: photoIpfsHash,
+                    organisationPhoto: photoIpfsHash,
                     owners: owners,
                     members: members,
                     ownerCount: owners.length,
@@ -123,7 +123,7 @@ contract OrganisationFactory is Ownable {
                     contractAddress: organisationAddress,
                     name: "ERROR: Unable to fetch",
                     description: "ERROR: Contract call failed",
-                    photoIpfsHash: "",
+                    organisationPhoto: "",
                     owners: new address[](0),
                     members: new address[](0),
                     ownerCount: 0,