Merge pull request #18 from valory-xyz/adjust_staking

refactor and test: adjusting for latest service staking contract updates
valory-xyz · May 23, 2024 · c0faf03 · c0faf03
2 parents 9700223 + a066dd1
commit c0faf03
Show file tree

Hide file tree

Showing 24 changed files with 661 additions and 768 deletions.
diff --git a/abis/0.8.25/MechActivityChecker.json b/abis/0.8.25/MechActivityChecker.json
@@ -0,0 +1,111 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "MechActivityChecker",
+  "sourceName": "contracts/mech_usage/MechActivityChecker.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_agentMech",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "_livenessRatio",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [],
+      "name": "ZeroMechAgentAddress",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ZeroValue",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "agentMech",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "multisig",
+          "type": "address"
+        }
+      ],
+      "name": "getMultisigNonces",
+      "outputs": [
+        {
+          "internalType": "uint256[]",
+          "name": "nonces",
+          "type": "uint256[]"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256[]",
+          "name": "curNonces",
+          "type": "uint256[]"
+        },
+        {
+          "internalType": "uint256[]",
+          "name": "lastNonces",
+          "type": "uint256[]"
+        },
+        {
+          "internalType": "uint256",
+          "name": "ts",
+          "type": "uint256"
+        }
+      ],
+      "name": "isRatioPass",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "ratioPass",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "livenessRatio",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x60c060405234801561000f575f80fd5b506040516107b33803806107b383398101604081905261002e9161008a565b80805f0361004f57604051637c946ed760e01b815260040160405180910390fd5b6080526001600160a01b0382166100785760405162ca95f960e81b815260040160405180910390fd5b506001600160a01b031660a0526100c1565b5f806040838503121561009b575f80fd5b82516001600160a01b03811681146100b1575f80fd5b6020939093015192949293505050565b60805160a0516106c56100ee5f395f818160b0015261036501525f8181607b015261024701526106c55ff3fe608060405234801561000f575f80fd5b506004361061004a575f3560e01c8063184023a51461004e578063592cf3fb1461007657806375af4b6d146100ab578063d564c4bf146100f7575b5f80fd5b61006161005c3660046104d8565b610117565b60405190151581526020015b60405180910390f35b61009d7f000000000000000000000000000000000000000000000000000000000000000081565b60405190815260200161006d565b6100d27f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161006d565b61010a610105366004610540565b610276565b60405161006d9190610573565b5f80821180156101585750825f81518110610134576101346105b6565b6020026020010151845f8151811061014e5761014e6105b6565b6020026020010151115b8015610197575082600181518110610172576101726105b6565b60200260200101518460018151811061018d5761018d6105b6565b6020026020010151115b1561026f575f835f815181106101af576101af6105b6565b6020026020010151855f815181106101c9576101c96105b6565b60200260200101516101db9190610610565b90505f846001815181106101f1576101f16105b6565b60200260200101518660018151811061020c5761020c6105b6565b602002602001015161021e9190610610565b905081811161026c575f8461023b83670de0b6b3a7640000610629565b6102459190610640565b7f000000000000000000000000000000000000000000000000000000000000000011159350505b50505b9392505050565b60408051600280825260608083018452926020830190803683370190505090508173ffffffffffffffffffffffffffffffffffffffff1663affed0e06040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102df573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103039190610678565b815f81518110610315576103156105b6565b60209081029190910101526040517f7af7347300000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83811660048301527f00000000000000000000000000000000000000000000000000000000000000001690637af7347390602401602060405180830381865afa1580156103aa573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103ce9190610678565b816001815181106103e1576103e16105b6565b602002602001018181525050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b5f82601f83011261042e575f80fd5b8135602067ffffffffffffffff8083111561044b5761044b6103f2565b8260051b6040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f8301168101818110848211171561048e5761048e6103f2565b60405293845260208187018101949081019250878511156104ad575f80fd5b6020870191505b848210156104cd578135835291830191908301906104b4565b979650505050505050565b5f805f606084860312156104ea575f80fd5b833567ffffffffffffffff80821115610501575f80fd5b61050d8783880161041f565b94506020860135915080821115610522575f80fd5b5061052f8682870161041f565b925050604084013590509250925092565b5f60208284031215610550575f80fd5b813573ffffffffffffffffffffffffffffffffffffffff8116811461026f575f80fd5b602080825282518282018190525f9190848201906040850190845b818110156105aa5783518352928401929184019160010161058e565b50909695505050505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b81810381811115610623576106236105e3565b92915050565b8082028115828204841417610623576106236105e3565b5f82610673577f4e487b71000000000000000000000000000000000000000000000000000000005f52601260045260245ffd5b500490565b5f60208284031215610688575f80fd5b505191905056fea2646970667358221220894d72b452919872cb67e1af83aac1b0e3f0f203c43fa9c3d08c937d8f2578b864736f6c63430008190033",
+  "deployedBytecode": "0x608060405234801561000f575f80fd5b506004361061004a575f3560e01c8063184023a51461004e578063592cf3fb1461007657806375af4b6d146100ab578063d564c4bf146100f7575b5f80fd5b61006161005c3660046104d8565b610117565b60405190151581526020015b60405180910390f35b61009d7f000000000000000000000000000000000000000000000000000000000000000081565b60405190815260200161006d565b6100d27f000000000000000000000000000000000000000000000000000000000000000081565b60405173ffffffffffffffffffffffffffffffffffffffff909116815260200161006d565b61010a610105366004610540565b610276565b60405161006d9190610573565b5f80821180156101585750825f81518110610134576101346105b6565b6020026020010151845f8151811061014e5761014e6105b6565b6020026020010151115b8015610197575082600181518110610172576101726105b6565b60200260200101518460018151811061018d5761018d6105b6565b6020026020010151115b1561026f575f835f815181106101af576101af6105b6565b6020026020010151855f815181106101c9576101c96105b6565b60200260200101516101db9190610610565b90505f846001815181106101f1576101f16105b6565b60200260200101518660018151811061020c5761020c6105b6565b602002602001015161021e9190610610565b905081811161026c575f8461023b83670de0b6b3a7640000610629565b6102459190610640565b7f000000000000000000000000000000000000000000000000000000000000000011159350505b50505b9392505050565b60408051600280825260608083018452926020830190803683370190505090508173ffffffffffffffffffffffffffffffffffffffff1663affed0e06040518163ffffffff1660e01b8152600401602060405180830381865afa1580156102df573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103039190610678565b815f81518110610315576103156105b6565b60209081029190910101526040517f7af7347300000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff83811660048301527f00000000000000000000000000000000000000000000000000000000000000001690637af7347390602401602060405180830381865afa1580156103aa573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103ce9190610678565b816001815181106103e1576103e16105b6565b602002602001018181525050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b5f82601f83011261042e575f80fd5b8135602067ffffffffffffffff8083111561044b5761044b6103f2565b8260051b6040517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0603f8301168101818110848211171561048e5761048e6103f2565b60405293845260208187018101949081019250878511156104ad575f80fd5b6020870191505b848210156104cd578135835291830191908301906104b4565b979650505050505050565b5f805f606084860312156104ea575f80fd5b833567ffffffffffffffff80821115610501575f80fd5b61050d8783880161041f565b94506020860135915080821115610522575f80fd5b5061052f8682870161041f565b925050604084013590509250925092565b5f60208284031215610550575f80fd5b813573ffffffffffffffffffffffffffffffffffffffff8116811461026f575f80fd5b602080825282518282018190525f9190848201906040850190845b818110156105aa5783518352928401929184019160010161058e565b50909695505050505050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52603260045260245ffd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52601160045260245ffd5b81810381811115610623576106236105e3565b92915050565b8082028115828204841417610623576106236105e3565b5f82610673577f4e487b71000000000000000000000000000000000000000000000000000000005f52601260045260245ffd5b500490565b5f60208284031215610688575f80fd5b505191905056fea2646970667358221220894d72b452919872cb67e1af83aac1b0e3f0f203c43fa9c3d08c937d8f2578b864736f6c63430008190033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}
diff --git a/contracts/mech_usage/MechAgentMod.sol → contracts/mech_usage/MechActivityChecker.sol b/contracts/mech_usage/MechAgentMod.sol → contracts/mech_usage/MechActivityChecker.sol
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.23;
+pragma solidity ^0.8.25;
+
+import {StakingActivityChecker} from "../../lib/autonolas-registries/contracts/staking/StakingActivityChecker.sol";
 
 // Multisig interface
 interface IMultisig {
@@ -19,17 +21,18 @@ interface IAgentMech {
 /// @dev Provided zero mech agent address.
 error ZeroMechAgentAddress();
 
-/// @title MechAgentMod - Abstract smart contract for AI agent mech staking modification
+/// @title MechAgentMod - Smart contract for AI agent mech staking modification
 /// @author Aleksandr Kuperman - <aleksandr.kuperman@valory.xyz>
 /// @author Andrey Lebedev - <andrey.lebedev@valory.xyz>
 /// @author Mariapia Moscatiello - <mariapia.moscatiello@valory.xyz>
-abstract contract MechAgentMod {
+contract MechActivityChecker is StakingActivityChecker{
     // AI agent mech contract address.
     address public immutable agentMech;
 
     /// @dev MechAgentMod constructor.
     /// @param _agentMech AI agent mech contract address.
-    constructor(address _agentMech) {
+    /// @param _livenessRatio Liveness ratio in the format of 1e18.
+    constructor(address _agentMech, uint256 _livenessRatio) StakingActivityChecker(_livenessRatio) {
         if (_agentMech == address(0)) {
             revert ZeroMechAgentAddress();
         }
@@ -39,16 +42,12 @@ abstract contract MechAgentMod {
     /// @dev Gets service multisig nonces.
     /// @param multisig Service multisig address.
     /// @return nonces Set of a nonce and a requests count for the multisig.
-    function _getMultisigNonces(address multisig) internal view virtual returns (uint256[] memory nonces) {
+    function getMultisigNonces(address multisig) external view virtual override returns (uint256[] memory nonces) {
         nonces = new uint256[](2);
         nonces[0] = IMultisig(multisig).nonce();
         nonces[1] = IAgentMech(agentMech).getRequestsCount(multisig);
     }
 
-    /// @dev Gets the liveness ratio.
-    /// @return Liveness ratio.
-    function _getLivenessRatio() internal view virtual returns (uint256);
-
     /// @dev Checks if the service multisig liveness ratio passes the defined liveness threshold.
     /// @notice The formula for calculating the ratio is the following:
     ///         currentNonces - [service multisig nonce at time now (block.timestamp), requests count at time now];
@@ -61,11 +60,11 @@ abstract contract MechAgentMod {
     /// @param lastNonces Last service multisig set of nonce and requests count.
     /// @param ts Time difference between current and last timestamps.
     /// @return ratioPass True, if the liveness ratio passes the check.
-    function _isRatioPass(
+    function isRatioPass(
         uint256[] memory curNonces,
         uint256[] memory lastNonces,
         uint256 ts
-    ) internal view virtual returns (bool ratioPass)
+    ) external view virtual override returns (bool ratioPass)
     {
         // If the checkpoint was called in the exact same block, the ratio is zero
         // If the current nonce is not greater than the last nonce, the ratio is zero
@@ -76,7 +75,7 @@ abstract contract MechAgentMod {
             // Requests counts difference must be less or equal to the nonce difference
             if (diffRequestsCounts <= diffNonces) {
                 uint256 ratio = (diffRequestsCounts * 1e18) / ts;
-                ratioPass = (ratio >= _getLivenessRatio());
+                ratioPass = (ratio >= livenessRatio);
             }
         }
     }

diff --git a/contracts/mech_usage/ServiceStakingMechUsage.sol b/contracts/mech_usage/ServiceStakingMechUsage.sol
diff --git a/contracts/mech_usage/ServiceStakingTokenMechUsage.sol b/contracts/mech_usage/ServiceStakingTokenMechUsage.sol