Feat/hwc 203 appkit

backend/package.json

@@ -20,6 +20,7 @@
     "test:e2e": "npx jest --config ./test/jest-e2e.json",
     "test:ci": "npx jest --ci --runInBand",
     "clear-cache": "npx jest --clearCache",
+    "clean": "rimraf dist coverage",
     "clean:modules": "rimraf node_modules",
     "deleteAllTransactions": "ts-node ./src/scripts/deleteAllDBTransactions.ts",
     "pre-commit": "npm run lint && npm run prettier"

contracts/.env.sample

@@ -27,8 +27,27 @@ TESTNET_MIRROR_NODE_ENDPOINT='https://testnet.mirrornode.hedera.com'
 MAINNET_JSON_RPC_ENDPOINT='https://mainnet.hashio.io/api'
 MAINNET_MIRROR_NODE_ENDPOINT='https://mainnet.mirrornode.hedera.com'
 
-# * Deployed Contracts
-TESTNET_TOKENMANAGER='0x0000000000000000000000000000000000000000'
-TESTNET_FACTORY_PROXY='0x0000000000000000000000000000000000000000'
-TESTNET_FACTORY_PROXY_ADMIN='0x0000000000000000000000000000000000000000'
-TESTNET_FACTORY='0x0000000000000000000000000000000000000000'
+# * Reuse Deployed Contracts instead of deploying new ones
+#TESTNET_BUSINESSLOGICRESOLVER='0x0000000000000000000000000000000000000000'
+#TESTNET_BUSINESSLOGICRESOLVER_PROXY='0x0000000000000000000000000000000000000000'
+#TESTNET_BUSINESSLOGICRESOLVER_PROXY_ADMIN='0x0000000000000000000000000000000000000000'
+#TESTNET_STABLECOINFACTORYFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_STABLECOINFACTORYFACET_PROXY='0x0000000000000000000000000000000000000000'
+#TESTNET_DIAMONDFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_HEDERATOKENMANAGER='0x0000000000000000000000000000000000000000'
+#TESTNET_HEDERARESERVEFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_BURNABLEFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_CASHINFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_CUSTOMFEESFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_DELETABLEFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_FREEZABLEFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_HOLDMANAGEMENTFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_KYCFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_PAUSABLEFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_RESCUABLEFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_RESERVEFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_ROLEMANAGEMENTFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_ROLESFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_SUPPLIERADMINFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_TOKENOWNERFACET='0x0000000000000000000000000000000000000000'
+#TESTNET_WIPEABLEFACET='0x0000000000000000000000000000000000000000'

contracts/configuration/Configuration.ts

@@ -205,11 +205,11 @@ export default class Configuration {
 
             if (address !== EMPTY_STRING) {
                 const proxyAddress = Configuration._getEnvironmentVariable({
-                    name: `${network.toUpperCase()}_${contractName}${SUFIXES.proxy}`,
+                    name: `${network.toUpperCase()}_${contractName.toUpperCase()}${SUFIXES.proxy}`,
                     defaultValue: EMPTY_STRING,
                 })
                 const proxyAdminAddress = Configuration._getEnvironmentVariable({
-                    name: `${network.toUpperCase()}_${contractName}${SUFIXES.proxyAdmin}`,
+                    name: `${network.toUpperCase()}_${contractName.toUpperCase()}${SUFIXES.proxyAdmin}`,
                     defaultValue: EMPTY_STRING,
                 })
 

contracts/package.json

@@ -47,9 +47,9 @@
         "test:supplieradmin": "npx hardhat test test/thread0/supplieradmin.test.ts",
         "test:upgradable": "npx hardhat test test/thread1/upgradable.test.ts",
         "test:wipeable": "npx hardhat test test/thread0/wipeable.test.ts",
-        "clean": "npx hardhat clean",
+        "clean": "rimraf build cache docs && npx hardhat clean",
         "clean:modules": "rimraf node_modules",
-        "clean:all": "rimraf artifacts cache coverage node_modules build typechain-types && npm run clean",
+        "clean:all": "rimraf node_modules build cache docs typechain-types coverage && npx hardhat clean",
         "size": "npx hardhat size-contracts",
         "lint:sol": "solhint 'contracts/**/*.sol'",
         "lint:ts": "npx eslint . --ext .ts",

contracts/scripts/deploy.ts

@@ -159,7 +159,8 @@ export async function deployFullInfrastructure({
     useEnvironment,
     partialBatchDeploy,
 }: DeployFullInfrastructureCommand): Promise<DeployFullInfrastructureResult> {
-    console.log(MESSAGES.deploy.info.deployFullInfrastructure)
+    const startDate = new Date().toJSON()
+    console.log(`[${startDate}] ${MESSAGES.deploy.info.deployFullInfrastructure}`)
     if (useEnvironment && environment.initialized) {
         return environment.toDeployScsFullInfrastructureResult()
     }
@@ -241,7 +242,8 @@ export async function deployFullInfrastructure({
     // Store the proxy address in the deployed contract list
     deployedContractList.stableCoinFactoryFacet.proxyAddress = stableCoinFactoryResolverProxy.address
 
-    console.log(MESSAGES.deploy.success.deployFullInfrastructure)
+    const endDate = new Date().toJSON()
+    console.log(`[${endDate}] ${MESSAGES.deploy.success.deployFullInfrastructure}`)
 
     // * Update Environment
     if (useEnvironment) {
@@ -572,6 +574,7 @@ export async function deployContract<
             receipt: undefined,
         })
     }
+    await new Promise((resolve) => setTimeout(resolve, 2000))
     if (deployType === 'direct') {
         const deployCommand = await DeployContractDirectCommand.newInstance({
             name,

contracts/scripts/resolverDiamondCut.ts

@@ -51,6 +51,8 @@ async function processFacetLists(
     const batchSize = Math.ceil(facetIdList.length / 2)
 
     for (let i = 0; i < facetIdList.length; i += batchSize) {
+        // delay to prevent errors in RPC from too many calls
+        await new Promise((resolve) => setTimeout(resolve, 2000))
         const batchIds = facetIdList.slice(i, i + batchSize)
         const batchVersions = facetVersionList.slice(i, i + batchSize)
         const batch = createFacetConfigurations(batchIds, batchVersions)