Rename knowledgeCollectionTokenId to knowledgeCollectionId

OriginTrail · Jan 17, 2025 · 1d81f12 · 1d81f12
1 parent c631a53
commit 1d81f12
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 76 deletions.
diff --git a/contracts/libraries/ParanetLib.sol b/contracts/libraries/ParanetLib.sol
@@ -12,7 +12,7 @@ library ParanetLib {
 
     struct UniversalCollectionLocator {
         address knowledgeCollectionStorageContract;
-        uint256 knowledgeCollectionTokenId;
+        uint256 knowledgeCollectionId;
     }
 
     enum NodesAccessPolicy {
@@ -137,15 +137,14 @@ library ParanetLib {
 
     struct KnolwedgeCollection {
         address knowledgeCollectionStorageContract;
-        uint256 knowledgeCollectionTokenId;
+        uint256 knowledgeCollectionId;
         address minerAddress;
         bytes32 paranetId;
     }
 
     struct UpdatingKnowledgeCollectionState {
         address knowledgeCollectionStorageContract;
-        uint256 knowledgeCollectionTokenId;
-        bytes32 assertionId;
+        uint256 knowledgeCollectionId;
         uint96 updateTokenAmount;
     }
 
@@ -171,10 +170,7 @@ library ParanetLib {
         uint256 claimedNeuro;
     }
 
-    error ParanetHasAlreadyBeenRegistered(
-        address knowledgeCollectionStorageAddress,
-        uint256 knowledgeCollectionTokenId
-    );
+    error ParanetHasAlreadyBeenRegistered(address knowledgeCollectionStorageAddress, uint256 knowledgeCollectionId);
     error InvalidParanetNodesAccessPolicy(
         ParanetLib.NodesAccessPolicy[] expectedAccessPolicies,
         ParanetLib.NodesAccessPolicy actualAccessPolicy
@@ -201,19 +197,19 @@ library ParanetLib {
     error ParanetCuratedMinerAccessRequestDoesntExist(bytes32 paranetId, address miner);
     error ParanetIncentivesPoolAlreadyExists(
         address knowledgeCollectionStorageAddress,
-        uint256 knowledgeCollectionTokenId,
+        uint256 knowledgeCollectionId,
         string poolType,
         address poolAddress
     );
-    error ParanetDoesntExist(address knowledgeCollectionStorageAddress, uint256 knowledgeCollectionTokenId);
+    error ParanetDoesntExist(address knowledgeCollectionStorageAddress, uint256 knowledgeCollectionId);
     error ParanetServiceHasAlreadyBeenRegistered(
         address knowledgeCollectionStorageAddress,
-        uint256 knowledgeCollectionTokenId
+        uint256 knowledgeCollectionId
     );
-    error ParanetServiceDoesntExist(address knowledgeCollectionStorageAddress, uint256 knowledgeCollectionTokenId);
+    error ParanetServiceDoesntExist(address knowledgeCollectionStorageAddress, uint256 knowledgeCollectionId);
     error KnowledgeCollectionIsAPartOfOtherParanet(
         address paranetKnowledgeCollectionStorageAddress,
-        uint256 paranetKnowledgeCollectionTokenId,
+        uint256 paranetknowledgeCollectionId,
         bytes32 paranetId
     );
     error NoRewardAvailable(bytes32 paranetId, address claimer);

diff --git a/contracts/paranets/Paranet.sol b/contracts/paranets/Paranet.sol
@@ -128,11 +128,8 @@ contract Paranet is INamed, IVersioned, ContractStatus, IInitializable {
     // solhint-disable-next-line no-empty-blocks
     constructor(address hubAddress) ContractStatus(hubAddress) {}
 
-    modifier onlyKnowledgeCollectionOwner(
-        address knowledgeCollectionStorageContract,
-        uint256 knowledgeCollectionTokenId
-    ) {
-        _checkKnowledgeCollectionOwner(knowledgeCollectionStorageContract, knowledgeCollectionTokenId);
+    modifier onlyKnowledgeCollectionOwner(address knowledgeCollectionStorageContract, uint256 knowledgeCollectionId) {
+        _checkKnowledgeCollectionOwner(knowledgeCollectionStorageContract, knowledgeCollectionId);
         _;
     }
 
@@ -464,20 +461,20 @@ contract Paranet is INamed, IVersioned, ContractStatus, IInitializable {
                     keccak256(
                         abi.encodePacked(
                             services[i].knowledgeCollectionStorageContract,
-                            services[i].knowledgeCollectionTokenId
+                            services[i].knowledgeCollectionId
                         )
                     )
                 )
             ) {
                 revert ParanetLib.ParanetServiceDoesntExist(
                     services[i].knowledgeCollectionStorageContract,
-                    services[i].knowledgeCollectionTokenId
+                    services[i].knowledgeCollectionId
                 );
             }
 
             _checkKnowledgeCollectionOwner(
                 services[i].knowledgeCollectionStorageContract,
-                services[i].knowledgeCollectionTokenId
+                services[i].knowledgeCollectionId
             );
 
             if (
@@ -486,7 +483,7 @@ contract Paranet is INamed, IVersioned, ContractStatus, IInitializable {
                     keccak256(
                         abi.encodePacked(
                             services[i].knowledgeCollectionStorageContract,
-                            services[i].knowledgeCollectionTokenId
+                            services[i].knowledgeCollectionId
                         )
                     )
                 )
@@ -496,7 +493,7 @@ contract Paranet is INamed, IVersioned, ContractStatus, IInitializable {
                     keccak256(
                         abi.encodePacked(
                             services[i].knowledgeCollectionStorageContract,
-                            services[i].knowledgeCollectionTokenId
+                            services[i].knowledgeCollectionId
                         )
                     )
                 );
@@ -505,18 +502,15 @@ contract Paranet is INamed, IVersioned, ContractStatus, IInitializable {
             pr.addService(
                 paranetId,
                 keccak256(
-                    abi.encodePacked(
-                        services[i].knowledgeCollectionStorageContract,
-                        services[i].knowledgeCollectionTokenId
-                    )
+                    abi.encodePacked(services[i].knowledgeCollectionStorageContract, services[i].knowledgeCollectionId)
                 )
             );
 
             emit ParanetServiceAdded(
                 paranetKCStorageContract,
                 paranetKCTokenId,
                 services[i].knowledgeCollectionStorageContract,
-                services[i].knowledgeCollectionTokenId
+                services[i].knowledgeCollectionId
             );
 
             unchecked {
@@ -867,24 +861,24 @@ contract Paranet is INamed, IVersioned, ContractStatus, IInitializable {
     //     }
 
     //     // Mint Knowledge Collection
-    //     uint256 knowledgeCollectionTokenId = contentCollection.createCollectionFromContract(msg.sender, knowledgeCollectionArgs);
+    //     uint256 knowledgeCollectionId = contentCollection.createCollectionFromContract(msg.sender, knowledgeCollectionArgs);
 
     //     _updateSubmittedKnowledgeCollectionMetadata(
     //         paranetKCStorageContract,
     //         paranetKCTokenId,
     //         address(contentCollectionStorage),
-    //         knowledgeCollectionTokenId,
+    //         knowledgeCollectionId,
     //         knowledgeCollectionArgs.tokenAmount
     //     );
 
     //     emit KnowledgeCollectionSubmittedToParanet(
     //         paranetKCStorageContract,
     //         paranetKCTokenId,
     //         address(contentCollectionStorage),
-    //         knowledgeCollectionTokenId
+    //         knowledgeCollectionId
     //     );
 
-    //     return knowledgeCollectionTokenId;
+    //     return knowledgeCollectionId;
     // }
 
     function submitKnowledgeCollection(
@@ -973,22 +967,22 @@ contract Paranet is INamed, IVersioned, ContractStatus, IInitializable {
         address paranetKCStorageContract,
         uint256 paranetKCTokenId,
         address knowledgeCollectionStorageContract,
-        uint256 knowledgeCollectionTokenId,
+        uint256 knowledgeCollectionId,
         uint96 tokenAmount
     ) internal {
         ParanetsRegistry pr = paranetsRegistry;
         ParanetKnowledgeMinersRegistry pkmr = paranetKnowledgeMinersRegistry;
 
         bytes32 paranetId = keccak256(abi.encodePacked(paranetKCStorageContract, paranetKCTokenId));
         bytes32 knowledgeCollectionId = keccak256(
-            abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionTokenId)
+            abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionId)
         );
 
         // Add Knowledge Collection to the KnowledgeCollectionsRegistry
         paranetKnowledgeCollectionsRegistry.addKnowledgeCollection(
             paranetId,
             knowledgeCollectionStorageContract,
-            knowledgeCollectionTokenId,
+            knowledgeCollectionId,
             msg.sender
         );
 

diff --git a/contracts/paranets/ParanetIncentivesPoolFactory.sol b/contracts/paranets/ParanetIncentivesPoolFactory.sol
@@ -27,11 +27,8 @@ contract ParanetIncentivesPoolFactory is INamed, IVersioned, ContractStatus, IIn
     // solhint-disable-next-line no-empty-blocks
     constructor(address hubAddress) ContractStatus(hubAddress) {}
 
-    modifier onlyKnowledgeCollectionOwner(
-        address knowledgeCollectionStorageContract,
-        uint256 knowledgeCollectionTokenId
-    ) {
-        _checkKnowledgeCollectionOwner(knowledgeCollectionStorageContract, knowledgeCollectionTokenId);
+    modifier onlyKnowledgeCollectionOwner(address knowledgeCollectionStorageContract, uint256 knowledgeCollectionId) {
+        _checkKnowledgeCollectionOwner(knowledgeCollectionStorageContract, knowledgeCollectionId);
         _;
     }
 

diff --git a/contracts/storage/paranets/ParanetKnowledgeCollectionsRegistry.sol b/contracts/storage/paranets/ParanetKnowledgeCollectionsRegistry.sol
@@ -28,19 +28,19 @@ contract ParanetKnowledgeCollectionsRegistry is INamed, IVersioned, HubDependent
     function addKnowledgeCollection(
         bytes32 paranetId,
         address knowledgeCollectionStorageContract,
-        uint256 knowledgeCollectionTokenId,
+        uint256 knowledgeCollectionId,
         address miner
     ) external onlyContracts returns (bytes32) {
         knolwedgeCollections[
-            keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionTokenId))
+            keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionId))
         ] = ParanetLib.KnolwedgeCollection({
             knowledgeCollectionStorageContract: knowledgeCollectionStorageContract,
-            knowledgeCollectionTokenId: knowledgeCollectionTokenId,
+            knowledgeCollectionId: knowledgeCollectionId,
             minerAddress: miner,
             paranetId: paranetId
         });
 
-        return keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionTokenId));
+        return keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionId));
     }
 
     function removeKnowledgeCollection(bytes32 knowledgeCollectionId) external onlyContracts {
@@ -52,7 +52,7 @@ contract ParanetKnowledgeCollectionsRegistry is INamed, IVersioned, HubDependent
             keccak256(
                 abi.encodePacked(
                     knolwedgeCollections[knolwedgeCollectionId].knowledgeCollectionStorageContract,
-                    knolwedgeCollections[knolwedgeCollectionId].knowledgeCollectionTokenId
+                    knolwedgeCollections[knolwedgeCollectionId].knowledgeCollectionId
                 )
             ) == knolwedgeCollectionId;
     }
@@ -66,7 +66,7 @@ contract ParanetKnowledgeCollectionsRegistry is INamed, IVersioned, HubDependent
     function getKnowledgeCollectionLocator(bytes32 knowledgeCollectionId) external view returns (address, uint256) {
         return (
             knolwedgeCollections[knowledgeCollectionId].knowledgeCollectionStorageContract,
-            knolwedgeCollections[knowledgeCollectionId].knowledgeCollectionTokenId
+            knolwedgeCollections[knowledgeCollectionId].knowledgeCollectionId
         );
     }
 
@@ -82,7 +82,7 @@ contract ParanetKnowledgeCollectionsRegistry is INamed, IVersioned, HubDependent
 
             locators[i] = ParanetLib.UniversalCollectionLocator({
                 knowledgeCollectionStorageContract: knolwedgeCollections[id].knowledgeCollectionStorageContract,
-                knowledgeCollectionTokenId: knolwedgeCollections[id].knowledgeCollectionTokenId
+                knowledgeCollectionId: knolwedgeCollections[id].knowledgeCollectionId
             });
         }
 

diff --git a/contracts/storage/paranets/ParanetKnowledgeMinersRegistry.sol b/contracts/storage/paranets/ParanetKnowledgeMinersRegistry.sol
@@ -171,18 +171,18 @@ contract ParanetKnowledgeMinersRegistry is INamed, IVersioned, HubDependent {
         address miner,
         bytes32 paranetId,
         address knowledgeCollectionStorageContract,
-        uint256 knowledgeCollectionTokenId,
+        uint256 knowledgeCollectionId,
         bytes32 assertionId, // Should this be renamed
         uint96 updateTokenAmount
     ) external onlyContracts {
         knowledgeMiners[miner].updatingKnowledgeCollectionsStateIndexes[paranetId][
-            keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionTokenId, assertionId))
+            keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionId, assertionId))
         ] = knowledgeMiners[miner].updatingKnowledgeCollectionsStates[paranetId].length;
 
         knowledgeMiners[miner].updatingKnowledgeCollectionsStates[paranetId].push(
             ParanetLib.UpdatingKnowledgeCollectionState({
                 knowledgeCollectionStorageContract: knowledgeCollectionStorageContract,
-                knowledgeCollectionTokenId: knowledgeCollectionTokenId,
+                knowledgeCollectionId: knowledgeCollectionId,
                 assertionId: assertionId,
                 updateTokenAmount: updateTokenAmount
             })
@@ -262,29 +262,29 @@ contract ParanetKnowledgeMinersRegistry is INamed, IVersioned, HubDependent {
         return slice;
     }
 
-    // function setUpdatingKnowledgeCollectionUpdateTokenAmount(
-    //     address miner,
-    //     bytes32 paranetId,
-    //     bytes32 knowledgeCollectionStateId,
-    //     uint96 updateTokenAmount
-    // ) external onlyContracts {
-    //     knowledgeMiners[miner]
-    //     .updatingKnowledgeCollectionsStates[paranetId][
-    //         knowledgeMiners[miner].updatingKnowledgeCollectionStateIndexes[paranetId][knowledgeCollectionStateId]
-    //     ].updateTokenAmount = updateTokenAmount;
-    // }
+    function setUpdatingKnowledgeCollectionUpdateTokenAmount(
+        address miner,
+        bytes32 paranetId,
+        bytes32 knowledgeCollectionStateId,
+        uint96 updateTokenAmount
+    ) external onlyContracts {
+        knowledgeMiners[miner]
+        .updatingKnowledgeCollectionsStates[paranetId][
+            knowledgeMiners[miner].updatingKnowledgeCollectionStateIndexes[paranetId][knowledgeCollectionStateId]
+        ].updateTokenAmount = updateTokenAmount;
+    }
 
-    // function addUpdatingKnowledgeCollectionUpdateTokenAmount(
-    //     address miner,
-    //     bytes32 paranetId,
-    //     bytes32 knowledgeCollectionStateId,
-    //     uint96 addedUpdateTokenAmount
-    // ) external onlyContracts {
-    //     knowledgeMiners[miner]
-    //     .updatingKnowledgeCollectionsStates[paranetId][
-    //         knowledgeMiners[miner].updatingKnowledgeCollectionStateIndexes[paranetId][knowledgeCollectionStateId]
-    //     ].updateTokenAmount += addedUpdateTokenAmount;
-    // }
+    function addUpdatingKnowledgeCollectionUpdateTokenAmount(
+        address miner,
+        bytes32 paranetId,
+        bytes32 knowledgeCollectionStateId,
+        uint96 addedUpdateTokenAmount
+    ) external onlyContracts {
+        knowledgeMiners[miner]
+        .updatingKnowledgeCollectionsStates[paranetId][
+            knowledgeMiners[miner].updatingKnowledgeCollectionStateIndexes[paranetId][knowledgeCollectionStateId]
+        ].updateTokenAmount += addedUpdateTokenAmount;
+    }
 
     function subUpdatingKnowledgeCollectionUpdateTokenAmount(
         address miner,

diff --git a/contracts/storage/paranets/ParanetsRegistry.sol b/contracts/storage/paranets/ParanetsRegistry.sol
@@ -33,19 +33,19 @@ contract ParanetsRegistry is INamed, IVersioned, HubDependent {
 
     function registerParanet(
         address knowledgeCollectionStorageContract,
-        uint256 knowledgeCollectionTokenId,
+        uint256 knowledgeCollectionId,
         string calldata paranetName,
         string calldata paranetDescription,
         ParanetLib.NodesAccessPolicy nodesAccessPolicy,
         ParanetLib.MinersAccessPolicy minersAccessPolicy,
         ParanetLib.KnowledgeCollectionsAccessPolicy knowledgeColletionsAccessPolicy
     ) external onlyContracts returns (bytes32) {
-        bytes32 paranetId = keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionTokenId));
+        bytes32 paranetId = keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionId));
 
         ParanetLib.Paranet storage paranet = paranets[paranetId];
 
         paranet.paranetKCStorageContract = knowledgeCollectionStorageContract;
-        paranet.paranetKCTokenId = knowledgeCollectionTokenId;
+        paranet.paranetKCTokenId = knowledgeCollectionId;
         paranet.name = paranetName;
         paranet.description = paranetDescription;
         paranet.nodesAccessPolicy = nodesAccessPolicy;
@@ -55,7 +55,7 @@ contract ParanetsRegistry is INamed, IVersioned, HubDependent {
         paranetIds.push(paranetId);
         paranetIdsMapping[paranetId] = paranetIds.length - 1;
 
-        return keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionTokenId));
+        return keccak256(abi.encodePacked(knowledgeCollectionStorageContract, knowledgeCollectionId));
     }
 
     function deleteParanet(bytes32 paranetId) external onlyContracts {