Fix events (#237)

* fix emission for ipOrg config * deployed fix events --------- Co-authored-by: Raul <[email protected]>
storyprotocol · Dec 8, 2023 · fb256f1 · fb256f1
1 parent 0cb6341
commit fb256f1
Show file tree

Hide file tree

Showing 10 changed files with 10,887 additions and 742 deletions.
diff --git a/broadcast/Main.s.sol/11155111/run-1702012225.json b/broadcast/Main.s.sol/11155111/run-1702012225.json
diff --git a/broadcast/Main.s.sol/11155111/run-1702012251.json b/broadcast/Main.s.sol/11155111/run-1702012251.json
diff --git a/broadcast/Main.s.sol/11155111/run-1702012356.json b/broadcast/Main.s.sol/11155111/run-1702012356.json
diff --git a/broadcast/Main.s.sol/11155111/run-1702012387.json b/broadcast/Main.s.sol/11155111/run-1702012387.json
diff --git a/broadcast/Main.s.sol/11155111/run-1702012431.json b/broadcast/Main.s.sol/11155111/run-1702012431.json
diff --git a/broadcast/Main.s.sol/11155111/run-1702012710.json b/broadcast/Main.s.sol/11155111/run-1702012710.json
diff --git a/broadcast/Main.s.sol/11155111/run-latest.json b/broadcast/Main.s.sol/11155111/run-latest.json
diff --git a/contracts/interfaces/modules/licensing/ILicensingModule.sol b/contracts/interfaces/modules/licensing/ILicensingModule.sol
@@ -23,11 +23,13 @@ interface ILicensingModule is IModule {
     /// Emits when an IP org sets a parameter of a licensing framework.
     /// @param ipOrg address of the IP org
     /// @param paramTag the tag of the parameter
-    /// @param defaultValue the default value of the parameter
+    /// @param paramType the default value of the parameter
+    /// @param paramValue the type of the parameter
     event ParameterSet(
         address indexed ipOrg,
         string paramTag,
-        bytes defaultValue
+        Licensing.ParameterType paramType,
+        bytes paramValue
     );
 
     /// Gets the licensing framework of an IP org.

diff --git a/contracts/modules/licensing/LicensingModule.sol b/contracts/modules/licensing/LicensingModule.sol
@@ -410,6 +410,12 @@ contract LicensingModule is BaseModule, ILicensingModule {
             ipOrgAddress
         ];
         uint256 numParams = configParams.length;
+        emit IpOrgLicensingFrameworkSet(
+            ipOrgAddress,
+            config.frameworkId,
+            LICENSING_FRAMEWORK_REPO.getLicenseTextUrl(config.frameworkId),
+            config.licensor
+        );
         // Add the parameters to storage
         for (uint256 i = 0; i < numParams; i++) {
             Licensing.ParamValue memory param = configParams[i];
@@ -422,14 +428,9 @@ contract LicensingModule is BaseModule, ILicensingModule {
                 revert Errors.LicensingModule_InvalidParamValue();
             }
             paramValues[param.tag] = param.value;
-            emit ParameterSet(ipOrgAddress, param.tag.toString(), param.value);
+            emit ParameterSet(ipOrgAddress, param.tag.toString(), paramDef.paramType, param.value);
         }
-        emit IpOrgLicensingFrameworkSet(
-            ipOrgAddress,
-            config.frameworkId,
-            LICENSING_FRAMEWORK_REPO.getLicenseTextUrl(config.frameworkId),
-            config.licensor
-        );
+
         return "";
     }
 

diff --git a/deployment-11155111.json b/deployment-11155111.json
@@ -1,19 +1,19 @@
 {
   "main": {
-    "AccessControlSingleton-Impl": "0xCF723c4072183965d25aFc1c7589E6008f054b12",
-    "AccessControlSingleton-Proxy": "0xB8E15a0CC5695165C7a1ABbA40B55fE04061DBd0",
-    "IPAssetRegistry": "0xEd05dcB9EF77DB02d831377865Ba374C00228C3F",
-    "IPOrgController-Impl": "0x46e4646266C113D65De1899A145F1e7749E93388",
-    "IPOrgController-Proxy": "0x8492e251305CdE6d4dab54240551588D7a91BD23",
-    "LicenseRegistry": "0x5e17aC4Ba7995Fc9335F6187d4282D9982918F68",
-    "LicensingFrameworkRepo": "0xc0C25d92b6C71fcdC1dE84C37bd623dD7a0b5e05",
-    "LicensingModule": "0x20B4b22Ddb3b5043938454544eD6E3b77F23676F",
-    "MockERC721": "0x9505DF44eEa46b1a0BBEa1E76839815B3532FF38",
-    "ModuleRegistry": "0xc42981fc4AeAB64B626627c0173f19DAc04F06e5",
-    "PolygonTokenHook": "0x43d3EA92Ef75a3DA352a205F3258c6b425b1fd8C",
-    "RegistrationModule": "0x1FA57D55E45B898b337c05E7198f0f72FFD198b1",
-    "RelationshipModule": "0xBe14Ce44659d123759E5B7786165eC3a91c27FDA",
-    "StoryProtocol": "0x3af4Fc16c28690EDd3A590486c8B37161afCf9c7",
-    "TokenGatedHook": "0xa76c8360b49c4448Ea9a21Ce57D9197B4E8F44D0"
+    "AccessControlSingleton-Impl": "0x8db8b66518E9Cb412aF5573c5423582587117533",
+    "AccessControlSingleton-Proxy": "0x518cCD79E0E7B75fd5Fcc09463FB09cB7D55470d",
+    "IPAssetRegistry": "0x5B81030C087d41558E3FCF23B3575E85c9A768e6",
+    "IPOrgController-Impl": "0x9Be54430f2962a115353Ad2e8c62A106bBe71849",
+    "IPOrgController-Proxy": "0xC4F7E87F9FF2A2DF9bC7FF8399558B594EBF911A",
+    "LicenseRegistry": "0x826a953332Df2e1a994C7CFae68E129ba683Aa8F",
+    "LicensingFrameworkRepo": "0x3113e5bfe2251A9fcA1225083cf6d36547E63e07",
+    "LicensingModule": "0x058bB0D7795CfA2a46C60C0b63F8f0fa7cD1EEd5",
+    "MockERC721": "0x4facD61ea098FB09C03dBE33D98Cc8Fe4D35eb5e",
+    "ModuleRegistry": "0x51870A0659A87c7B46baEF7311B3128006E1FB16",
+    "PolygonTokenHook": "0x6b71284309DF6871cC28595d938eC57A5Ad06A0A",
+    "RegistrationModule": "0xD3E9F80F4Cc22761587B19A7F5335A017bcB0eCd",
+    "RelationshipModule": "0x5fb712AF304570aD9599e55E1105b7a42a5e30Db",
+    "StoryProtocol": "0x25A6f44df208E8Cc79E97fE72E240F4cDb3D9a46",
+    "TokenGatedHook": "0x919Cc6581801039f92863862B186025a1F562B17"
   }
 }