From 7c17acab0edb8fa59809dcafcc2a83bc15d12839 Mon Sep 17 00:00:00 2001
From: Ramesh Nair <ram@hiddentao.com>
Date: Tue, 15 Oct 2024 16:27:26 +0700
Subject: [PATCH] fix: script call async

---
 gemforge.deployments.json | 64 ++++++++++++++++++++++-----------------
 script/gemforge/deploy.js |  2 +-
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/gemforge.deployments.json b/gemforge.deployments.json
index af81a9e..a8268e0 100644
--- a/gemforge.deployments.json
+++ b/gemforge.deployments.json
@@ -518,68 +518,78 @@
   "baseFork": {
     "chainId": 8453,
     "contracts": [
-      {
-        "name": "DiamondProxy",
-        "fullyQualifiedName": "DiamondProxy.sol:DiamondProxy",
-        "sender": "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3",
-        "txHash": "0x80520bc3ef66046aeab62896d306a076b0e5a83a0ae2f806fbbb2682162cf473",
-        "onChain": {
-          "address": "0x314d7f9e2f55B430ef656FBB98A7635D43a2261E",
-          "constructorArgs": [
-            "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3"
-          ]
-        }
-      },
       {
         "name": "ACLFacet",
         "fullyQualifiedName": "ACLFacet.sol:ACLFacet",
-        "sender": "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3",
-        "txHash": "0x007e9cee893be48bb43cec25bb739d22202a70b3f7d4359891c2b3d2ebd7f7ea",
+        "sender": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+        "txHash": "0x760e1c23ec69c5ef42592c03273d099001685db9bf8c92907f8341c9cdbbaff5",
         "onChain": {
-          "address": "0x86fB6A93Be6dA5A3BD906aF1EFF079C27e32103e",
+          "address": "0xB22C255250d74B0ADD1bfB936676D2a299BF48Bd",
           "constructorArgs": []
         }
       },
       {
         "name": "GovernanceFacet",
         "fullyQualifiedName": "GovernanceFacet.sol:GovernanceFacet",
-        "sender": "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3",
-        "txHash": "0xe25ec3e21d15e079c6bb556dba9baa7d077c2c72243c470b273d68ac8edfb729",
+        "sender": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+        "txHash": "0x07478e9f4d97d4e6081490a8ee8323e7e7122dc41b88118e8ec3d2f33f9ac826",
         "onChain": {
-          "address": "0xCfA48D04cCD78a36a7f804c85F37efA4A483c904",
+          "address": "0x666D0c3da3dBc946D5128D06115bb4eed4595580",
           "constructorArgs": []
         }
       },
       {
         "name": "NaymsOwnershipFacet",
         "fullyQualifiedName": "NaymsOwnershipFacet.sol:NaymsOwnershipFacet",
-        "sender": "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3",
-        "txHash": "0xd16a3f4100c9f91f2297f65e1f812f35fef80ba81dd7656be97d2ffcb8dff588",
+        "sender": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+        "txHash": "0xfa6fd3ab2ac64fa9d1c5ccbdeb4ff57fc571cf83bddfa22fa2df8f7cf1e842b7",
         "onChain": {
-          "address": "0x7c6294721cF5b07e77e8D5B9491aC0301d35ebE5",
+          "address": "0x742489F22807ebB4C36ca6cD95c3e1C044B7B6c8",
           "constructorArgs": []
         }
       },
       {
         "name": "NaymsTokenFacet",
         "fullyQualifiedName": "NaymsTokenFacet.sol:NaymsTokenFacet",
-        "sender": "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3",
-        "txHash": "0x17871ce05d34a7f510ff85e8468c6e28a802e1901a32fa396a4abff8bb137841",
+        "sender": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+        "txHash": "0xfae0ee9f4d3962a6a5a8a502182d1d4b46fec681bdf0d4f49668f95e65bb3ef7",
         "onChain": {
-          "address": "0x0c554DA93cBDe9db997dea515E259b0b3FB993f0",
+          "address": "0x1D8D70AD07C8E7E442AD78E4AC0A16f958Eba7F0",
           "constructorArgs": []
         }
       },
       {
         "name": "PhasedDiamondCutFacet",
         "fullyQualifiedName": "PhasedDiamondCutFacet.sol:PhasedDiamondCutFacet",
-        "sender": "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3",
-        "txHash": "0xf6b8c0ad1f626017b19dadb085900d0ba0fac40d193c03fb083afed6bba68933",
+        "sender": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+        "txHash": "0xd3f36fc57aad2fed61c0d1f8e9b9645e62bd9c03f27d406c27b0c2eafe3a3310",
+        "onChain": {
+          "address": "0xA9e6Bfa2BF53dE88FEb19761D9b2eE2e821bF1Bf",
+          "constructorArgs": []
+        }
+      },
+      {
+        "name": "InitializationTest1",
+        "fullyQualifiedName": "InitializationTest1.sol:InitializationTest1",
+        "sender": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+        "txHash": "0xceae012519af5fbfc2bcbda24348588d3fc021cc2580cdc11712fb5d22c214b5",
         "onChain": {
-          "address": "0xf9175C6E825A2F1e4Cd3C728CB7E85956580A042",
+          "address": "0x1E3b98102e19D3a164d239BdD190913C2F02E756",
           "constructorArgs": []
         }
       },
+      {
+        "name": "DiamondProxy",
+        "fullyQualifiedName": "DiamondProxy.sol:DiamondProxy",
+        "sender": "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3",
+        "txHash": "0x80520bc3ef66046aeab62896d306a076b0e5a83a0ae2f806fbbb2682162cf473",
+        "onChain": {
+          "address": "0x314d7f9e2f55B430ef656FBB98A7635D43a2261E",
+          "constructorArgs": [
+            "0xD7df2D4f677D73a823147eDDD665C9D471E8b8d3"
+          ]
+        }
+      },
       {
         "name": "InitDiamond",
         "fullyQualifiedName": "InitDiamond.sol:InitDiamond",
diff --git a/script/gemforge/deploy.js b/script/gemforge/deploy.js
index 1b26171..7def5df 100755
--- a/script/gemforge/deploy.js
+++ b/script/gemforge/deploy.js
@@ -70,7 +70,7 @@ const assertThatUpgradeIsEnabled = async (targetId, cutFile) => {
         const upgradeInitArgs = (argv.upgradeInitContract && argv.upgradeInitMethod) 
             ? `--upgrade-init-contract ${argv.upgradeInitContract} --upgrade-init-method ${argv.upgradeInitMethod}`
             : "";
-        $(`yarn gemforge deploy ${targetArg} --pause-cut-to-file ${cutFile} ${upgradeInitArgs}`);
+        await $(`yarn gemforge deploy ${targetArg} --pause-cut-to-file ${cutFile} ${upgradeInitArgs}`);
         if (!fs.existsSync(cutFile)) {
             console.log(`No upgrade necessary!`);
         } else {