Merge pull request #6 from valory-xyz/fix/staking

Fix/staking

.gitleaksignore

@@ -251,3 +251,4 @@ bea8fa71765fab49fd7b0a7b99e27019b5df0d5e:scripts/api_data.json:generic-api-key:2
 bea8fa71765fab49fd7b0a7b99e27019b5df0d5e:scripts/api_data.json:generic-api-key:21
 5a9e025d6b0cd4115123d890ec90cd69a8fc682f:scripts/api_data.json:generic-api-key:20
 5a9e025d6b0cd4115123d890ec90cd69a8fc682f:scripts/api_data.json:generic-api-key:21
+92a4c419cc5a67f25f5768cc985c73b80114314c:packages/valory/contracts/staking_token/contract.yaml:generic-api-key:10

packages/packages.json

@@ -6,12 +6,12 @@
         "contract/valory/uniswap_v3_non_fungible_position_manager/0.1.0": "bafybeieljamerttxyo7z2yokwripnnhzkn4zply5lz457vsixf5wfu5px4",
         "contract/valory/uniswap_v3_pool/0.1.0": "bafybeidglijnyueahpgivaykbhio2r3ovfeo23a256y3yb6g7be4hngx3a",
         "contract/valory/merkl_distributor/0.1.0": "bafybeifctofnyhdic2sxmkqujvf3j2wwydhtvzhi6kdeutykenymplf4e4",
-        "contract/valory/staking_token/0.1.0": "bafybeiakvgm2byyjfunb4npthioku2kwqpbcwm6dfov4akirqixtju6oai",
-        "contract/valory/staking_activity_checker/0.1.0": "bafybeigfiqmvzsf2etp6grtnfqg4y7nrlhwohbhfvggewhgvvolascs4fe",
-        "skill/valory/liquidity_trader_abci/0.1.0": "bafybeieoj2cuuwk32settpv44ailcyrd4lh7mj6exr5ufssnms3teyhxze",
-        "skill/valory/optimus_abci/0.1.0": "bafybeigfneogfptzhfovlqy5r57rlei7b6ixe2k37ke6xrv6lr76kcviai",
-        "agent/valory/optimus/0.1.0": "bafybeibubmgk63swmozdglm3hmu4n3bz2xesxggdxdtx6cuso7feh3a7xu",
-        "service/valory/optimus/0.1.0": "bafybeie4mwft76qkajsn3wypza5vcpvx5vdaosywqzzsnohr4my6o2xu3y"
+        "contract/valory/staking_token/0.1.0": "bafybeihgp74ojttyzuriukd44biv2ehh4rcc3czm7mv2olw7amepxszbzu",
+        "contract/valory/staking_activity_checker/0.1.0": "bafybeibfqnnqgrchsykidx3x3fgwjmjnml7jyl6e66prhxars3gzgosvxq",
+        "skill/valory/liquidity_trader_abci/0.1.0": "bafybeihii4e64akqkelii37havxmet3qeg5vlv4vg2toekoaww6tk7zudi",
+        "skill/valory/optimus_abci/0.1.0": "bafybeiazrizmyz5rbqkodjo3jrregmeoyg2qrov4p5qyh5znggeg2kmtdi",
+        "agent/valory/optimus/0.1.0": "bafybeicjbstfud6oljhtbobgahpzujyigo2u3eit62srji2ik52irhdv7i",
+        "service/valory/optimus/0.1.0": "bafybeibjwknk7bchs24irn7ayogp72i2cbaioqcd5dzssqtdq4gihrocu4"
     },
     "third_party": {
         "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",

packages/valory/agents/optimus/aea-config.yaml

@@ -35,8 +35,8 @@ protocols:
 skills:
 - valory/abstract_abci:0.1.0:bafybeihu2bcgjk2tqjiq2zhk3uogtfszqn4osvdt7ho3fubdpdj4jgdfjm
 - valory/abstract_round_abci:0.1.0:bafybeibovsktd3uxur45nrcomq5shcn46cgxd5idmhxbmjhg32c5abyqim
-- valory/liquidity_trader_abci:0.1.0:bafybeieoj2cuuwk32settpv44ailcyrd4lh7mj6exr5ufssnms3teyhxze
-- valory/optimus_abci:0.1.0:bafybeigfneogfptzhfovlqy5r57rlei7b6ixe2k37ke6xrv6lr76kcviai
+- valory/liquidity_trader_abci:0.1.0:bafybeihii4e64akqkelii37havxmet3qeg5vlv4vg2toekoaww6tk7zudi
+- valory/optimus_abci:0.1.0:bafybeiazrizmyz5rbqkodjo3jrregmeoyg2qrov4p5qyh5znggeg2kmtdi
 - valory/registration_abci:0.1.0:bafybeicnth5q4httefsusywx3zrrq4al47owvge72dqf2fziruicq6hqta
 - valory/reset_pause_abci:0.1.0:bafybeievjciqdvxhqxfjd4whqs27h6qbxqzrae7wwj7fpvxlvmtw3x35im
 - valory/termination_abci:0.1.0:bafybeid54buqxipiuduw7b6nnliiwsxajnltseuroad53wukfonpxca2om

packages/valory/contracts/staking_activity_checker/contract.py

@@ -42,3 +42,16 @@ def liveness_ratio(
         contract = cls.get_instance(ledger_api, contract_address)
         liveness_ratio = contract.functions.livenessRatio().call()
         return dict(data=liveness_ratio)
+
+    @classmethod
+    def get_multisig_nonces(
+        cls,
+        ledger_api: LedgerApi,
+        contract_address: str,
+        multisig: str,
+    ) -> JSONLike:
+        """Retrieve the nonces for a given multisig address."""
+        contract = cls.get_instance(ledger_api, contract_address)
+        nonces = contract.functions.getMultisigNonces(multisig).call()
+        return dict(data=nonces)
+

packages/valory/contracts/staking_activity_checker/contract.yaml

@@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   __init__.py: bafybeigqm6q7kgfzgpcse7zer5uea3s7myolry2r3teovuzqgkn43j7bei
   build/StakingActivityChecker.json: bafybeiety3kkkmdz2gdzktg54wvmhavftaw4wjnrddztt64jpknagrc6xa
-  contract.py: bafybeihnil43tcs2jhii5gxhsffzknsvljnnhradi62pnxhs525orc2cw4
+  contract.py: bafybeialo57soqxxxozi545hb3gqtf644qr2od4gskexdhhv6nmwpw6ktu
 fingerprint_ignore_patterns: []
 contracts: []
 class_name: StakingActivityCheckerContract

packages/valory/services/optimus/service.yaml

@@ -6,7 +6,7 @@ aea_version: '>=1.0.0, <2.0.0'
 license: Apache-2.0
 fingerprint: {}
 fingerprint_ignore_patterns: []
-agent: valory/optimus:0.1.0:bafybeibubmgk63swmozdglm3hmu4n3bz2xesxggdxdtx6cuso7feh3a7xu
+agent: valory/optimus:0.1.0:bafybeicjbstfud6oljhtbobgahpzujyigo2u3eit62srji2ik52irhdv7i
 number_of_agents: 1
 deployment: {}
 ---
@@ -68,7 +68,7 @@ models:
       service_endpoint_base: ${SERVICE_ENDPOINT_BASE:str:https://optimism.autonolas.tech/}
       multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:5}
       safe_contract_addresses: ${SAFE_CONTRACT_ADDRESSES:str:{"ethereum":"0x0000000000000000000000000000000000000000","base":"0x0000000000000000000000000000000000000000","optimism":"0x0000000000000000000000000000000000000000"}}
-      staking_token_contract_address: ${STAKING_TOKEN_CONTRACT_ADDRESS:str:0x63C2c53c09dE534Dd3bc0b7771bf976070936bAC}
+      staking_token_contract_address: ${STAKING_TOKEN_CONTRACT_ADDRESS:str:0x88996bbdE7f982D93214881756840cE2c77C4992}
       staking_activity_checker_contract_address: ${STAKING_ACTIVITY_CHECKER_CONTRACT_ADDRESS:str:0x7Fd1F4b764fA41d19fe3f63C85d12bf64d2bbf68}
       staking_threshold_period: ${STAKING_THRESHOLD_PERIOD:int:5}
       store_path: ${STORE_PATH:str:/data/}