CORE CONNECT CEBU

.gitignore

@@ -1,9 +1,12 @@
 node_modules
 .env
+.env.local
+.env.*.local
 
 # Hardhat files
 /cache
 /artifacts
+/deployments
 
 # TypeChain files
 /typechain
@@ -13,5 +16,20 @@ node_modules
 /coverage
 /coverage.json
 
-# Hardhat Ignition default folder for deployments against a local node
-ignition/deployments/chain-31337
+# Hardhat Ignition files
+/ignition/deployments
+/ignition/cache
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS files
+.DS_Store
+Thumbs.db
+.aider*
+
+# Environment files
+**/.env

01-solidity/README.md

@@ -1,13 +1,39 @@
-# Sample Hardhat Project
+# Solidity Learning Project
 
-This project demonstrates a basic Hardhat use case. It comes with a sample contract, a test for that contract, and a Hardhat Ignition module that deploys that contract.
+This project contains examples demonstrating various Solidity concepts and features. Each contract and test focuses on a specific aspect of Solidity development using the Hardhat framework.
 
-Try running some of the following tasks:
+## Project Structure
+
+- `contracts/`: Contains example Solidity smart contracts
+- `test/`: Contains corresponding test files for each contract
+- `ignition/`: Contains deployment modules
+
+## Available Commands
 
 ```shell
+# Show all available Hardhat commands
 npx hardhat help
+
+# Run all tests
 npx hardhat test
+
+# Run tests with gas reporting enabled
 REPORT_GAS=true npx hardhat test
+
+# Start a local Hardhat node
 npx hardhat node
+
+# Deploy contracts using Hardhat Ignition
 npx hardhat ignition deploy ./ignition/modules/Lock.ts
 ```
+
+## Concepts Covered
+
+1. Data Types (01_solidity_data_types.sol)
+2. Constructors (02_solidity_constructor.sol) 
+3. Functions (03_solidity_functions.sol)
+4. Modifiers (04_solidity_modifiers.sol)
+5. Error Handling (05_solidity_errors.sol)
+6. Events (06_solidity_events.sol)
+
+Each contract includes examples and tests demonstrating the specific concept.

01-solidity/contracts/01_solidity_data_types.sol

@@ -13,10 +13,10 @@ contract SolidityDataTypes {
         accounts["theblokc"] = 999999;
 
         // TODO: print the values above using console.log
-        // console.log("balance is ", balance);
+        console.log("balance is ", balance);
 
-        // console.log("owner is ", owner);
+        console.log("owner is ", owner);
 
-        // console.log("account is ", accounts["theblokc"]);
+        console.log("account is ", accounts["theblokc"]);
     }
 }

01-solidity/contracts/02_solidity_constructor.sol

@@ -6,8 +6,8 @@ contract SolidityConstructor {
     uint256 balance = 0;
 
     constructor(uint256 initialBalance) {
-        // balance = initialBalance;
+        balance = initialBalance;
 
-        // console.log("balance is now ", balance);
+        console.log("balance is now ", balance);
     }
 }

01-solidity/contracts/03_solidity_functions.sol

@@ -6,14 +6,14 @@ contract SolidityFunctions {
     uint256 balance = 0;
 
     constructor(uint256 initialBalance) {
-        // balance = initialBalance;
+        balance = initialBalance;
     }
 
     function addBalance(uint256 toAddBalance) public {
-        // balance += toAddBalance;
+        balance += toAddBalance;
     }
 
     function getBalance() public view returns (uint256) {
-        // return balance;
+        return balance;
     }
 }

01-solidity/contracts/04_solidity_modifiers.sol

@@ -12,8 +12,8 @@ contract SolidityModifiers {
     }
 
     modifier isAdmin() {
-        // require(msg.sender == admin, "You are not allowed!");
-        // _;
+        require(msg.sender == admin, "You are not allowed!");
+        _;
     }
 
     function addBalance(uint256 toAddBalance) public isAdmin {

01-solidity/contracts/05_solidity_errors.sol

@@ -9,22 +9,22 @@ contract SolidityErrors {
     uint256 balance = 0;
 
     constructor(uint256 initialBalance, address allowedAddress) {
-        // balance = initialBalance;
-        // admin = allowedAddress;
+        balance = initialBalance;
+        admin = allowedAddress;
     }
 
     modifier isAdmin() {
-        // if (msg.sender != admin) {
-        //     revert YouAreNotError();
-        // }
-        // _;
+        if (msg.sender != admin) {
+            revert YouAreNotError();
+        }
+        _;
     }
 
     function addBalance(uint256 toAddBalance) public isAdmin {
-        // balance += toAddBalance;
+        balance += toAddBalance;
     }
 
     function getBalance() public view returns (uint256) {
-        // return balance;
+        return balance;
     }
 }

01-solidity/contracts/06_solidity_events.sol

@@ -8,15 +8,15 @@ contract SolidityEvents {
     uint256 balance = 0;
 
     constructor(uint256 initialBalance) {
-        // balance = initialBalance;
+        balance = initialBalance;
     }
 
     function addBalance(uint256 toAddBalance) public {
-        // balance += toAddBalance;
-        // emit BalanceAdded(msg.sender);
+        balance += toAddBalance;
+        emit BalanceAdded(msg.sender);
     }
 
     function getBalance() public view returns (uint256) {
-        // return balance;
+        return balance;
     }
 }

01-solidity/contracts/counter.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+contract CounterSmartContract {
+    //declaring variable count
+    int private count;
+
+    function increment () public {
+        count += 1;
+    }
+    //decrement
+    function decrement () public {
+        count -= 1;
+    }
+    //get count value
+    function getCount() public view returns (int) {
+        return count;
+    }
+}

01-solidity/hardhat.config.ts

@@ -1,8 +1,33 @@
+import path from 'path'
+import { config as dotenvConfig } from "dotenv";
+import { resolve } from "path";
+
 import { HardhatUserConfig } from "hardhat/config";
 import "@nomicfoundation/hardhat-toolbox";
 
+dotenvConfig({ path: resolve(__dirname, "./.env") });
+
+const PRIVATE_KEY = process.env.PRIVATEKEY ?? "0000000000000000000000000000000000000000000000000000000000000001";
+
 const config: HardhatUserConfig = {
-  solidity: "0.8.28",
+  solidity: {
+    version: "0.8.28",
+    settings: {
+      optimizer: {
+        enabled: true,
+        runs: 200
+      }
+    }
+  },
+  networks: {
+    core_testnet: {
+      url: "https://rpc.test2.btcs.network",
+      chainId: 1114,
+      accounts: [PRIVATE_KEY],
+      gasPrice: 1000000000, // 1 gwei
+      gas: 3000000 // higher gas limit
+    }
+  }
 };
 
 export default config;

01-solidity/package.json

@@ -20,6 +20,7 @@
     "@types/mocha": ">=9.1.0",
     "@types/node": ">=18.0.0",
     "chai": "^4.2.0",
+    "dotenv": "^16.4.7",
     "ethers": "^6.4.0",
     "hardhat-gas-reporter": "^1.0.8",
     "solidity-coverage": "^0.8.0",

01-solidity/scripts/deploy.ts

@@ -0,0 +1,19 @@
+import hre from 'hardhat'
+import { CounterSmartContract__factory } from '../typechain-types'
+
+
+async function Main() {
+
+  const contractFactory = await hre.ethers.getContractFactory("CounterSmartContract");
+  const deployment = await contractFactory.deploy();
+  await deployment.waitForDeployment();
+
+  console.log(`${deployment.target}`);
+
+  // const contractFactory = await hre.ethers.getContractFactory(CounterSmartContract__factory)
+  // const counter = await contractFactory.deploy();
+  // await counter.waitForDevelopment();
+  // console.log(`deployed to ${counter.target}`);
+}
+
+Main()

02-hardhat/contracts/Lock.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.28;
 
 // Uncomment this line to use console.log
-// import "hardhat/console.sol";
+import "hardhat/console.sol";
 
 contract Lock {
     uint public unlockTime;
@@ -22,7 +22,7 @@ contract Lock {
 
     function withdraw() public {
         // Uncomment this line, and the import of "hardhat/console.sol", to print a log in your terminal
-        // console.log("Unlock time is %o and block timestamp is %o", unlockTime, block.timestamp);
+         console.log("Unlock time is %o and block timestamp is %o", unlockTime, block.timestamp);
 
         require(block.timestamp >= unlockTime, "You can't withdraw yet");
         require(msg.sender == owner, "You aren't the owner");

02-hardhat/hardhat.config.ts

@@ -1,5 +1,5 @@
 import path from 'path'
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') });
+require('dotenv').config({ path: path.resolve(__dirname, './.env') });
 import { HardhatUserConfig } from "hardhat/config";
 import "@nomicfoundation/hardhat-toolbox";
 

02-hardhat/package.json

@@ -1,5 +1,6 @@
 {
 	"dependencies": {
+		"dotenv": "^16.4.7",
 		"hardhat": "^2.22.18"
 	},
 	"devDependencies": {

02-hardhat/scripts/deploy.js

@@ -7,22 +7,22 @@
 const hre = require("hardhat");
 
 async function main() {
-  // const currentTimestampInSeconds = Math.round(Date.now() / 1000);
-  // const unlockTime = currentTimestampInSeconds + 60;
+  const currentTimestampInSeconds = Math.round(Date.now() / 1000);
+  const unlockTime = currentTimestampInSeconds + 60;
 
-  // const lockedAmount = hre.ethers.parseEther("0.001");
+  const lockedAmount = hre.ethers.parseEther("0.2");
 
-  // const lock = await hre.ethers.deployContract("Lock", [unlockTime], {
-  //   value: lockedAmount,
-  // });
+  const lock = await hre.ethers.deployContract("Lock", [unlockTime], {
+  value: lockedAmount,
+  });
 
-  // await lock.waitForDeployment();
+  await lock.waitForDeployment();
 
-  // console.log(
-  //   `Lock with ${ethers.formatEther(
-  //     lockedAmount
-  //   )}ETH and unlock timestamp ${unlockTime} deployed to ${lock.target}`
-  // );
+  console.log(
+  `Lock with ${ethers.formatEther(
+    lockedAmount
+  )}ETH and unlock timestamp ${unlockTime} deployed to ${lock.target}`
+  );
 }
 
 // We recommend this pattern to be able to use async/await everywhere