Contracts/gardener account

packages/contracts/.prettierrc.json

@@ -1,9 +1,22 @@
 {
+  "plugins": ["prettier-plugin-solidity"],
   "bracketSpacing": true,
   "printWidth": 120,
   "proseWrap": "always",
   "singleQuote": false,
   "tabWidth": 2,
   "trailingComma": "all",
-  "useTabs": false
+  "useTabs": false,
+  "overrides": [
+    {
+      "files": "*.sol",
+      "options": {
+        "parser": "solidity-parse",
+        "printWidth": 120,
+        "tabWidth": 4,
+        "useTabs": false,
+        "singleQuote": false
+      }
+    }
+  ]
 }

packages/contracts/.solhint.json

@@ -10,7 +10,7 @@
     "named-parameters-mapping": "warn",
     "no-console": "off",
     "not-rely-on-time": "off",
-    "one-contract-per-file": true,
+    "one-contract-per-file": "error",
     "avoid-low-level-calls": "off",
     "no-inline-assembly": "off",
     "no-empty-blocks": "off",

packages/contracts/.solhintignore

@@ -0,0 +1,6 @@
+# directories
+broadcast
+cache
+coverage
+node_modules
+out

packages/contracts/foundry.toml

@@ -31,7 +31,7 @@ test = 'test'
   multiline_func_header = "all"
   number_underscore = "thousands"
   quote_style = "double"
-  tab_width = 2
+  tab_width = 4
   wrap_comments = true
 
 extra_output_files = [
@@ -43,7 +43,7 @@ fs_permissions = [{ access = "read", path = "./"}]
 eth_rpc_url = "http://localhost:8545"
 
 [profile.sepolia]
-eth_rpc_url = "https://arb-mainnet.g.alchemy.com/v2/i2qnBKk5GQ8pVGPLA-G3D9il5o0ULQO3"
+eth_rpc_url = "https://eth-sepolia.g.alchemy.com/v2/i2qnBKk5GQ8pVGPLA-G3D9il5o0ULQO3"
 
 [profile.arbitrum]
 eth_rpc_url = "https://arb-mainnet.g.alchemy.com/v2/i2qnBKk5GQ8pVGPLA-G3D9il5o0ULQO3"

packages/contracts/package.json

@@ -2,7 +2,7 @@
   "name": "contracts",
   "version": "0.0.8",
   "private": true,
-  "description": "Contracts for Protocol",
+  "descripticon": "Contracts for Protocol",
   "scripts": {
     "account": "node script/ListAccount.js",
     "chain": "anvil --config-out localhost.json",
@@ -13,9 +13,11 @@
     "lint": "pnpm run prettier && pnpm run solhint",
     "anvil": "source .env && anvil --fork-url $ANVIL_FORK_URL --chain-id $ANVIL_CHAIN_ID",
     "build": "forge build",
-    "test": "pnpm run build && forge test -f https://sepolia-rollup.arbitrum.io/rpc --gas-report",
-    "deploy:arbitrum": "source .env && FOUNDRY_PROFILE=arbitrum forge script script/Arbitrum.s.sol:ArbitrumScript --private-key $FORGE_PRIVATE_KEY --etherscan-api-key $ETHERSCAN_API_KEY --broadcast",
-    "deploy:arbitrum-sepolia": "source .env && FOUNDRY_PROFILE=arbitrum-sepolia forge script script/ArbitrumSepolia.s.sol:ArbitrumScript --private-key $FORGE_PRIVATE_KEY --etherscan-api-key $ETHERSCAN_API_KEY --broadcast"
+    "test": "pnpm run build && forge test -f https://eth-sepolia.g.alchemy.com/v2/i2qnBKk5GQ8pVGPLA-G3D9il5o0ULQO3 --gas-report",
+    "deploy:counter": "source .env && forge script script/Counter.s.sol:CounterScript --private-key $PRIVATE_KEY --etherscan-api-key $API_KEY_ETHERSCAN",
+    "deploy:action": "source .env && forge script script/DeployActionRegistry.s.sol:DeployActionRegistry --private-key $PRIVATE_KEY --etherscan-api-key $API_KEY_ETHERSCAN",
+    "deploy:garden": "source .env && forge script script/DeployGardenToken.s.sol:DeployGardenToken --private-key $PRIVATE_KEY --etherscan-api-key $API_KEY_ETHERSCAN",
+    "deploy:resolvers": "source .env && forge script script/DeployResolvers.s.sol:DeployResolvers --private-key $PRIVATE_KEY --etherscan-api-key $API_KEY_ETHERSCAN"
   },
   "dependencies": {
     "@ethereum-attestation-service/eas-contracts": "1.7.1",
@@ -29,7 +31,6 @@
     "toml": "~3.0.0",
     "solidity-coverage": "^0.8.12",
     "solhint": "^5.0.3",
-    "forge-std": "github:foundry-rs/forge-std#v1.8.1",
     "prettier": "^3.3.3",
     "prettier-plugin-solidity": "^1.4.0"
   }

packages/contracts/remappings.txt

@@ -1,7 +1,7 @@
-ds-test=./node_modules/ds-test/src/
-forge-std=./node_modules/forge-std/src/
-@openzeppelin/contracts=lib/tokenbound/lib/openzeppelin-contracts/contracts/
-@openzeppelin/contracts-upgradeable=./node_modules/@openzeppelin/contracts-upgradeable/
-@eas=./node_modules/@ethereum-attestation-service/eas-contracts/contracts/
 @tokenbound=./lib/tokenbound/src/
 erc6551/=lib/tokenbound/lib/erc6551/src/
+forge-std=./lib/tokenbound/lib/forge-std/src/
+ds-test=./lib/tokenbound/lib/forge-std/lib/ds-test/src/
+@eas=./node_modules/@ethereum-attestation-service/eas-contracts/contracts/
+@openzeppelin/contracts=lib/tokenbound/lib/openzeppelin-contracts/contracts/
+@openzeppelin/contracts-upgradeable=./node_modules/@openzeppelin/contracts-upgradeable/

packages/contracts/script/Counter.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.25;
 
-import "forge-std/Script.sol";
+import { Script } from "forge-std/Script.sol";
 
 contract CounterScript is Script {
     function setUp() public {}

packages/contracts/script/DeployActionRegistry.s.sol

@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.25;
+
+import { Script, console } from "forge-std/Script.sol";
+import { Create2 } from "@openzeppelin/contracts/utils/Create2.sol";
+import { FACTORY, SALT } from "../src/Constants.sol";
+import { ActionRegistry, Capital } from "../src/registries/Action.sol";
+
+/// @title DeployActionRegistry
+/// @notice Script for deploying the ActionRegistry contract using CREATE2.
+contract DeployActionRegistry is Script {
+    function run() public {
+        // Calculate the CREATE2 address for the ActionRegistry
+        address predictedRegistryAddress = Create2.computeAddress(
+            SALT,
+            keccak256(abi.encodePacked(type(ActionRegistry).creationCode, "")),
+            FACTORY
+        );
+
+        // Check if the contract is already deployed
+        if (predictedRegistryAddress.code.length == 0) {
+            vm.startBroadcast();
+            ActionRegistry newRegistry = new ActionRegistry{ salt: SALT }();
+
+            Capital[] memory capitals = new Capital[](1);
+            capitals[0] = Capital.LIVING;
+
+            string[] memory media = new string[](2);
+            media[0] = "QmWYQY9vnb9ot7u49UMeH41DdjZghrgr2YoaYaNwYSpeAn";
+            media[1] = "QmS9K5EdyakRPW7gV86xivaUNx1AuhPUzUSRD53WnjL4Uz";
+
+            newRegistry.initialize(address(this));
+            newRegistry.registerAction(
+                block.timestamp,
+                block.timestamp + 30 days,
+                "Test Action 1",
+                "QmTmbcRyKtkMpMFWsm6D8YpgwMUuds3jE4sJdjqhqFGvWe",
+                capitals,
+                media
+            );
+            newRegistry.registerAction(
+                block.timestamp,
+                block.timestamp + 30 days,
+                "Test Action 2",
+                "QmTmbcRyKtkMpMFWsm6D8YpgwMUuds3jE4sJdjqhqFGvWe",
+                capitals,
+                media
+            );
+
+            vm.stopBroadcast();
+
+            console.log("ActionRegistry deployed at:", predictedRegistryAddress);
+        } else {
+            console.log("ActionRegistry already exists at:", predictedRegistryAddress);
+        }
+
+        // Print out verification commands
+        console.log("\nVerification Commands:\n");
+        console.log(
+            "ActionRegistry: forge verify-contract --num-of-optimizations 200 --chain-id",
+            block.chainid,
+            predictedRegistryAddress
+        );
+    }
+}