Chore: Refactor Packages Dependencies

.gitignore

@@ -8,8 +8,8 @@ htmlcov
 *.egg-info
 packages/open_aea
 packages/valory/contracts/*
-!packages/valory/contracts/staking_token
-!packages/valory/contracts/staking_activity_checker
+packages/valory/contracts/staking_token
+packages/valory/contracts/staking_activity_checker
 packages/valory/protocols/
 packages/valory/skills/*
 !packages/valory/skills/agent_performance_summary_abci

packages/dvilela/agents/memeooorr/aea-config.yaml

@@ -24,8 +24,8 @@ contracts:
 - valory/multisend:0.1.0:bafybeidjdgi2kyexajirj3cnpzgse4y5u664b2blztt4flv6i7knlecyr4
 - dvilela/meme_factory:0.1.0:bafybeia4lvdencuwha6lmztji7vpe5dyjldclgwdww7sjjn7g5qbgavz34
 - dvilela/service_registry:0.1.0:bafybeibbncokrg2tzer2sjxwvwrybsl6wx2gqiwjsgfug7f3rfflibpxeq
-- valory/staking_token:0.1.0:bafybeiew7ul7numklfp7orbnhddsfih2uqlcsxr2sww2rmur2suia2cdaa
-- valory/staking_activity_checker:0.1.0:bafybeiaedx54qqvosecplrgumooc3m5vanzcfwlbrrh4qggwio57epxjqu
+- valory/staking_token:0.1.0:bafybeieofpmhto2wacfmbwizenlqkssoephzmidw2sxglqlxdopjzipuda
+- valory/staking_activity_checker:0.1.0:bafybeidt2rkw7ulmhxqj6j7l54ojhatinzmc54cgofq6jx7442jz3dwqhu
 protocols:
 - open_aea/signing:1.0.0:bafybeiei6h5suazzfta7n3uyq7bsz26zkmdiiylptu5i44p7s2wiygxt24
 - valory/abci:0.1.0:bafybeicjjeintlqgg53zrreflmoafeiynt3gvdnovy5ocea7doddos3e5a
@@ -44,11 +44,11 @@ skills:
 - valory/transaction_settlement_abci:0.1.0:bafybeifbumqyemwzffxtn3kwucxx55ja57mhmfalo7fqlkq2hnjwqhfp74
 - valory/registration_abci:0.1.0:bafybeie3dfore53bxvbokqiarzuwulzlyt4vz5mifb4t3gxl6drwkblfha
 - valory/reset_pause_abci:0.1.0:bafybeicffwijiecbqc6z22nowir2fgwwqzwu6vokzuwgd5wa3zxromxevm
-- dvilela/memeooorr_abci:0.1.0:bafybeidn326miiuwqbs7izfpdu5nzaium3tas53ledlabhbevxsvymutnu
-- dvilela/memeooorr_chained_abci:0.1.0:bafybeib4itqjx2gvegwyp26cntd4cqhfeefqtcun3rfuxgtlcsgtag6kje
-- valory/mech_interact_abci:0.1.0:bafybeiffz7arijdfjko47rqrkcs5eobyj4vmal5pmiuhopmot24qrigwdy
+- dvilela/memeooorr_abci:0.1.0:bafybeifa3o47oyl7v32wjr2c7l2w46coh3maoqoiu6pung5v5wxoglr7gi
+- dvilela/memeooorr_chained_abci:0.1.0:bafybeicziw6kvpjqkdedyi2ecadca6zzeygyh3bof2o54vdou3vjtwzps4
+- valory/mech_interact_abci:0.1.0:bafybeigz7smxwsfxovyzn6lhh74k5z35a5piz2oioi5fgr7mqcjicbpleu
 - valory/agent_db_abci:0.1.0:bafybeihizhhlst6vtnkaoeophuseayd7zk7kiisxgo7niemzcatwnfatba
-- valory/agent_performance_summary_abci:0.1.0:bafybeifztojxvh6oirbebhl2uaydhlwilvyjhgxe4wndwbre2yq6oiyvky
+- valory/agent_performance_summary_abci:0.1.0:bafybeieb32gibs6vxxpoywnpayaifssjznhysz4dwn6rm3jnxx32p4sgme
 - valory/funds_manager:0.1.0:bafybeidtprwtynln7kig2ymxmgiohinofq5jf4n5g2wkbxa4bw3nm2pn4y
 default_ledger: ethereum
 required_ledgers:

packages/dvilela/services/memeooorr/service.yaml

@@ -7,7 +7,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeifngitemoxhahloctciywjzfmlhp373ijuvrocmwbyxl3bate2fne
 fingerprint_ignore_patterns: []
-agent: dvilela/memeooorr:0.1.0:bafybeicmhcgw3zall2rz5poehnaz37t52biotdifwjs42ovg6y7nmm42pe
+agent: dvilela/memeooorr:0.1.0:bafybeiad6a3is52v5vqhdkn6amezjccdwgjef225vxcduhovgpdzysq7ne
 number_of_agents: 1
 deployment:
   agent:

packages/dvilela/skills/memeooorr_abci/behaviour_classes/chain.py

@@ -49,8 +49,8 @@
     TransactionLoopCheckPayload,
     TransactionLoopCheckRound,
 )
+from packages.valory.contracts.agent_mech.contract import AgentMech
 from packages.valory.contracts.gnosis_safe.contract import GnosisSafeContract
-from packages.valory.contracts.mech_marketplace.contract import MechMarketplace
 from packages.valory.contracts.staking_activity_checker.contract import (
     StakingActivityCheckerContract,
 )
@@ -398,7 +398,7 @@ def _is_staking_kpi_met(  # pylint: disable=too-many-return-statements
         response_msg = yield from self.get_contract_api_response(
             performative=ContractApiMessage.Performative.GET_STATE,
             contract_address=self.params.mech_marketplace_config.mech_marketplace_address,
-            contract_id=str(MechMarketplace.contract_id),
+            contract_id=str(AgentMech.contract_id),
             contract_callable="get_request_count",
             chain_id=self.get_chain_id(),
             address=self.synchronized_data.safe_contract_address,

packages/dvilela/skills/memeooorr_abci/skill.yaml

@@ -16,7 +16,7 @@ fingerprint:
   agentsfun-ui-build/index.html: bafybeicdwxxusppmc5spztrfb65ps52xxadgagw4bbkvxttp3l6h7dxl4e
   behaviour_classes/__init__.py: bafybeicjks4kxsb2r6a4armmaqxyxngwm3pouegq3fycm37rbe7otiwsre
   behaviour_classes/base.py: bafybeiavreutmgzzxofrfhhvspyg7tsotvswlrk3iajurgfkd4n3oecjie
-  behaviour_classes/chain.py: bafybeiaeb4mbxcslpfif2ktgyvit23ur5ehn7wprwghhsxiapqhffndm6q
+  behaviour_classes/chain.py: bafybeic6ut3it5iekfw4g6u6vxax23ecqprqr3wfz2r2n4ziuq4ripb5oi
   behaviour_classes/db.py: bafybeihf7jbo6mfkrqlukmmxx5b6uu4wsagotebnbiqexz4qxzl5lyvuoa
   behaviour_classes/llm.py: bafybeif7gn23nw4ham3ksl5nbjbmdbrjnm3ye5o55kovevi4jlu7ymmiym
   behaviour_classes/mech.py: bafybeiahsmbobk7bpwhmpsnuaivt5yui23sy6qrwxdsbhnd2nwidsrwikq
@@ -40,9 +40,9 @@ contracts:
 - valory/gnosis_safe:0.1.0:bafybeia3ictpeosrza3tkxa7ad2io5txutcs44jgrqoqgdxhrjdu2fy4qy
 - dvilela/meme_factory:0.1.0:bafybeia4lvdencuwha6lmztji7vpe5dyjldclgwdww7sjjn7g5qbgavz34
 - dvilela/service_registry:0.1.0:bafybeibbncokrg2tzer2sjxwvwrybsl6wx2gqiwjsgfug7f3rfflibpxeq
-- valory/staking_token:0.1.0:bafybeiew7ul7numklfp7orbnhddsfih2uqlcsxr2sww2rmur2suia2cdaa
-- valory/staking_activity_checker:0.1.0:bafybeiaedx54qqvosecplrgumooc3m5vanzcfwlbrrh4qggwio57epxjqu
-- valory/mech_marketplace:0.1.0:bafybeibbxutph6qbaldnq3o5kiaqgubc6jhgxappf33u2t7udnwajhmbf4
+- valory/staking_token:0.1.0:bafybeieofpmhto2wacfmbwizenlqkssoephzmidw2sxglqlxdopjzipuda
+- valory/staking_activity_checker:0.1.0:bafybeidt2rkw7ulmhxqj6j7l54ojhatinzmc54cgofq6jx7442jz3dwqhu
+- valory/agent_mech:0.1.0:bafybeiee6j6tjjsoa7qn2ganeyxm7h5n3x3ukqdrs7sf7aliybcekantka
 protocols:
 - valory/srr:0.1.0:bafybeiee2dgy6r2z5x6vu2ug5vcxvfgg4v3liq2x7v3hxchtp45mwnchg4
 - dvilela/kv_store:0.1.0:bafybeianryj5powscuj6eupseja7xjzo5ecsd6sr7ketfw667nvxkvi7fa
@@ -52,7 +52,7 @@ protocols:
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeihhadgaitdltynzaq4w7jhgwbdnizsobbaa2riqtqwbml3li2tieq
 - valory/transaction_settlement_abci:0.1.0:bafybeifbumqyemwzffxtn3kwucxx55ja57mhmfalo7fqlkq2hnjwqhfp74
-- valory/mech_interact_abci:0.1.0:bafybeiffz7arijdfjko47rqrkcs5eobyj4vmal5pmiuhopmot24qrigwdy
+- valory/mech_interact_abci:0.1.0:bafybeigz7smxwsfxovyzn6lhh74k5z35a5piz2oioi5fgr7mqcjicbpleu
 - valory/agent_db_abci:0.1.0:bafybeihizhhlst6vtnkaoeophuseayd7zk7kiisxgo7niemzcatwnfatba
 - valory/funds_manager:0.1.0:bafybeidtprwtynln7kig2ymxmgiohinofq5jf4n5g2wkbxa4bw3nm2pn4y
 behaviours:

packages/dvilela/skills/memeooorr_chained_abci/skill.yaml

@@ -23,9 +23,9 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeicffwijiecbqc6z22nowir2fgwwqzwu6vokzuwgd5wa3zxromxevm
 - valory/transaction_settlement_abci:0.1.0:bafybeifbumqyemwzffxtn3kwucxx55ja57mhmfalo7fqlkq2hnjwqhfp74
 - valory/termination_abci:0.1.0:bafybeiaylk6haefa2xex55krizafzwo2v5tpkcoflw5hiwaqm3qxice23m
-- dvilela/memeooorr_abci:0.1.0:bafybeidn326miiuwqbs7izfpdu5nzaium3tas53ledlabhbevxsvymutnu
-- valory/mech_interact_abci:0.1.0:bafybeiffz7arijdfjko47rqrkcs5eobyj4vmal5pmiuhopmot24qrigwdy
-- valory/agent_performance_summary_abci:0.1.0:bafybeifztojxvh6oirbebhl2uaydhlwilvyjhgxe4wndwbre2yq6oiyvky
+- dvilela/memeooorr_abci:0.1.0:bafybeifa3o47oyl7v32wjr2c7l2w46coh3maoqoiu6pung5v5wxoglr7gi
+- valory/mech_interact_abci:0.1.0:bafybeigz7smxwsfxovyzn6lhh74k5z35a5piz2oioi5fgr7mqcjicbpleu
+- valory/agent_performance_summary_abci:0.1.0:bafybeieb32gibs6vxxpoywnpayaifssjznhysz4dwn6rm3jnxx32p4sgme
 behaviours:
   main:
     args: {}

packages/packages.json

@@ -2,17 +2,15 @@
     "dev": {
         "contract/dvilela/meme_factory/0.1.0": "bafybeia4lvdencuwha6lmztji7vpe5dyjldclgwdww7sjjn7g5qbgavz34",
         "contract/dvilela/service_registry/0.1.0": "bafybeibbncokrg2tzer2sjxwvwrybsl6wx2gqiwjsgfug7f3rfflibpxeq",
-        "contract/valory/staking_token/0.1.0": "bafybeiew7ul7numklfp7orbnhddsfih2uqlcsxr2sww2rmur2suia2cdaa",
-        "contract/valory/staking_activity_checker/0.1.0": "bafybeiaedx54qqvosecplrgumooc3m5vanzcfwlbrrh4qggwio57epxjqu",
         "connection/dvilela/twikit/0.1.0": "bafybeicn3wn3ogv6m55kgaltafud3so2r737tifl33jyzhjnikpjta4cxa",
         "connection/dvilela/mirror_db/0.1.0": "bafybeiegfupcxaglujdhhup45ubab34ezzncmqqspv3uzy5pvvi2s42zhu",
         "connection/dvilela/tweepy/0.1.0": "bafybeidkx7lrvn6t43blc3ooydodjpuyj3f6c72sdjhgrn2ga7ockvlmzi",
-        "skill/dvilela/memeooorr_abci/0.1.0": "bafybeidn326miiuwqbs7izfpdu5nzaium3tas53ledlabhbevxsvymutnu",
-        "skill/dvilela/memeooorr_chained_abci/0.1.0": "bafybeib4itqjx2gvegwyp26cntd4cqhfeefqtcun3rfuxgtlcsgtag6kje",
+        "skill/dvilela/memeooorr_abci/0.1.0": "bafybeifa3o47oyl7v32wjr2c7l2w46coh3maoqoiu6pung5v5wxoglr7gi",
+        "skill/dvilela/memeooorr_chained_abci/0.1.0": "bafybeicziw6kvpjqkdedyi2ecadca6zzeygyh3bof2o54vdou3vjtwzps4",
         "skill/valory/agent_db_abci/0.1.0": "bafybeihizhhlst6vtnkaoeophuseayd7zk7kiisxgo7niemzcatwnfatba",
-        "skill/valory/agent_performance_summary_abci/0.1.0": "bafybeifztojxvh6oirbebhl2uaydhlwilvyjhgxe4wndwbre2yq6oiyvky",
-        "agent/dvilela/memeooorr/0.1.0": "bafybeicmhcgw3zall2rz5poehnaz37t52biotdifwjs42ovg6y7nmm42pe",
-        "service/dvilela/memeooorr/0.1.0": "bafybeigwqtfcxbhzhbsyfgh4e4uznenqot5a2cfq4y5gemnwfrovbc4kgq"
+        "skill/valory/agent_performance_summary_abci/0.1.0": "bafybeieb32gibs6vxxpoywnpayaifssjznhysz4dwn6rm3jnxx32p4sgme",
+        "agent/dvilela/memeooorr/0.1.0": "bafybeiad6a3is52v5vqhdkn6amezjccdwgjef225vxcduhovgpdzysq7ne",
+        "service/dvilela/memeooorr/0.1.0": "bafybeihdjd7b5hcep4rgdmuu6hqkwep3sgyjuv2tt2br4cngmrejyxnp7q"
     },
     "third_party": {
         "protocol/open_aea/signing/1.0.0": "bafybeiei6h5suazzfta7n3uyq7bsz26zkmdiiylptu5i44p7s2wiygxt24",
@@ -30,12 +28,12 @@
         "contract/valory/service_registry/0.1.0": "bafybeibzuktplryzlfhdyahcbldfh5dz6pnvukigzbejeuvlvv24774lpi",
         "contract/valory/gnosis_safe/0.1.0": "bafybeia3ictpeosrza3tkxa7ad2io5txutcs44jgrqoqgdxhrjdu2fy4qy",
         "contract/valory/multisend/0.1.0": "bafybeidjdgi2kyexajirj3cnpzgse4y5u664b2blztt4flv6i7knlecyr4",
-        "contract/valory/agent_registry/0.1.0": "bafybeigl7bqvjyvryxuugpx6ogn4n6d2hryebup3x4hxhfirpjm6kjw4vq",
+        "contract/valory/agent_registry/0.1.0": "bafybeictjtktyj2nq4hqkzslnyp2b4rflgt6fjqigs5qwpzbt2tnynmaxi",
         "contract/valory/mech_marketplace_legacy/0.1.0": "bafybeigh3o7kxyaulnvcbld2h6cmae6ma6yei2xram2hqifcftn5f3bw7q",
-        "contract/valory/mech_marketplace/0.1.0": "bafybeibbxutph6qbaldnq3o5kiaqgubc6jhgxappf33u2t7udnwajhmbf4",
+        "contract/valory/agent_mech/0.1.0": "bafybeiee6j6tjjsoa7qn2ganeyxm7h5n3x3ukqdrs7sf7aliybcekantka",
         "contract/valory/mech/0.1.0": "bafybeibzaxri2yru6l2nwgr2vdctkczqthalel2g4wojz2whohr3sznil4",
         "contract/valory/mech_mm/0.1.0": "bafybeielrjtejohqcom5donjmrjd7r2jb2ub3pbcxbhyap4exkbfg7ppoi",
-        "contract/valory/erc20/0.1.0": "bafybeidrjq5rf6ay2okyy3eoseeafzl7bmngcbs7nhohbifdephc77tbke",
+        "contract/valory/erc20/0.1.0": "bafybeih7bmq64cdhyyvfxuknm7vy5pefn75zisg5gdvr75rbwvefqb6dp4",
         "contract/valory/ierc1155/0.1.0": "bafybeid5whskodle54bifmwjzkaqfmkzngqga6jtmbhvlzigel2f5mghda",
         "contract/valory/nvm_balance_tracker_token/0.1.0": "bafybeiapcxwvr4hshevutwzs7vv3eza6ueosnj2wt2fb7yjwvl6e73mmqq",
         "contract/valory/nvm_balance_tracker_native/0.1.0": "bafybeicu32o3rpp2ouacssybsgnhabojzwem2s6eh7lqunq2fkcxi2kmmy",
@@ -45,6 +43,8 @@
         "contract/valory/lock_payment_condition/0.1.0": "bafybeihuob2jmcn6i7ipaekscsectadwohiql3jiakeq3forj2lywuwdo4",
         "contract/valory/agreement_store_manager/0.1.0": "bafybeigmajoan2l2vh3jwla6kictcplgcbnxq7wgazaqy27enipjezlfky",
         "contract/valory/transfer_nft_condition/0.1.0": "bafybeigndjs5mthj42yq3aw3u4c2l3gakove2uoj2jvurnr36qcbaigjni",
+        "contract/valory/staking_token/0.1.0": "bafybeieofpmhto2wacfmbwizenlqkssoephzmidw2sxglqlxdopjzipuda",
+        "contract/valory/staking_activity_checker/0.1.0": "bafybeidt2rkw7ulmhxqj6j7l54ojhatinzmc54cgofq6jx7442jz3dwqhu",
         "contract/valory/subscription_provider/0.1.0": "bafybeib5bvuoyhwprzpc33qqlneeftkyzyaecxb42t2lk34ptdduzdtsbu",
         "connection/valory/http_client/0.23.0": "bafybeigwzn4hkry3wy7nf2myk3h3pl5xrqkvvxp2ppdbwwffa4c2s2bkwy",
         "connection/valory/ledger/0.19.0": "bafybeigiipjmtjdivz2wd54c7bmbqxbayk5b5st7wcrsvsnqkfc2f2rbaa",
@@ -61,7 +61,7 @@
         "skill/valory/registration_abci/0.1.0": "bafybeie3dfore53bxvbokqiarzuwulzlyt4vz5mifb4t3gxl6drwkblfha",
         "skill/valory/reset_pause_abci/0.1.0": "bafybeicffwijiecbqc6z22nowir2fgwwqzwu6vokzuwgd5wa3zxromxevm",
         "skill/valory/termination_abci/0.1.0": "bafybeiaylk6haefa2xex55krizafzwo2v5tpkcoflw5hiwaqm3qxice23m",
-        "skill/valory/mech_interact_abci/0.1.0": "bafybeiffz7arijdfjko47rqrkcs5eobyj4vmal5pmiuhopmot24qrigwdy",
+        "skill/valory/mech_interact_abci/0.1.0": "bafybeigz7smxwsfxovyzn6lhh74k5z35a5piz2oioi5fgr7mqcjicbpleu",
         "skill/valory/funds_manager/0.1.0": "bafybeidtprwtynln7kig2ymxmgiohinofq5jf4n5g2wkbxa4bw3nm2pn4y"
     }
 }