Merge pull request #330 from OriginTrail/v8/pricing-fix

Fixed Pricing mechanism
OriginTrail · Dec 27, 2024 · ba6ce7a · ba6ce7a
2 parents 98867a5 + 823fc5c
commit ba6ce7a
Show file tree

Hide file tree

Showing 14 changed files with 674 additions and 755 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -9,3 +9,4 @@ node_modules
 package-lock.json
 package.json
 typechain
+tsconfig.json
diff --git a/.solhintignore b/.solhintignore
@@ -1,2 +1,4 @@
 contracts/libraries/*.sol
+contracts/tokens/*.sol
 contracts/Guardian.sol
+contracts/Token.sol
diff --git a/abi/Ask.json b/abi/Ask.json
@@ -72,52 +72,6 @@
     "stateMutability": "pure",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "uint72",
-        "name": "identityId",
-        "type": "uint72"
-      },
-      {
-        "internalType": "uint96",
-        "name": "oldAsk",
-        "type": "uint96"
-      },
-      {
-        "internalType": "uint96",
-        "name": "newAsk",
-        "type": "uint96"
-      }
-    ],
-    "name": "onAskChanged",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint72",
-        "name": "identityId",
-        "type": "uint72"
-      },
-      {
-        "internalType": "uint96",
-        "name": "oldStake",
-        "type": "uint96"
-      },
-      {
-        "internalType": "uint96",
-        "name": "newStake",
-        "type": "uint96"
-      }
-    ],
-    "name": "onStakeChanged",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "parametersStorage",
@@ -144,6 +98,13 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "recalculateActiveSet",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
   {
     "inputs": [
       {

diff --git a/contracts/Ask.sol b/contracts/Ask.sol
@@ -41,114 +41,49 @@ contract Ask is INamed, IVersioned, ContractStatus, IInitializable {
         return _VERSION;
     }
 
-    function onStakeChanged(uint72 identityId, uint96 oldStake, uint96 newStake) external onlyContracts {
-        ParametersStorage params = parametersStorage;
+    function recalculateActiveSet() external onlyContracts {
         AskStorage ass = askStorage;
-
-        uint96 nodeAsk = profileStorage.getAsk(identityId);
-
-        uint96 minimumStake = params.minimumStake();
-        uint96 maximumStake = params.maximumStake();
-
-        uint96 oldStakeAdj = oldStake <= maximumStake ? oldStake : maximumStake;
-        uint96 newStakeAdj = newStake <= maximumStake ? newStake : maximumStake;
-
-        uint256 oldWeightedAsk = uint256(nodeAsk) * oldStakeAdj;
-        uint256 newWeightedAsk = uint256(nodeAsk) * newStakeAdj;
-
-        bool wasInShardingTable = oldStake >= minimumStake;
-
-        if (wasInShardingTable && newStake < minimumStake) {
-            ass.decreaseWeightedActiveAskSum(oldWeightedAsk);
-            ass.setPrevTotalActiveStake(ass.totalActiveStake());
-            ass.decreaseTotalActiveStake(oldStake);
-            return;
-        }
-
-        if (oldStake >= maximumStake && newStake >= maximumStake) {
-            return;
-        }
-
-        uint256 weightedActiveAskSum = ass.weightedActiveAskSum();
-        if (weightedActiveAskSum == 0) {
-            ass.setPrevWeightedActiveAskSum(newWeightedAsk);
-            ass.setPrevTotalActiveStake(newStakeAdj);
-            ass.setTotalActiveStake(newStakeAdj);
-            ass.setWeightedActiveAskSum(newWeightedAsk);
-            return;
-        }
-
-        ass.setPrevTotalActiveStake(newStakeAdj);
-        ass.setPrevWeightedActiveAskSum(weightedActiveAskSum);
-        if (wasInShardingTable) {
-            ass.decreaseTotalActiveStake(oldStake);
-            ass.decreaseWeightedActiveAskSum(oldWeightedAsk);
-        }
-        ass.increaseTotalActiveStake(newStake);
-        ass.increaseWeightedActiveAskSum(newWeightedAsk);
-    }
-
-    function onAskChanged(uint72 identityId, uint96 oldAsk, uint96 newAsk) external onlyContracts {
+        ShardingTableStorage sts = shardingTableStorage;
         StakingStorage ss = stakingStorage;
         ParametersStorage params = parametersStorage;
-        ShardingTableStorage sts = shardingTableStorage;
         ProfileStorage ps = profileStorage;
-        AskStorage ass = askStorage;
 
-        uint96 currentStake = stakingStorage.getNodeStake(identityId);
-
-        if (currentStake < params.minimumStake()) {
-            return;
-        }
+        ass.setPrevWeightedActiveAskSum(ass.weightedActiveAskSum());
+        ass.setPrevTotalActiveStake(ass.totalActiveStake());
 
+        uint96 minimumStake = params.minimumStake();
         uint96 maximumStake = params.maximumStake();
-        uint96 stake = currentStake <= maximumStake ? currentStake : maximumStake;
-        uint256 newWeightedAsk = uint256(stake) * newAsk;
-
-        uint256 weightedActiveAskSum = ass.weightedActiveAskSum();
-        if (weightedActiveAskSum == 0) {
-            ass.setWeightedActiveAskSum(newWeightedAsk);
-            ass.setPrevWeightedActiveAskSum(newWeightedAsk);
-            ass.setPrevTotalActiveStake(stake);
-            ass.setTotalActiveStake(stake);
-            return;
-        }
-
-        (uint256 oldLowerBound, uint256 oldUpperBound) = ass.getAskBounds();
-
-        bool isActive = false;
-        if (uint256(newAsk) * 1e18 <= oldUpperBound && uint256(newAsk) * 1e18 >= oldLowerBound) {
-            ass.setPrevWeightedActiveAskSum(weightedActiveAskSum);
-            isActive = true;
-        } else if (uint256(oldAsk) * 1e18 <= oldUpperBound && uint256(oldAsk) * 1e18 >= oldLowerBound) {
-            ass.setPrevTotalActiveStake(stake);
-            ass.setPrevWeightedActiveAskSum(weightedActiveAskSum);
-            ass.decreaseTotalActiveStake(stake);
-            ass.decreaseWeightedActiveAskSum(uint256(oldAsk) * stake);
-        }
 
-        if (isActive) {
-            ass.setPrevTotalActiveStake(ass.totalActiveStake());
+        uint256 askLowerBound;
+        uint256 askUpperBound;
 
-            uint256 newWeightedActiveAskSum = 0;
-            uint96 newTotalActiveStake = 0;
+        if (ass.prevTotalActiveStake() > 0 && ass.prevWeightedActiveAskSum() > 0) {
+            (askLowerBound, askUpperBound) = ass.getAskBounds();
+        } else {
+            (askLowerBound, askUpperBound) = (0, type(uint256).max);
+        }
 
-            (uint256 newLowerBound, uint256 newUpperBound) = ass.getAskBounds();
+        uint256 newWeightedActiveAskSum;
+        uint96 newTotalActiveStake;
 
-            uint72 nodesCount = shardingTableStorage.nodesCount();
-            for (uint72 i; i < nodesCount; i++) {
-                uint72 nextIdentityId = sts.indexToIdentityId(i);
-                uint256 nodeAsk = uint256(ps.getAsk(nextIdentityId));
+        uint72 count = sts.nodesCount();
+        for (uint72 i; i < count; i++) {
+            uint72 nodeIdentityId = sts.indexToIdentityId(i);
+            uint96 stake = ss.getNodeStake(nodeIdentityId);
 
-                if (nodeAsk * 1e18 <= newUpperBound && nodeAsk * 1e18 >= newLowerBound) {
-                    uint96 nodeStake = ss.getNodeStake(nextIdentityId);
-                    newWeightedActiveAskSum += (nodeAsk * nodeStake);
-                    newTotalActiveStake += nodeStake;
-                }
+            if (stake < minimumStake) {
+                continue;
             }
 
-            ass.setWeightedActiveAskSum(newWeightedActiveAskSum);
-            ass.setTotalActiveStake(newTotalActiveStake);
+            stake = stake > maximumStake ? maximumStake : stake;
+            uint256 nodeAskScaled = uint256(ps.getAsk(nodeIdentityId)) * 1e18;
+            if (nodeAskScaled >= askLowerBound && nodeAskScaled <= askUpperBound) {
+                newWeightedActiveAskSum += (nodeAskScaled / 1e18) * stake;
+                newTotalActiveStake += stake;
+            }
         }
+
+        ass.setWeightedActiveAskSum(newWeightedActiveAskSum);
+        ass.setTotalActiveStake(newTotalActiveStake);
     }
 }
diff --git a/contracts/Profile.sol b/contracts/Profile.sol
@@ -119,10 +119,9 @@ contract Profile is INamed, IVersioned, ContractStatus, IInitializable {
             revert ProfileLib.AskUpdateOnCooldown(identityId, ps.askUpdateCooldown(identityId));
         }
 
-        uint96 oldAsk = ps.getAsk(identityId);
         ps.setAsk(identityId, ask);
         ps.setAskUpdateCooldown(identityId, block.timestamp + parametersStorage.nodeAskUpdateDelay());
-        askContract.onAskChanged(identityId, oldAsk, ask);
+        askContract.recalculateActiveSet();
     }
 
     function updateOperatorFee(uint72 identityId, uint16 newOperatorFee) external onlyAdmin(identityId) {

diff --git a/contracts/Staking.sol b/contracts/Staking.sol
@@ -100,7 +100,7 @@ contract Staking is INamed, IVersioned, ContractStatus, IInitializable {
 
         _addNodeToShardingTable(identityId, totalNodeStakeAfter);
 
-        askContract.onStakeChanged(identityId, totalNodeStakeBefore, totalNodeStakeAfter);
+        askContract.recalculateActiveSet();
 
         token.transferFrom(msg.sender, address(ss), addedStake);
     }
@@ -155,7 +155,7 @@ contract Staking is INamed, IVersioned, ContractStatus, IInitializable {
 
         _removeNodeFromShardingTable(fromIdentityId, totalFromNodeStakeAfter);
 
-        ask.onStakeChanged(fromIdentityId, totalFromNodeStakeBefore, totalFromNodeStakeAfter);
+        ask.recalculateActiveSet();
 
         if (stakeAmount > delegatorStakeIndexed) {
             ss.increaseDelegatorStakeBase(toIdentityId, delegatorKey, (delegatorStakeBase - newDelegatorStakeBase));
@@ -169,7 +169,7 @@ contract Staking is INamed, IVersioned, ContractStatus, IInitializable {
 
         _addNodeToShardingTable(toIdentityId, totalToNodeStakeAfter);
 
-        ask.onStakeChanged(toIdentityId, totalToNodeStakeBefore, totalToNodeStakeAfter);
+        ask.recalculateActiveSet();
     }
 
     function requestWithdrawal(uint72 identityId, uint96 removedStake) external profileExists(identityId) {
@@ -210,7 +210,7 @@ contract Staking is INamed, IVersioned, ContractStatus, IInitializable {
 
         _removeNodeFromShardingTable(identityId, totalNodeStakeAfter);
 
-        askContract.onStakeChanged(identityId, totalNodeStakeBefore, totalNodeStakeAfter);
+        askContract.recalculateActiveSet();
 
         if (totalNodeStakeAfter >= parametersStorage.maximumStake()) {
             ss.addDelegatorCumulativePaidOutRewards(
@@ -312,7 +312,7 @@ contract Staking is INamed, IVersioned, ContractStatus, IInitializable {
 
         _addNodeToShardingTable(identityId, totalNodeStakeAfter);
 
-        askContract.onStakeChanged(identityId, totalNodeStakeBefore, totalNodeStakeAfter);
+        askContract.recalculateActiveSet();
     }
 
     function distributeRewards(
@@ -353,7 +353,7 @@ contract Staking is INamed, IVersioned, ContractStatus, IInitializable {
 
         _addNodeToShardingTable(identityId, totalNodeStakeAfter);
 
-        askContract.onStakeChanged(identityId, totalNodeStakeBefore, totalNodeStakeAfter);
+        askContract.recalculateActiveSet();
     }
 
     function restakeOperatorFee(uint72 identityId, uint96 addedStake) external onlyAdmin(identityId) {
@@ -390,7 +390,7 @@ contract Staking is INamed, IVersioned, ContractStatus, IInitializable {
 
         _addNodeToShardingTable(identityId, totalNodeStakeAfter);
 
-        askContract.onStakeChanged(identityId, totalNodeStakeBefore, totalNodeStakeAfter);
+        askContract.recalculateActiveSet();
     }
 
     function requestOperatorFeeWithdrawal(uint72 identityId, uint96 withdrawalAmount) external onlyAdmin(identityId) {

diff --git a/custom_types/assertion-tools.d.ts b/custom_types/assertion-tools.d.ts
diff --git a/deploy/998_initialize_contracts.ts b/deploy/998_initialize_contracts.ts
@@ -38,7 +38,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   if (
     !noChangesWereMade &&
-    !['development', 'mainnet'].includes(hre.network.config.environment)
+    !['development'].includes(hre.network.config.environment)
   ) {
     const hubAddress =
       hre.helpers.contractDeployments.contracts['Hub'].evmAddress;