diff --git a/packages/dvilela/agents/memeooorr/aea-config.yaml b/packages/dvilela/agents/memeooorr/aea-config.yaml index 14f78693..37eaa140 100644 --- a/packages/dvilela/agents/memeooorr/aea-config.yaml +++ b/packages/dvilela/agents/memeooorr/aea-config.yaml @@ -22,6 +22,7 @@ contracts: - valory/gnosis_safe_proxy_factory:0.1.0:bafybeihi4cvrnf5ne7t5cxcwix3dbtfjucfjux6zn4wouebjx3ldmrmnpm - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y - dvilela/meme_factory:0.1.0:bafybeiecfhn33jiprqrz6kx565cexy6yq5pqsg2bltgzq6bbg3uusepj7i +- dvilela/service_registry:0.1.0:bafybeiareztundn6q5fsvuagzf4oqb4ulmnjdnk5mkjkw3qbqvnlf2nprq protocols: - open_aea/signing:1.0.0:bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi - valory/abci:0.1.0:bafybeiaqmp7kocbfdboksayeqhkbrynvlfzsx4uy4x6nohywnmaig4an7u @@ -40,8 +41,8 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeihq2yenstblmaadzcjousowj5kfn5l7ns5pxweq2gcrsczfyq5wzm - valory/registration_abci:0.1.0:bafybeicnth5q4httefsusywx3zrrq4al47owvge72dqf2fziruicq6hqta - valory/reset_pause_abci:0.1.0:bafybeievjciqdvxhqxfjd4whqs27h6qbxqzrae7wwj7fpvxlvmtw3x35im -- dvilela/memeooorr_abci:0.1.0:bafybeibknxwmub677kt3bxjlwpjjzhlajy3l5jo6bq5x6aumxvoxy6ryyi -- dvilela/memeooorr_chained_abci:0.1.0:bafybeigpiptrijjcpphqsb7kj37c4sst6hly5ih45fp2zlvp2v5pmlcepa +- dvilela/memeooorr_abci:0.1.0:bafybeiftj42tnqnpjvookch7woq3viid3wos72jxogha65qlxxba5ndp2y +- dvilela/memeooorr_chained_abci:0.1.0:bafybeign6of7arqd6p6mqwb7ilez3aj5hpfegmxk7tl3th72gvnlcgx3ta default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/dvilela/contracts/service_registry/contract.py b/packages/dvilela/contracts/service_registry/contract.py index 210547c6..bcd32fd2 100644 --- a/packages/dvilela/contracts/service_registry/contract.py +++ b/packages/dvilela/contracts/service_registry/contract.py @@ -20,7 +20,7 @@ """This module contains the class to connect to an Service Registry contract.""" import logging -from typing import Dict, List +from typing import Dict from aea.configurations.base import PublicId from aea.contracts.base import Contract diff --git a/packages/dvilela/contracts/service_registry/contract.yaml b/packages/dvilela/contracts/service_registry/contract.yaml index acaf6104..4d0cc1f6 100644 --- a/packages/dvilela/contracts/service_registry/contract.yaml +++ b/packages/dvilela/contracts/service_registry/contract.yaml @@ -8,8 +8,8 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeifm7ccf5zfk7okmebbuv4tn2oyoe3ii2tflk4ubwjbfj4alh2uz4y __init__.py: bafybeigqbuh2n6fig4npnjtf4ghyxtfsicbf7doboiw2rcxtuix4tneeym - build/ServiceRegistryL2.json: bafybeif7o53y2itijv2scar6eebepprrc5nl6lnr5io7xx27ckiui5vfoe - contract.py: bafybeiccrudcb46ztfmbdvgikycgyonncpsmobatmjqtj3hjfltn5xpcom + build/ServiceRegistryL2.json: bafybeicvqr2ex2b4vp6ladgs5qywnfwdlnuvbggc3xwcwpklikt66pf3pq + contract.py: bafybeicywt4b6feug3ckctgxw4ihlgqc3jw4orqmrgj2ry2l6pabqjmmvm fingerprint_ignore_patterns: [] contracts: [] class_name: ServiceRegistryContract diff --git a/packages/dvilela/services/memeooorr/service.yaml b/packages/dvilela/services/memeooorr/service.yaml index d9d3b7d6..57005314 100644 --- a/packages/dvilela/services/memeooorr/service.yaml +++ b/packages/dvilela/services/memeooorr/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeiaekcmielp6mb4qvmo2twwkpmoun36bqajrh7wnnkcpdnia45ycl4 fingerprint_ignore_patterns: [] -agent: dvilela/memeooorr:0.1.0:bafybeigxoqqx22yqqskmlc2xmjhhct4hbxgxywvnjm5wiv4dbwni5ugjma +agent: dvilela/memeooorr:0.1.0:bafybeih6ygmdtjg3lonleopuropnkzgmbmxil7emo4lhafzhhggalgelb4 number_of_agents: 1 deployment: agent: diff --git a/packages/dvilela/skills/memeooorr_abci/behaviour_classes/base.py b/packages/dvilela/skills/memeooorr_abci/behaviour_classes/base.py index 796c2955..b64251f8 100644 --- a/packages/dvilela/skills/memeooorr_abci/behaviour_classes/base.py +++ b/packages/dvilela/skills/memeooorr_abci/behaviour_classes/base.py @@ -390,7 +390,7 @@ def get_memeooorr_handles_from_chain(self) -> Generator[None, None, List[str]]: # Check that the response is what we expect if response_msg.performative != ContractApiMessage.Performative.STATE: self.context.logger.error(f"Could not get the service data: {response_msg}") - return None + return [] services_data = cast(dict, response_msg.state.body.get("services_data", None)) diff --git a/packages/dvilela/skills/memeooorr_abci/skill.yaml b/packages/dvilela/skills/memeooorr_abci/skill.yaml index 89c6d5d6..0630fc34 100644 --- a/packages/dvilela/skills/memeooorr_abci/skill.yaml +++ b/packages/dvilela/skills/memeooorr_abci/skill.yaml @@ -8,11 +8,11 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeidorrnxjv4n4ngovxnu4mzod46kyrdncfmli4hapqeqnzp7imq7hm behaviour_classes/__init__.py: bafybeicjks4kxsb2r6a4armmaqxyxngwm3pouegq3fycm37rbe7otiwsre - behaviour_classes/base.py: bafybeiato5uklfytqhy5wnk6ht2zv4iy57ob3lmp6zhv7shwnjanzwxccm + behaviour_classes/base.py: bafybeichprd3ran7gab4c7ongru7a423qk43d55zpzcudsgmdozqw347vq behaviour_classes/chain.py: bafybeih34nhn7r2xq6lexic4xkn2pz56ns7mau3iswejhe3awiys7pc4ve behaviour_classes/db.py: bafybeieuhjes2gsiidepjxcojgnn3swx2znem5uwvz7rwkxpwls3dmlxf4 behaviour_classes/llm.py: bafybeifqdewudvaw6qh5iherjm6l3brzbe6z27ik3l4ptmdnlj4abx5k6e - behaviour_classes/twitter.py: bafybeic4dcxwgkup4fqgcdmvgdazf7u2v5ivuabo4dnviblnhoub74ue7u + behaviour_classes/twitter.py: bafybeiamwgxwrzwba535e6a6ovm2fiasixkwqylbyo7qmxjwfoca3gzic4 behaviours.py: bafybeibdbimezloiomvsv3zgfdug4tw276gt7tb5agnezl2nuqcfcplscu dialogues.py: bafybeiaygigeleloplgrsg2sovv463uvzk3zc2tupgazn4ak2vqcangksu fsm_specification.yaml: bafybeidqesafw5vtekw2dtffjznuchdjllo52najwmmkj2npfdyaouigfa @@ -32,6 +32,7 @@ connections: contracts: - valory/gnosis_safe:0.1.0:bafybeiho6sbfts3zk3mftrngw37d5qnlvkqtnttt3fzexmcwkeevhu4wwi - dvilela/meme_factory:0.1.0:bafybeiecfhn33jiprqrz6kx565cexy6yq5pqsg2bltgzq6bbg3uusepj7i +- dvilela/service_registry:0.1.0:bafybeiareztundn6q5fsvuagzf4oqb4ulmnjdnk5mkjkw3qbqvnlf2nprq protocols: - valory/srr:0.1.0:bafybeihrixgptxuqpf2s4nujypwlv5aed2nboozq5kl4c26cxw6r7si2x4 - dvilela/kv_store:0.1.0:bafybeihimf5f37uupxmugvagmaxworgmz7cxuqpikkyzlgldtbq46jbvci diff --git a/packages/dvilela/skills/memeooorr_chained_abci/skill.yaml b/packages/dvilela/skills/memeooorr_chained_abci/skill.yaml index 8a303971..d2382c46 100644 --- a/packages/dvilela/skills/memeooorr_chained_abci/skill.yaml +++ b/packages/dvilela/skills/memeooorr_chained_abci/skill.yaml @@ -23,7 +23,7 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeievjciqdvxhqxfjd4whqs27h6qbxqzrae7wwj7fpvxlvmtw3x35im - valory/transaction_settlement_abci:0.1.0:bafybeihq2yenstblmaadzcjousowj5kfn5l7ns5pxweq2gcrsczfyq5wzm - valory/termination_abci:0.1.0:bafybeid54buqxipiuduw7b6nnliiwsxajnltseuroad53wukfonpxca2om -- dvilela/memeooorr_abci:0.1.0:bafybeibknxwmub677kt3bxjlwpjjzhlajy3l5jo6bq5x6aumxvoxy6ryyi +- dvilela/memeooorr_abci:0.1.0:bafybeiftj42tnqnpjvookch7woq3viid3wos72jxogha65qlxxba5ndp2y behaviours: main: args: {} diff --git a/packages/packages.json b/packages/packages.json index addf9dc3..91cbbd34 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,12 +1,12 @@ { "dev": { "contract/dvilela/meme_factory/0.1.0": "bafybeiecfhn33jiprqrz6kx565cexy6yq5pqsg2bltgzq6bbg3uusepj7i", - "contract/dvilela/service_registry/0.1.0": "bafybeihz6khyze6jowddo7ij7mogdkdsbwimz4kxshz4taxlcf6splwldm", + "contract/dvilela/service_registry/0.1.0": "bafybeiareztundn6q5fsvuagzf4oqb4ulmnjdnk5mkjkw3qbqvnlf2nprq", "connection/dvilela/twikit/0.1.0": "bafybeifelwkeycvrqtgm5alln5n4ijqibi7cizgsu5oxndrei4exl77yjy", - "skill/dvilela/memeooorr_abci/0.1.0": "bafybeibknxwmub677kt3bxjlwpjjzhlajy3l5jo6bq5x6aumxvoxy6ryyi", - "skill/dvilela/memeooorr_chained_abci/0.1.0": "bafybeigpiptrijjcpphqsb7kj37c4sst6hly5ih45fp2zlvp2v5pmlcepa", - "agent/dvilela/memeooorr/0.1.0": "bafybeigxoqqx22yqqskmlc2xmjhhct4hbxgxywvnjm5wiv4dbwni5ugjma", - "service/dvilela/memeooorr/0.1.0": "bafybeibginc6utz6jsyfghj4hqowjdhsl6umfrocryyc75jj7prx7a37ii" + "skill/dvilela/memeooorr_abci/0.1.0": "bafybeiftj42tnqnpjvookch7woq3viid3wos72jxogha65qlxxba5ndp2y", + "skill/dvilela/memeooorr_chained_abci/0.1.0": "bafybeign6of7arqd6p6mqwb7ilez3aj5hpfegmxk7tl3th72gvnlcgx3ta", + "agent/dvilela/memeooorr/0.1.0": "bafybeih6ygmdtjg3lonleopuropnkzgmbmxil7emo4lhafzhhggalgelb4", + "service/dvilela/memeooorr/0.1.0": "bafybeiadi4stgvnsdi6l2kqwm7hluuepzsb5ifty7gcyp3ejzh6ufay46y" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/scripts/pull_handles.py b/scripts/pull_handles.py index f5c1d236..94697c86 100644 --- a/scripts/pull_handles.py +++ b/scripts/pull_handles.py @@ -18,6 +18,7 @@ # # ------------------------------------------------------------------------------ +"""Download Twitter handles from chain + IPFS""" import json import os @@ -31,7 +32,7 @@ w3 = Web3(Web3.HTTPProvider(os.getenv("BASE_RPC"))) -with open("ServiceRegistryL2.json", "r") as inf: +with open("ServiceRegistryL2.json", "r", encoding="utf-8") as inf: abi = json.load(inf) contract_address = "0x3C1fF68f5aa342D296d4DEe4Bb1cACCA912D95fE" diff --git a/tox.ini b/tox.ini index 05d7097b..312f661e 100644 --- a/tox.ini +++ b/tox.ini @@ -584,4 +584,5 @@ pathable: >=0.4.3 aiohappyeyeballs: >=2.3.5 ; false positive pyinstaller: ==6.8.0 -pyinstaller-hooks-contrib: >=2024.6 \ No newline at end of file +pyinstaller-hooks-contrib: >=2024.6 +attrs: * \ No newline at end of file