Merge pull request #13 from valory-xyz/staking_bond

refactor and test: adjusting to the last version of registries
valory-xyz · Jan 23, 2024 · ac54fb7 · ac54fb7
2 parents 5c51fc0 + 448b2c9
commit ac54fb7
Show file tree

Hide file tree

Showing 11 changed files with 2,669 additions and 2,342 deletions.
diff --git a/abis/0.8.21/ServiceStakingMechUsage.json b/abis/0.8.21/ServiceStakingMechUsage.json
diff --git a/abis/0.8.21/ServiceStakingTokenMechUsage.json b/abis/0.8.21/ServiceStakingTokenMechUsage.json
diff --git a/abis/0.8.23/ServiceStakingMechUsage.json b/abis/0.8.23/ServiceStakingMechUsage.json
diff --git a/abis/0.8.23/ServiceStakingTokenMechUsage.json b/abis/0.8.23/ServiceStakingTokenMechUsage.json
diff --git a/contracts/mech_usage/ServiceStakingMechUsage.sol b/contracts/mech_usage/ServiceStakingMechUsage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import {MechAgentMod} from "./MechAgentMod.sol";
 import {ServiceStakingNativeToken} from "../../lib/autonolas-registries/contracts/staking/ServiceStakingNativeToken.sol";

diff --git a/contracts/mech_usage/ServiceStakingTokenMechUsage.sol b/contracts/mech_usage/ServiceStakingTokenMechUsage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity ^0.8.23;
 
 import {MechAgentMod} from "./MechAgentMod.sol";
 import {ServiceStakingToken} from "../../lib/autonolas-registries/contracts/staking/ServiceStakingToken.sol";

diff --git a/hardhat.config.js b/hardhat.config.js
@@ -102,11 +102,11 @@ module.exports = {
     solidity: {
         compilers: [
             {
-                version: "0.8.21",
+                version: "0.8.23",
                 settings: {
                     optimizer: {
                         enabled: true,
-                        runs: 750,
+                        runs: 1000000,
                     },
                 },
             }

diff --git a/lib/autonolas-registries b/lib/autonolas-registries
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/test/ServiceStakingMechUsage.js b/test/ServiceStakingMechUsage.js
@@ -38,6 +38,7 @@ describe("ServiceStakingMechUsage", function () {
         maxNumServices: 10,
         rewardsPerSecond: "1" + "0".repeat(15),
         minStakingDeposit: 10,
+        minNumStakingPeriods: 3,
         maxNumInactivityPeriods: 3,
         livenessPeriod: livenessPeriod, // Ten seconds
         livenessRatio: "1" + "0".repeat(16), // 0.01 transaction per second (TPS)

diff --git a/test/ServiceStakingMechUsages.t.sol b/test/ServiceStakingMechUsages.t.sol
@@ -1,4 +1,4 @@
-pragma solidity =0.8.21;
+pragma solidity =0.8.23;
 
 import {IService} from "../lib/autonolas-registries/contracts/interfaces/IService.sol";
 import "@gnosis.pm/safe-contracts/contracts/GnosisSafe.sol";
@@ -59,6 +59,8 @@ contract BaseSetup is Test {
     uint256 internal rewardsPerSecond = 0.0001 ether;
     // Minimum service staking deposit value required for staking
     uint256 internal minStakingDeposit = regDeposit;
+    // Min number of staking periods before the service can be unstaked
+    uint256 internal minNumStakingPeriods = 3;
     // Max number of accumulated inactivity periods after which the service is evicted
     uint256 internal maxNumInactivityPeriods = 3;
     // Liveness period
@@ -109,8 +111,8 @@ contract BaseSetup is Test {
 
         // Deploy service staking native token and arbitrary ERC20 token
         ServiceStakingBase.StakingParams memory stakingParams = ServiceStakingBase.StakingParams(maxNumServices,
-            rewardsPerSecond, minStakingDeposit, maxNumInactivityPeriods, livenessPeriod, livenessRatio,
-            numAgentInstances, emptyArray, 0, bytes32(0));
+            rewardsPerSecond, minStakingDeposit, minNumStakingPeriods, maxNumInactivityPeriods, livenessPeriod,
+            livenessRatio, numAgentInstances, emptyArray, 0, bytes32(0));
         agentMech = new MockAgentMech();
         serviceStakingMechUsage = new ServiceStakingMechUsage(stakingParams, address(serviceRegistry),
             multisigProxyHash, address(agentMech));
@@ -239,7 +241,7 @@ contract ServiceStakingMechUsages is BaseSetup {
             }
 
             // Move one day ahead
-            vm.warp(block.timestamp + serviceStakingMechUsage.maxAllowedInactivity() + 1);
+            vm.warp(block.timestamp + serviceStakingMechUsage.maxInactivityDuration() + 1);
 
             // Call the checkpoint
             serviceStakingMechUsage.checkpoint();
@@ -310,7 +312,7 @@ contract ServiceStakingMechUsages is BaseSetup {
             }
 
             // Move one day ahead
-            vm.warp(block.timestamp + serviceStakingMechUsage.maxAllowedInactivity() + 1);
+            vm.warp(block.timestamp + serviceStakingMechUsage.maxInactivityDuration() + 1);
 
             // Call the checkpoint
             serviceStakingMechUsage.checkpoint();
@@ -390,7 +392,7 @@ contract ServiceStakingMechUsages is BaseSetup {
             }
 
             // Move one day ahead
-            vm.warp(block.timestamp + serviceStakingMechUsage.maxAllowedInactivity() + 1);
+            vm.warp(block.timestamp + serviceStakingMechUsage.maxInactivityDuration() + 1);
 
             // Call the checkpoint
             serviceStakingMechUsage.checkpoint();
@@ -470,7 +472,7 @@ contract ServiceStakingMechUsages is BaseSetup {
             }
 
             // Move one day ahead
-            vm.warp(block.timestamp + serviceStakingMechUsage.maxAllowedInactivity() + 1);
+            vm.warp(block.timestamp + serviceStakingMechUsage.maxInactivityDuration() + 1);
 
             // Call the checkpoint
             serviceStakingTokenMechUsage.checkpoint();
+241 −0		abis/0.8.21/HashCheckpoint.json
+0 −1,031		abis/0.8.21/ServiceStakingNativeToken.json
+0 −1,134		abis/0.8.21/ServiceStakingToken.json
+1,252 −0		abis/0.8.23/ServiceStakingNativeToken.json
+1,355 −0		abis/0.8.23/ServiceStakingToken.json
+64 −16		contracts/staking/ServiceStakingBase.sol
+1 −1		contracts/staking/ServiceStakingNativeToken.sol
+21 −4		contracts/staking/ServiceStakingToken.sol
+125 −0		contracts/utils/HashCheckpoint.sol
+ −		docs/Vulnerabilities_list_registries.pdf
+1 −1		docs/configuration.json
+1 −1		hardhat.config.js
+86 −0		scripts/deployment/l2/deploy_18_hash_checkpoint_l2.js
+2 −1		scripts/deployment/l2/globals_gnosis_mainnet.json
+9 −0		scripts/deployment/l2/verify_18_hash_checkpoint.js
+52 −0		test/HashCheckpoint.js
+20 −6		test/ServiceStaking.js
+5 −3		test/ServiceStaking.t.sol
+1 −0		.gitattributes
+1 −1		package.json
+635 −0		scripts/vm.py
+5 −1		src/StdChains.sol
+757 −470		src/Vm.sol
+3 −1		test/StdError.t.sol
+2 −2		test/StdUtils.t.sol
+2 −2		test/Vm.t.sol