fix deploy script

bosonprotocol · Mar 15, 2023 · d52616d · d52616d
1 parent 1f320fe
commit d52616d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/scripts/config/facet-deploy.js b/scripts/config/facet-deploy.js
@@ -70,8 +70,9 @@ async function getFacets(config) {
     return acc;
   }, {});
 
-  facetArgs["ConfigHandlerFacet"] = ConfigHandlerFacetInitArgs;
-  facetArgs["MetaTransactionsHandlerFacet"] = [MetaTransactionsHandlerFacetInitArgs];
+  facetArgs["ConfigHandlerFacet"] = { init: ConfigHandlerFacetInitArgs };
+  facetArgs["MetaTransactionsHandlerFacet"] = { init: [MetaTransactionsHandlerFacetInitArgs] };
+  facetArgs["ExchangeHandlerFacet"] = { constructorArgs: [protocolConfig.EXCHANGE_ID_2_2_0[network]] };
 
   return facetArgs;
 }

diff --git a/scripts/config/protocol-parameters.js b/scripts/config/protocol-parameters.js
@@ -69,4 +69,10 @@ module.exports = {
     mumbai: "0x4102621Ac55e068e148Da09151ce92102c952aab", //dummy
     polygon: "0x17CDD65bebDe68cd8A4045422Fcff825A0740Ef9", //dummy
   },
+
+  EXCHANGE_ID_2_2_0: {
+    hardhat: 1,
+    mumbai: 1, // TODO: adjust for actual deployment
+    polygon: 2, // TODO: adjust for actual deployment
+  },
 };
diff --git a/scripts/util/deploy-protocol-handler-facets.js b/scripts/util/deploy-protocol-handler-facets.js
@@ -96,11 +96,8 @@ async function deployProtocolFacets(facetNames, facetsToInit, maxPriorityFeePerG
       cut: [],
     };
 
-    if (facetsToInit[facetName] && facetsToInit[facetName].init && facetName !== "ProtocolInitializationHandlerFacet") {
-      const calldata = facetContract.interface.encodeFunctionData(
-        "initialize",
-        facetsToInit[facetName].init.length && facetsToInit[facetName].init
-      );
+    if (facetsToInit[facetName] && facetName !== "ProtocolInitializationHandlerFacet") {
+      const calldata = facetContract.interface.encodeFunctionData("initialize", facetsToInit[facetName].init || []);
 
       deployedFacet.initialize = calldata;
     }

diff --git a/test/util/utils.js b/test/util/utils.js
@@ -257,8 +257,7 @@ async function getFacetsWithArgs(facetNames, config) {
   const facets = await getFacets(config);
   const keys = Object.keys(facets).filter((key) => facetNames.includes(key));
   return keys.reduce((obj, key) => {
-    obj[key] = { init: facets[key] };
-    if (key == "ExchangeHandlerFacet") obj[key].constructorArgs = [1]; // Set starting exchange id for v2.2.0. In tests, this is 1.
+    obj[key] = facets[key];
     return obj;
   }, {});
 }