Sprint-4 (#109)

Signed-off-by: Miguel_LZPF <miguel.carpena@io.builders>

Author: MiguelLZPF

contracts/.env.sample

@@ -0,0 +1,35 @@
+# * Accounts and Keys
+# Private keys in RAW Format (Not DER)
+PRIVATE_KEY_0='exampleprivatekey0'
+PRIVATE_KEY_1='exampleprivatekey1'
+# Hedera Accounts
+ACCOUNT_0='0.0.example0'
+ACCOUNT_1='0.0.example1'
+
+# * Hedera Network
+NETWORK='hardhat' # 'hardhat' | 'testnet'
+
+# * Deployed Contracts
+RESOLVER_PROXY='0.0.example7'
+RESOLVER_PROXY_ADMIN='0.0.example8'
+RESOLVER_CONTRACT='0.0.example9'
+FACTORY_PROXY='0.0.example10'
+FACTORY_PROXY_ADMIN='0.0.example11'
+FACTORY_CONTRACT='0.0.example12'
+ACCESS_CONTROL='0.0.example13'
+CAP='0.0.example14'
+CONTROL_LIST='0.0.example15'
+PAUSE='0.0.example16'
+ERC20='0.0.example17'
+ERC1410='0.0.example18'
+ERC1594='0.0.example19'
+ERC1643='0.0.example20'
+ERC1644='0.0.example21'
+SNAPSHOTS='0.0.example22'
+DIAMOND_FACET='0.0.example23'
+EQUITY='0.0.example24'
+BOND='0.0.example25'
+SCHEDULED_SNAPSHOTS='0.0.example26'
+CORPORATE_ACTIONS_SECURITY='0.0.example27'
+LOCK='0.0.example28'
+TRANSFER_AND_LOCK='0.0.example29'

contracts/contracts/layer_2/interfaces/equity/IEquity.sol

@@ -218,7 +218,7 @@ interface IEquity {
         bool informationRight;
         bool liquidationRight;
         bool subscriptionRight;
-        bool convertionRight;
+        bool conversionRight;
         bool redemptionRight;
         bool putRight;
         DividendType dividendRight;

contracts/hardhat.config.d.ts

@@ -1,33 +1,57 @@
-import { HardhatUserConfig, task, types } from 'hardhat/config'
+import { HardhatUserConfig } from 'hardhat/config'
 import '@nomicfoundation/hardhat-toolbox'
 import 'hardhat-contract-sizer'
-import '@hashgraph/sdk'
-//import '@hashgraph/hardhat-hethers' // remove comment only when working with Hedera DLT
-//import './scripts/hardhatTasks' // remove comment only when deploying in HEdera DLT after compiling
-import * as dotenv from 'dotenv'
 import 'solidity-coverage'
+import '@hashgraph/sdk'
+import { getEnvVar } from './scripts/utils'
+// ! Uncomment the following lines to be able to use tasks AFTER compiling the project
+// import './tasks/utils'
+// import './tasks/deploy'
+// import './tasks/update'
 
-dotenv.config()
+if (getEnvVar({ name: 'NETWORK', defaultValue: 'hardhat' }) !== 'hardhat') {
+    require('@hashgraph/hardhat-hethers')
+}
 
-task('keccak256', 'Prints the keccak256 hash of a string')
-    .addPositionalParam(
-        'input',
-        'The string to be hashed',
-        undefined,
-        types.string
-    )
-    .setAction(async ({ input }: { input: string }, hre) => {
-        const hash = hre.ethers.utils.keccak256(Buffer.from(input, 'utf-8'))
-        console.log(hash)
-    })
+const HEDERA_ACCOUNTS = [
+    {
+        account: getEnvVar({ name: 'ACCOUNT_0', defaultValue: '0.0.0' }),
+        privateKey: getEnvVar({
+            name: 'PRIVATE_KEY_0',
+            defaultValue: '0x0000',
+        }).replace(/^0x/, ''),
+    },
+    {
+        account: getEnvVar({ name: 'ACCOUNT_1', defaultValue: '0.0.0' }),
+        privateKey: getEnvVar({
+            name: 'PRIVATE_KEY_1',
+            defaultValue: '0x0000',
+        }).replace(/^0x/, ''),
+    },
+]
+
+// Needed to be able to use the HederaConfig interface
+interface ExtendedHardhatUserConfig extends Omit<HardhatUserConfig, 'hedera'> {
+    hedera?: {
+        gasLimit: number
+        networks: {
+            [key: string]: {
+                accounts: {
+                    account: string
+                    privateKey: string
+                }[]
+            }
+        }
+    }
+}
 
-const config: HardhatUserConfig = {
+let config: ExtendedHardhatUserConfig = {
     solidity: {
         version: '0.8.18',
         settings: {
             optimizer: {
                 enabled: true,
-                runs: 1000,
+                runs: 200,
             },
         },
     },
@@ -37,92 +61,28 @@ const config: HardhatUserConfig = {
         runOnCompile: true,
         strict: true,
     },
-    //defaultNetwork: 'testnet', // remove comment only when working with Hedera DLT
-    // remove comment only when working with Hedera DLT
-    /*hedera: {
-        gasLimit: 300000,
-        networks: {
-            testnet: {
-                accounts: [
-                    {
-                        account:
-                            process.env['TESTNET_HEDERA_OPERATOR_ACCOUNT'] ??
-                            '',
-                        privateKey:
-                            process.env['TESTNET_HEDERA_OPERATOR_PRIVATEKEY'] ??
-                            '',
-                    },
-                    {
-                        account:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_ACCOUNT_ECDSA_1'
-                            ] ?? '',
-                        privateKey:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_PRIVATEKEY_ECDSA_1'
-                            ] ?? '',
-                    },
-                    {
-                        account:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_ACCOUNT_ECDSA_2'
-                            ] ?? '',
-                        privateKey:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_PRIVATEKEY_ECDSA_2'
-                            ] ?? '',
-                    },
-                    {
-                        account:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_ACCOUNT_ECDSA_3'
-                            ] ?? '',
-                        privateKey:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_PRIVATEKEY_ECDSA_3'
-                            ] ?? '',
-                    },
-                    {
-                        account:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_ACCOUNT_ECDSA_4'
-                            ] ?? '',
-                        privateKey:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_PRIVATEKEY_ECDSA_4'
-                            ] ?? '',
-                    },
-                    {
-                        account:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_ACCOUNT_ECDSA_5'
-                            ] ?? '',
-                        privateKey:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_PRIVATEKEY_ECDSA_5'
-                            ] ?? '',
-                    },
-                    {
-                        account:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_ACCOUNT_ECDSA_6'
-                            ] ?? '',
-                        privateKey:
-                            process.env[
-                                'TESTNET_HEDERA_OPERATOR_PRIVATEKEY_ECDSA_6'
-                            ] ?? '',
-                    },
-                ],
-            },
-        },
-    },*/
     typechain: {
         outDir: './typechain-types',
+        target: 'ethers-v5',
     },
     mocha: {
-        // Extend the timeout to 60 seconds (adjust as needed)
         timeout: 3000000,
     },
 }
+// If we are not using the hardhat network, we need to add the Hedera accounts
+if (getEnvVar({ name: 'NETWORK', defaultValue: 'hardhat' }) !== 'hardhat') {
+    config = {
+        ...config,
+        defaultNetwork: 'testnet',
+        hedera: {
+            gasLimit: 300000,
+            networks: {
+                testnet: {
+                    accounts: HEDERA_ACCOUNTS,
+                },
+            },
+        },
+    }
+}
 
 export default config